Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1850 commits 2 branches 0 tags 57 MiB
Commit graph

1850 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Neugebauer
07198b2ecf Direct reviewers to the controversial talks instead of the indifferent talks 2016-08-17 07:35:46 +10:00
Christopher Neugebauer
7b6843ca1e all-reviews CSV now includes the proposal type rather than the proposal section 2016-08-17 07:27:32 +10:00
Christopher Neugebauer
59ff38f78b Adds a floatformat to the average 2016-08-16 09:50:17 +10:00
Christopher Neugebauer
32c2d697b0 PEBACK 3 2016-08-16 09:35:34 +10:00
Christopher Neugebauer
20ad44236b PEBCAK 2 removed 2016-08-16 09:34:04 +10:00
Christopher Neugebauer
faa30b8866 Update views.py 
PEBCAK
 2016-08-16 09:14:50 +10:00
Scott Bragg
5ad2aa0888 Merge branch 'chrisjrn/20160815' into lca2017 2016-08-15 23:03:31 +10:00
Scott Bragg
124335cc7c Merge branch 'lca2017' into chrisjrn/20160815 
Conflicts:
	symposion/reviews/views.py
 2016-08-15 23:02:49 +10:00
Christopher Neugebauer
b9b27abdce sigh 2016-08-15 22:42:54 +10:00
Scott Bragg
5540a30c6e Merge pull request #45 from lca2017/revert-44-chrisjrn/20160815 
Revert "(un-oops)"
 2016-08-15 18:58:04 +10:00
Scott Bragg
3f5ee591b6 Revert "(un-oops)" 2016-08-15 18:56:54 +10:00
Scott Bragg
f937f337ba Merge pull request #44 from lca2017/chrisjrn/20160815 
(un-oops)
 2016-08-15 18:49:39 +10:00
Christopher Neugebauer
cc6db4ed88 Fixes some errors with reviewer averages 2016-08-15 15:35:25 +10:00
Christopher Neugebauer
9c2087c778 Merge remote-tracking branch 'origin/lca2017' into chrisjrn/20160815 2016-08-15 15:34:57 +10:00
Scott Bragg
4f71de1dbf Merge pull request #41 from lca2017/chrisjrn/20160815 
Adds more fields to /review/admin
 2016-08-15 14:10:21 +10:00
