c7d445a02ddb6dccb0f572c9fc998ea20fba4e27 to 0ee69a4d877a7ef50db1069bdeb1b724c58606c5 · degrowth / scriptorium · GitLab

This project is archived. Its data is read-only. This project is read-only.

Commits on Source 100+

17d6380b Merge branch 'deployment' into impl-202
Dec 01, 2017
4fcb43e5 Fix code typo
Dec 01, 2017
f35dbe39 Hardcode listing of session types for Malmö conference
Dec 01, 2017
f15b075e Remove subcategories
Dec 01, 2017
9a7b80cb Remove bogus line
Dec 01, 2017
74130734 Change session types (#202)
Dec 01, 2017
0c20f85c update event form
Dec 01, 2017
77b353f9 omit being redirected to new when providing new session types
Dec 01, 2017
0de6f949 update CfP events form
Dec 01, 2017
52352ddf remove subcategories from new CfP entry form
Dec 01, 2017
e7765f5e display session types according to a user's capability
Dec 01, 2017
a7622b5d do not require a subcategory_id for event submission
Dec 01, 2017
68ba7dbf remove subcategory validation from event model
Dec 01, 2017
15e2b617 remove Keynote from event model
Dec 01, 2017
75419c72 Place submission notes close to track choice and improve hint (#202 )
Dec 01, 2017
a2f9b877 simplify CfP dashboard
Dec 01, 2017
052d9e0f Merge branch 'impl-202' into deployment
Dec 01, 2017
41e75ef9 Replace submission info string and increase abstract length
Dec 01, 2017
1c5339fb adjust character limit roughly
Dec 01, 2017
edb31adc find strings in locales, too
Dec 01, 2017
bda1b0c1 adjust event model validation for abstract length
Dec 02, 2017
6984f24c change Abstract to include Proposal
Dec 02, 2017
db707631 Commented out Bullet from development.rb due to error with uninitiatialized constant
Dec 26, 2017
49d4a973 Production > Development
Dec 26, 2017
6a8616ef Do not consider_all_requests_local on dev
Dec 26, 2017
1a1b1097 listen on all interfaces
Dec 26, 2017
9f0e2290 session display : check for time slots set, fixes #205
Dec 26, 2017
343049a2 show all events as reviewable to CfP participants, closes #204
Dec 26, 2017
08b217c4 Revert "listen on all interfaces"
Jan 03, 2018
a23457d0 Revert "Production > Development"
Jan 03, 2018
29373522 Remove regional contextualisation from review rating session) (#211 )
Jan 27, 2018
36a3f999 Adjust description for conference themes assessment in review form
Jan 27, 2018
c202b5b6 Use dev env
Jan 27, 2018
90468fbf Create .env for development mode
Jan 27, 2018
da8c78ef Fix statistics to Malmö session types (#211 )
Jan 27, 2018
fe45233e Previous .env (not working for dev deployments)
Jan 27, 2018
901c0dcc Procfile: make rails listen to all interfaces
Jan 28, 2018
f6bde1b3 Remove regional contextualisation from review form (#211 )
Jan 29, 2018
6990ae44 Remove subcategories matching on reviewers ability (#213 )
Jan 30, 2018
354f502c Remove subcategories from reviewer ability (#213 )
Jan 30, 2018
d948ff2a Remove subcategories from conference user (#213 )
Jan 31, 2018
745a0b07 Remove subcategories and conference_match from user model (#213 )
Jan 31, 2018
ff28c230 Remove subcategory join on user (#213 )
Jan 31, 2018
976fa45e Remove subcategories_assigned_to_in from events controller (#213 )
Jan 31, 2018
e2cc32b6 Remove subcategories_assigned_to_in in views (#213 )
Jan 31, 2018
9cbc3e08 Remove Subcategory column from review table (#213 )
Jan 31, 2018
6d12ca32 Merge branch '211-content-coherence-scriptum' into 'deployment'
Jan 31, 2018
b861bf2b Removing subcategory for reviewers on events_controller (#213 #214 )
Jan 31, 2018
1ef5188f Allow up to 3 reviews and 2 expert reviews (Malmö #215 )
Feb 07, 2018
e919f5f5 Increase maximum number of reviews to 5
Mar 14, 2018
5253f9fa Increase review limit to 5 per event and peer/expert (#221 )
Mar 19, 2018
7e2848ca Add activist and artistic session types (#236 )
Apr 05, 2018
142a6963 Merge branch 'issue-236_session_types' into 'deployment'
Apr 07, 2018
32f8d28b Add pretix widget css and js to header (#232 )
Apr 11, 2018
e914f230 Add widget embed code to CfP dashboard
Apr 11, 2018
6b874c1f Merge branch 'deployment' into issue232_tickets_widget
Apr 12, 2018
ddd32ec8 Add pretix-widget to cfp
Apr 12, 2018
ecdedfce Add pretix-widget.js and css to assets initializer
Apr 12, 2018
408f63c3 Properly name pretix-widget.css
Apr 12, 2018
1bc95023 Add condition to show only to users with accepted sessions
Apr 14, 2018
d984c0ad Improve text inviting to buy ticket (#232 )
Apr 14, 2018
ee73e27c Merge branch 'issue232_tickets_widget' into 'deployment'
Apr 15, 2018
a58256f9 repair session labelling for #16
Jun 30, 2018
902a914d add new session types for #240
Jun 30, 2018
d77d0243 minor fixes for #240
Jun 30, 2018
a95e0868 update events controller to filter custom event scopes
Jun 30, 2018
2b9c3cdc update application view for events for readability
Jun 30, 2018
89323c5b remove subcategory from events views
Jun 30, 2018
cf476386 add condition to test unscheduled event for available time slots
Jun 30, 2018
d7242278 change contact information, fixes #237
Jun 30, 2018
3033ebf3 updated and new session types, fixes #241
Jul 04, 2018
deb89553 add missing parts to controller and view
Jul 04, 2018
44319523 update event model for #241
Jul 04, 2018
4ee43fb6 Merge branch 'impl-240' into 'deployment'
Jul 05, 2018
0dcc65ea Merge branch 'impl-239' into 'deployment'
Jul 05, 2018
3ed23eb1 Merge branch 'impl-241' into 'deployment'
Jul 05, 2018
1c730e4a attempt correcting display of overlapping events
Aug 09, 2018
357c5f3e Revert "add condition to test unscheduled event for available time slots"
Aug 09, 2018
704ba675 reattempt #239 , closes #243
Aug 09, 2018
aff3e2dd circumvent broken modal for sane display of unscheduled events
Aug 09, 2018
e0589783 remove overflow from conflicting events, fixes #246
Aug 09, 2018
300e43ef refactor fallbacks for unscheduled events to also show those without time slots
Aug 09, 2018
e3682e56 iterate on the previous
Aug 09, 2018
f2f36153 iterate on the previous
Aug 09, 2018
6e2dd584 cont., better wording
Aug 09, 2018
ab42a2d8 filter displayed events without time slots
Aug 09, 2018
c4092ffd refactor unscheduled events display
Aug 09, 2018
d1a0ae09 cont. refactor unscheduled events display
Aug 09, 2018
a1379c25 cont., wording
Aug 09, 2018
967d2600 cont. refactor unscheduled events display
Aug 09, 2018
4e640d7c cont.
Aug 09, 2018
cd0285ca cont.
Aug 09, 2018
7bfa6531 cont.
Aug 09, 2018
d207a611 indentation
Aug 09, 2018
dc1f9d83 cont.
Aug 09, 2018
1a816ca5 cont. refactor unscheduled events display
Aug 09, 2018
831b3f85 cont., wording
Aug 09, 2018
999c6c6c cont. refactor unscheduled events display
Aug 09, 2018
ed5bcf72 cont.
Aug 09, 2018
bf9542f5 cont.
Aug 09, 2018

Additional commits have been omitted to prevent performance issues.