Commits · 300e43ef2a4e11dc01a203405907f75f0acd186b · degrowth / scriptorium

Aug 09, 2018
- refactor fallbacks for unscheduled events to also show those without time slots · 300e43ef
  Jon Richter authored Aug 09, 2018
  
  300e43ef
- remove overflow from conflicting events, fixes #246 · e0589783
  Jon Richter authored Aug 09, 2018
  
  e0589783
- circumvent broken modal for sane display of unscheduled events · aff3e2dd
  Jon Richter authored Aug 09, 2018
  
  aff3e2dd
- reattempt #239, closes #243 · 704ba675
  Jon Richter authored Aug 09, 2018
```
This is how it should have been done in the first place. An additional
condition proves enough to guard against unscheduled events, that do not
even have time slots defined.
```
  704ba675
- Revert "add condition to test unscheduled event for available time slots" · 357c5f3e
  Jon Richter authored Aug 09, 2018
```
This reverts commit cf476386.
```
  357c5f3e
- attempt correcting display of overlapping events · 1c730e4a
  Jon Richter authored Aug 09, 2018
  
  1c730e4a
Jul 05, 2018

Merge branch 'impl-241' into 'deployment' · 3ed23eb1
Jon Richter authored Jul 05, 2018
```
Implement new session types and update another

Closes #241

See merge request !21
```
3ed23eb1

Merge branch 'impl-239' into 'deployment' · 0dcc65ea

Jon Richter authored Jul 05, 2018

Implement working schedule and cosmetic changes, fixes #239

Closes #239 and #237

See merge request !20

0dcc65ea

Merge branch 'impl-240' into 'deployment' · 4ee43fb6
Jon Richter authored Jul 05, 2018
```
Implement new session types, fixes #240

Closes #240

See merge request !19
```
4ee43fb6

Jul 04, 2018
- update event model for #241 · 44319523
  Jon Richter authored Jul 04, 2018
  
  44319523
- add missing parts to controller and view · deb89553
  Jon Richter authored Jul 04, 2018
  
  deb89553
- updated and new session types, fixes #241 · 3033ebf3
  Jon Richter authored Jul 04, 2018
  
  3033ebf3
Jun 30, 2018
- change contact information, fixes #237 · d7242278
  Jon Richter authored Jun 30, 2018
  
  d7242278
- add condition to test unscheduled event for available time slots · cf476386
  Jon Richter authored Jun 30, 2018
  
  cf476386
- remove subcategory from events views · 89323c5b
  Jon Richter authored Jun 30, 2018
  
  89323c5b
- update application view for events for readability · 2b9c3cdc
  Jon Richter authored Jun 30, 2018
  
  2b9c3cdc
- update events controller to filter custom event scopes · a95e0868
  Jon Richter authored Jun 30, 2018
  
  a95e0868
- minor fixes for #240 · d77d0243
  Jon Richter authored Jun 30, 2018
  
  d77d0243
- add new session types for #240 · 902a914d
  Jon Richter authored Jun 30, 2018
  
  902a914d
- repair session labelling for #16 · a58256f9
  Jon Richter authored Jun 30, 2018
  
  a58256f9
Apr 16, 2018
- Merge branch 'issue232_tickets_widget' into 'deployment' · ee73e27c
  Jon Richter authored Apr 15, 2018
```
Issue-232 integrate pretix-widget

Closes #232

See merge request !18
```
  ee73e27c
Apr 14, 2018
- Improve text inviting to buy ticket (#232 ) · d984c0ad
  Gualter authored Apr 14, 2018
  
  d984c0ad
- Add condition to show only to users with accepted sessions · 1bc95023
  Gualter authored Apr 12, 2018
  
  1bc95023
Apr 12, 2018
- Properly name pretix-widget.css · 408f63c3
  Gualter authored Apr 12, 2018
  
  408f63c3
- Add pretix-widget.js and css to assets initializer · ecdedfce
  Gualter authored Apr 12, 2018
  
  ecdedfce
- Add pretix-widget to cfp · ddd32ec8
  Gualter authored Apr 12, 2018
  
  ddd32ec8
- Merge branch 'deployment' into issue232_tickets_widget · 6b874c1f
  Gualter authored Apr 12, 2018
  
  6b874c1f
Apr 11, 2018
- Add widget embed code to CfP dashboard · e914f230
  Gualter authored Apr 11, 2018
  
  e914f230
- Add pretix widget css and js to header (#232 ) · 32f8d28b
  Gualter authored Apr 11, 2018
  
  32f8d28b
Apr 07, 2018
- Merge branch 'issue-236_session_types' into 'deployment' · 142a6963
  Jon Richter authored Apr 07, 2018
```
Add activist and artistic session types (#236)

See merge request !16
```
  142a6963
Apr 05, 2018
- Add activist and artistic session types (#236 ) · 7e2848ca
  Gualter authored Apr 05, 2018
  
  7e2848ca
Mar 19, 2018
- Increase review limit to 5 per event and peer/expert (#221 ) · 5253f9fa
  Gualter authored Mar 19, 2018
  
  5253f9fa
Mar 14, 2018
- Increase maximum number of reviews to 5 · e919f5f5
  Gualter authored Mar 14, 2018
  
  e919f5f5
Feb 07, 2018
- Allow up to 3 reviews and 2 expert reviews (Malmö #215 ) · 1ef5188f
  Gualter authored Feb 07, 2018
  
  1ef5188f
Jan 31, 2018
- Removing subcategory for reviewers on events_controller (#213 #214 ) · b861bf2b
  Gualter authored Jan 31, 2018
  
  b861bf2b
- Merge branch '211-content-coherence-scriptum' into 'deployment' · 6d12ca32
  Jon Richter authored Jan 31, 2018
```
Adaptating review to the Malmö conference structure

Closes #211 and #213

See merge request !15
```
  6d12ca32
- Remove Subcategory column from review table (#213 ) · 9cbc3e08
  Gualter authored Jan 31, 2018
  
  9cbc3e08
- Remove subcategories_assigned_to_in in views (#213 ) · e2cc32b6
  Gualter authored Jan 31, 2018
  
  e2cc32b6
- Remove subcategories_assigned_to_in from events controller (#213 ) · 976fa45e
  Gualter authored Jan 31, 2018
  
  976fa45e
- Remove subcategory join on user (#213 ) · ff28c230
  Gualter authored Jan 31, 2018
  
  ff28c230