Jimmy
85c7b31a77
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895512-automatically-redirect-to-registration-after-buying-a-ticket
2021-03-10 14:58:01 -08:00
Michael Ball
f3271f5cdc
Merge master
2021-03-08 16:48:06 -08:00
Michael Ball
d1ca21f479
Merge OSEM updates
2021-03-08 02:50:27 -08:00
Stella Rouzi
ee5274b352
Fix JS error when saving survey_question
2021-03-07 07:32:52 +02:00
Michael Ball
3d99661d02
Add a submission instructions columns
2021-03-06 11:30:57 -08:00
Espartaco Palma
fd2635509f
Introducing delegation for city and country name (Conference - Venue
...
Using ActiveSupport delegate macro.
2021-03-06 19:06:36 +01:00
James Mason
7a04f3582f
Remove travel schedule from registration
...
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
2021-03-06 04:09:02 +01:00
Jimmy
da8939dd3a
[feat] remove unintended check; add auto-redirect to non-free ticket
2021-03-04 21:50:26 -08:00
Jimmy
1ca58961c1
[style] Rubocop
2021-03-04 16:34:47 -08:00
Jimmy
7d70462542
[refactor] Clean up unused code
2021-03-04 15:47:48 -08:00
Jimmy
189c2ec75f
[fix] Fix user.count_registration_tickets
2021-03-04 15:34:06 -08:00
rajavi-mishra
b72dfdabf8
conditions completed
2021-03-04 11:55:45 -08:00
Jimmy
c1fe73df03
temp
2021-03-04 11:33:27 -08:00
CactusPuppy
626eaee761
Remove unnecessary self
2021-02-27 23:03:29 -08:00
CactusPuppy
16f5ed6138
Refactor calculation of submission limit and abstract limit into helper function
2021-02-27 22:54:35 -08:00
CactusPuppy
b94894fe87
Update annotate_models
2021-02-26 11:04:20 -08:00
CactusPuppy
42d43319c5
fix indentation error
2021-02-25 20:12:20 -08:00
madhekare
b8f531783b
submission text control/model modifications
2021-02-24 23:41:18 -08:00
CactusPuppy
d63a22c54e
Fix Rubocop issues
2021-02-24 19:22:21 -08:00
Michael Ball
e0fd14e0ce
Cleanup omniauth specs
2021-02-23 19:49:34 -08:00
Michael Ball
d4a2861051
Improve Registration Flow Some:
...
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
2021-02-23 18:17:45 -08:00
Michael Ball
d7e24f6521
Run annotate_models
2021-02-20 09:57:27 -08:00
Michael Ball
20ea622bd3
display all speakers in an event when highlighted
2020-12-10 23:27:16 -08:00
Michael Ball
01612a73cf
Tighten up happening now
2020-07-31 12:24:25 -07:00
Michael Ball
0b0518d67d
A better happening now, with admin debug on. LOL
2020-07-31 10:58:37 -07:00
Michael Ball
61f5c9e0ee
More consistent happening now formatting
2020-07-31 10:26:23 -07:00
Michael Ball
70bde86dd6
Add a Happening Now View
2020-07-30 22:31:45 -07:00
Michael Ball
0d4733b130
Update users controller
2020-07-30 02:20:10 -07:00
Michael Ball
e4c31633c5
i hate life
2020-07-29 22:51:26 -07:00
Michael Ball
32ef4a294b
GDI...typo.
2020-07-29 22:42:45 -07:00
Michael Ball
899d973020
ugh timezones
2020-07-29 22:21:26 -07:00
Michael Ball
7181b05a83
Tweak timezone check and minor style tweaks
2020-07-29 22:16:34 -07:00
Michael Ball
13d78c2609
Fix display of volunteer events
2020-07-27 00:23:56 -07:00
Michael Ball
8e1d03a318
Allow scheduling volunteers for sessions.
...
Also fix a small bug for admin registrations edit.
2020-07-25 17:38:44 -07:00
Michael Ball
f86c474002
Sort events by time,room on the linear schedule
2020-07-23 02:28:36 -07:00
Michael Ball
4babd84439
Sort events by time
2020-07-17 23:06:43 -07:00
Michael Ball
61be84a7f9
tidying up
2020-07-17 20:31:48 -07:00
Michael Ball
31dfd62fbd
Better design for room URLs
2020-07-17 10:03:07 -07:00
Michael Ball
a9d6faf1a3
Support forcing the order of rooms in the schedule
2020-07-16 11:25:20 -07:00
Michael Ball
43c0d4a3f5
I think this fixes a bug in changing conference times
2020-07-16 00:32:32 -07:00
Michael Ball
d5a9b79f6e
Show profile pictures to admins and allow them to upload pics
2020-07-15 23:37:40 -07:00
Michael Ball
10d58ef050
Support selecting various sizes of profile pics
2020-07-15 23:27:22 -07:00
Michael Ball
3883188dcd
Support Users Directly Uploading Profile Pictures.
...
* Adds a `picture` attribute to `User`.
* Preserves Gravatar as a fallback option.
* Now, you should use `user.profile_picturer` instead of `gravatar_url`
* TODO: Ensure `profile_picture` handles sizing right for uploaded images.
2020-07-14 21:06:15 -07:00
Michael Ball
18ee10eef5
tweak payment text
2020-07-13 00:48:45 -07:00
Michael Ball
1964522f49
Add warnings when a user needs to register or complete a purchase
2020-07-11 01:50:17 -07:00
Michael Ball
5bef4b7004
Assert that a user has a paid ticket before registering for a conference.
2020-07-11 00:57:08 -07:00
Michael Ball
74b77e132d
A bit of a hack to accept any webpage...
2020-07-10 21:22:10 -07:00
Michael Ball
0877aadb2e
Merge some contributor fixes
2020-06-30 00:48:47 -07:00
Andrew Kvalheim
e4251d7b67
Merge #2654 "Fix access to the version history of organization-level roles"
2020-06-26 20:19:34 -07:00
Michael Ball
f9a3bd73a2
Add fallback oembeds
2020-06-18 11:01:39 -07:00