Christopher Neugebauer
09725bede0 Modifications to review_admin.html (#62) 
* Modifications to review_admin.html

* Adds “submit & jump to random proposal” button

* If user has a speaker profile, display their speaker profile name alongside their comments instead of their user name.
 2016-08-15 14:04:55 +10:00
Christopher Neugebauer
9223c8fc90 Adds “Submit review and jump to random proposal” button 2016-08-15 12:22:40 +10:00
Christopher Neugebauer
9ae17146df More work on the reviewers list 2016-08-15 11:11:25 +10:00
Christopher Neugebauer
24f8ac8757 Makes the reviewer proposals list render properly 2016-08-15 10:44:44 +10:00
Christopher Neugebauer
3217f43af2 Adds abstains and averages to the reviewers scores list. 2016-08-15 10:41:51 +10:00
Christopher Neugebauer
2a6c192449 Refactors the CSV piece to be nicer than it previously was. 2016-08-15 10:17:27 +10:00
Scott Bragg
9e498544c2 Merge pull request #40 from lca2017/chrisjrn/20160813 
Makes the random proposal button take you to under reviewed proposals.
 2016-08-14 12:02:49 +10:00
Christopher Neugebauer
29fa7c63a9 Makes the random proposal button take you to under reviewed proposals. 
Fixes #38
 2016-08-13 12:19:58 +10:00
Christopher Neugebauer
e46c4c4b23 Merge pull request #60 from faulteh/master 
Renders comment markdown and adds a gap between vote and username in …
 2016-08-09 17:28:31 +10:00
Scott Bragg
116f8b55e3 Renders comment markdown and adds a gap between vote and username in review comment 2016-08-09 11:23:57 +10:00
Christopher Neugebauer
504cf77574 Allows us to manage additional speakers from the admin (#58) 
* Allows us to manage additional speakers from the admin

* Show speaker e-mail addresses. Fixes #57

* Denotes fields as required.
 2016-08-04 09:59:50 +10:00
Scott Bragg
cc93f124e9 Merge pull request #35 from lca2017/chrisjrn/20160802 
Bugfixes
 2016-08-02 11:23:56 +10:00
Christopher Neugebauer
03a231093f For some reason, our vote label in reviews.py used a unicode en dash. Oops. 
Fixes #34.
 2016-08-02 10:53:53 +10:00
Christopher Neugebauer
5a8b7ecc30 Fixes markdown cheat sheet links in speaker and proposals forms. 
Fixes #33.
 2016-08-02 10:51:43 +10:00
Christopher Neugebauer
a7fe10a8d9 Removes a case where keypress listeners were loaded twice on markdown fields in the old Symposion theme. (#56) 
Fixes #55.
 2016-07-31 14:52:26 +10:00
Scott Bragg
c12a541ec6 Merge pull request #32 from lca2017/chrisjrn/csv_speaker_email 
Adds the speaker's e-mail address to the CSV output
 2016-07-26 08:22:25 +10:00
Christopher Neugebauer
c0f4707032 Adds the speaker's e-mail address to the CSV output 2016-07-25 14:24:25 -07:00
Christopher Neugebauer
0c4597c4ea Update models.py 
Fixes a typo.

Closes issue #31.
 2016-07-22 13:37:24 -07:00
Christopher Neugebauer
40a4df3767 Fixes for 20160718 (#54) 
* Simple form input fields now use TakeFlight styling

* Styles the form widgets as per the styles in our CSS

* Styling of TextArea now matches the remaining input types

* Adds is_last modifier to navigation dropdown

* Adds admin for talk, tutorial, and miniconf proposals

* Adds an RSS feed

* Adds a link to the RSS page

* Unbreaks the old news index page

* Adds never_cache to the login page, removes the never cache middleware from the settings
 2016-07-20 07:31:13 +10:00
Christopher Neugebauer
6eef5efcfb Customises the CSRF failure view so that it uses the LCA2017 style (#53) 
* Customises the CSRF failure view so that it uses the LCA2017 style

* If a user is logged in and there is a bad_token failure, let them know.
 2016-07-17 17:52:04 +10:00
Christopher Neugebauer
51640e9893 Fix issue in proposals display code (#49) 
* Fixes a biography display-related oops

* Fixes translation issue on cancelled proposals
 2016-07-17 17:51:50 +10:00
Scott Bragg
6598d9f737 Middleware to add never_cache headers to everything (#51) 2016-07-15 12:18:36 +10:00
Christopher Neugebauer
ce10e021f6 _actually_ lets proposal managers view the assistance fields (#48) 2016-07-10 09:18:08 +10:00
Christopher Neugebauer
ecabf31e54 Assorted fixes (#47) 
* Invokes the site tree fix from previous fixes.

* Adds a disclaimer noting that previous years’ accounts have not been carried over.

Fixes #43

* Adds proposal type to the proposal summary page.

Fixes #40

* Adds travel/accommodation assistance to the proposals page, but makes it only visible to speakers in the proposal, or review managers.

Fixes #41.
Fixes #42.

* Reduces a lot of the whitespace in the header and footer.

Fixes #44

* Proposals review page now shows information for every speaker on a proposal.

Fixes #45

* Makes sure that non_field_errors are displayed by forms.

Fixes #37
 2016-07-09 23:14:31 +10:00
Christopher Neugebauer
e32942a49d Fixes django-sitetree’s breaking of 500 reporting. (#39) 2016-07-04 22:23:17 +10:00
Scott Bragg
c5e9152b4c Merge pull request #29 from lca2017/chrisjrn/27-better-csv 
Handles unicode strings properly.
 2016-07-04 22:22:10 +10:00
Christopher Neugebauer
f126330390 Handles unicode strings properly. 2016-07-04 22:18:34 +10:00
Scott Bragg
9c47421d5a Merge pull request #28 from lca2017/chrisjrn/27-better-csv 
Adds a view that returns all proposals in CSV format.
 2016-07-04 21:26:18 +10:00
Christopher Neugebauer
6ebd0f0905 snoops 2016-07-04 16:28:31 +10:00
Christopher Neugebauer
6811708b33 Adds a view that returns all proposals in CSV format. 
Fixes #27
 2016-07-04 16:10:02 +10:00
Scott Bragg
96722e4d55 Merge pull request #26 from lca2017/chrisjrn-patch-1 
Update models.py
 2016-07-04 00:02:21 +10:00
Christopher Neugebauer
40b2747acd Adds a 404 page. (#38) 2016-07-04 00:00:50 +10:00
Christopher Neugebauer
e17df73dde Update models.py 
en-GB spelling of "programme"
 2016-07-03 12:14:07 +10:00
Christopher Neugebauer
3118e4c11c Friday fixes (#36) 
* Monkey-patches a version of send_email that allows BCCs into the django accounts signup process. wtf, etc.

* Adds alt-text to site header

* Favicon.
 2016-07-02 22:56:44 +10:00
Christopher Neugebauer
5abf9ad3ab Merge pull request #34 from faulteh/master 
Added analytics script
 2016-07-01 10:45:40 +10:00