Commit Graph

1829 Commits (3b44e643d5b68360b5281dc893b1fe21b2c2e053)

Author SHA1 Message Date
Andromeda Yelton 3b44e643d5 put status information in de gruyter initialized campaigns 2013-04-24 14:26:23 -04:00
Raymond Yee d977fd6338 Merge pull request #161 from Gluejar/fix_authcanceled
add a special response for failed social auths
2013-04-10 08:38:14 -07:00
eshellman 7e95d5f0d7 Merge pull request #162 from Gluejar/rh_is_not_user_friendly
altering term 'rights holder' in places where non-RHs are likely to enco...
2013-04-09 12:22:40 -07:00
thatandromeda 70cf09403d Merge pull request #163 from Gluejar/press_updater
missing </div>
2013-04-09 12:10:27 -07:00
eric 24392c5b3e missing </div> 2013-04-09 15:07:30 -04:00
Andromeda Yelton 075dfc3c55 altering term 'rights holder' in places where non-RHs are likely to encounter it and be confused 2013-04-09 12:31:19 -04:00
eshellman 97e750867b Merge pull request #160 from Gluejar/press_updater
point press page at new version, tidy up submitterator
2013-04-09 05:46:05 -07:00
eric 1ee2d5c634 add a special response for failed social auths 2013-04-09 00:05:31 -04:00
Raymond Yee 74c8d52176 Restored mistakenly deleted import: 6cf42b1a67 (L0L43) 2013-04-08 13:51:08 -07:00
Andromeda Yelton 71306108b0 point press page at new version, tidy up submitterator 2013-04-08 14:16:08 -04:00
Raymond Yee 2bb69d9e82 Merge pull request #149 from Gluejar/verify_email_change
Verify email change
2013-04-08 07:28:32 -07:00
eric 6cf42b1a67 resolve conflict 2013-04-05 13:10:03 -04:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Andromeda Yelton a3ca1d3867 press coverage should be ordered by date 2013-04-04 11:40:44 -04:00
Andromeda Yelton a7adca844e submitterator needs to allow us to submit past press coverage 2013-04-04 11:40:03 -04:00
Andromeda Yelton 04aa440cd2 including untracked files is fun and useful 2013-04-04 11:34:54 -04:00
Andromeda Yelton 57f7c81ec0 adds press item submission functionality 2013-04-04 11:09:18 -04:00
Andromeda Yelton db0a967963 new press template and view 2013-04-04 10:15:29 -04:00
Andromeda Yelton 7e2d57b299 force css reload 2013-04-02 11:58:50 -04:00
eric 040cd6d144 add de gruyter news by hand 2013-04-02 11:21:44 -04:00
Raymond Yee d861aafdc3 Merge branch 'master' into landing_page 2013-04-02 07:55:42 -07:00
Andromeda Yelton 7dd1b994cd fixing syntax error 2013-04-01 10:28:19 -04:00
thatandromeda 6505384a1a Merge pull request #152 from Gluejar/improve_login_to_add
"login to add" now adds, uses triple login page [#30497175]
2013-04-01 07:15:25 -07:00
Raymond Yee f029da02c6 Merge pull request #154 from Gluejar/fix_null_search
fix error when search has no q
2013-03-30 10:31:36 -07:00
Raymond Yee f958693931 Merge pull request #150 from Gluejar/add_publisher_model
Add publisher model
2013-03-30 10:03:30 -07:00
Raymond Yee 1992c15c65 put production into maintenance mode 2013-03-30 09:55:32 -07:00
Raymond Yee 1f522e0112 maintenance mode 2013-03-30 09:47:45 -07:00
eric d19b9e7d8e fix error when search has no q 2013-03-29 21:11:01 -04:00
eric 2aabf09161 merge from master 2013-03-29 19:41:28 -04:00
Andromeda Yelton 1a5477b271 as we can link straihgt to the comments tab, let's 2013-03-29 16:25:58 -04:00
Andromeda Yelton b5af0fd98b Merge branch 'landing_page' of github.com:Gluejar/regluit into landing_page 2013-03-29 16:24:34 -04:00
Andromeda Yelton d90c8580e4 adds arrows for more, removes placeholder, changes header bars to pale-blue 2013-03-29 16:23:43 -04:00
Andromeda Yelton 35b4c7b91f remove placeholder until I come up with a video to go here 2013-03-29 15:23:37 -04:00
eric 097127ab7c resolve conficts in merge from master 2013-03-29 12:03:15 -04:00
eric 1ace0a5479 "login to add" now adds, uses triple login page [#30497175] 2013-03-29 11:50:07 -04:00
Raymond Yee 63c6b35a30 Merge branch 'master' into add_publisher_model 2013-03-29 08:43:15 -07:00
Raymond Yee c832f2f281 Merge pull request #148 from Gluejar/improve_avatars
Improve avatars (gravatar, update social_auth, avatars selectable)
2013-03-29 08:26:41 -07:00
Raymond Yee 44daa18f30 Merge branch 'master' into add_publisher_model 2013-03-28 22:46:38 -07:00
eric 5bb546bd0d fixed bad url 2013-03-28 14:16:52 -04:00
Andromeda Yelton 520beedfc7 made it faster 2013-03-28 11:38:40 -04:00
Andromeda Yelton 9661c97bf3 whoops ordering queryset on wrong thing 2013-03-28 11:12:55 -04:00
Andromeda Yelton f804a0df66 adding read-faq option into learn-more area, since we've removed it from giant graphic 2013-03-28 10:59:36 -04:00
Andromeda Yelton 17a9847b66 segregating learn_more area css fully into learnmore.less 2013-03-28 10:38:57 -04:00
eric 24a08d2979 Implement Andromeda suggestions 2013-03-27 21:46:52 -04:00
eric 70beef83d5 display of works in our db were being excluded from google search results 2013-03-27 21:31:30 -04:00
eric 8366b08c69 get email_change working again 2013-03-27 17:57:08 -04:00
Andromeda Yelton af0d42b9ff removed unused sharing features 2013-03-27 15:06:28 -04:00
eric 3a81db3804 Implement publisher and feedback email in campaign management
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
Andromeda Yelton 5c2b639e98 as seen on section 2013-03-27 10:33:47 -04:00
Andromeda Yelton 79ddb02df9 need to have a content-block id around book panels for greenpanel.js to bind 2013-03-26 15:31:44 -04:00