gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4427 commits 2 branches 2 tags 50 MiB
Commit graph

752 commits

Author SHA1 Message Date
Jimmy
3b96d9e63e
[feat] Display happening now events in splashpage 2021-04-13 11:44:40 -07:00
Jimmy
a7a6255656
[style] Fix name of method 2021-04-13 11:44:40 -07:00
Jimmy
2ea27b21da
[feat]Move happening_now to ConferenceHelper 2021-04-13 11:44:40 -07:00
Jimmy
322a5b40bc
[temp] Add no events happening now in splashpage 2021-04-13 11:44:39 -07:00
Jimmy
f260139b2d
[temp]Ajax request of happening now JSON in progress 2021-04-13 11:44:39 -07:00
Jimmy
6fd3c88f76
[feat]Add include_happening_now checkbox to the admin splashpage 2021-04-13 11:44:38 -07:00
Ziyi
7adf6730da
Call mailbluster helpers when registering / cancelling reg to conference 2021-04-13 11:44:29 -07:00
Jimmy
566b057e3c
[refactor] Change to_json to as_json 2021-04-13 11:43:28 -07:00
Jimmy
16b1a969cb
[fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? 2021-04-13 11:43:11 -07:00
Jimmy
0e460e76ec
[feat] happening_now json endpoint returns event embedded in event_schedule 2021-04-13 11:43:11 -07:00
Jimmy
6523eff5ab
[feat] Use existing #happening_now method; respond to both html and json requests 2021-04-13 11:42:17 -07:00
Jimmy
7fe1c597ff
[fix] live_events return json; use the provided happening_now? function 2021-04-13 11:42:15 -07:00
Jimmy
879510bc8c
[feat] Endpoint implementation done 2021-04-13 11:40:29 -07:00
Jimmy
018bbff7b8
implementation in progress 2021-04-13 11:40:28 -07:00
Michael Ball
6e3e1199ef Restore and cleanup the admin conf todo list 2021-03-23 12:54:07 -07:00
Jimmy
54cee7f103 [style] Remove extraneous check 2021-03-11 21:39:51 -08:00
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
Jimmy
11a4d200f7 [test] Fix style; add test for user#count_registration_tickets 2021-03-09 18:25:15 -08:00
Michael Ball
332bf8f1df Support the ability for admins to delete users 2021-03-08 20:19:57 -08:00
Michael Ball
676d10ce36 HACK! Show confirmed status in the all users export 2021-03-08 19:24:34 -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
Sasi Olin
56838b6eb0 Don't set venue related values without a venue 2021-03-07 10:19:10 +01:00
Henne Vogelsang
05adba0e35
Merge pull request #2705 from cycomachead/patch-3 
Fix Frozen String Error in Commercials Controller
 2021-03-06 22:04:48 +01:00
Michael Ball
bc4177154a Add editing submission instructions 2021-03-06 12:45:00 -08:00
Michael Ball
258a2c1489
Fix Frozen String Error in Commercials Controller 
`errors_text` is a frozen string, so `<<` leads to an exception when trying to generate the error message.

https://sentry.cs10.org/share/issue/7867fdaf8eba4387ae2789fd5f1cff3b/
if you want a production example. :)
 2021-03-06 21:40:25 +01:00
Sasi Olin
d540092bfc
Add icalendar files (fixes #2147) 2021-03-06 21:18:39 +01:00
Espartaco Palma
490ea3c4b4
DRY on controllers/conferences_controller 
Conferences.incoming is defined on the model as scope:

  scope :upcoming, (-> { where('end_date >= ?', Date.current) })
Conference.past

  scope :past, (-> { where('end_date < ?', Date.current) })
 2021-03-06 19:00:47 +01:00
Henne Vogelsang
823f41427f
Merge pull request #2591 from openSUSE/remove-travel-schedule 
Remove travel schedule from registration
 2021-03-06 05:04:07 +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
Espartaco Palma
e7452a9d31
Use New Install within their own template 
It used to be a partial inside #index, but having their own page
yields some extra benefits:

- Performance: Move logic from the view to the controller
  - Theres' no need to go extra steps inside the :index view
- UI: Remove the extra 'Upcoming Conferences' when the system needs
  to start the flow of the creation of the first user
 2021-03-06 03:58:32 +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
a599980046 [fix] Fix check for non-free tickets 2021-03-04 16:32:36 -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
7e37b52e20 temp 2021-03-04 11:37:16 -08:00
Jimmy
c1fe73df03 temp 2021-03-04 11:33:27 -08:00
rajavi-mishra
8c230352f9 added more conditions 2021-03-03 13:58:36 -08:00
Jimmy
48a689d452 temp 2021-03-03 13:29:54 -08:00
rajavi-mishra
3f7f5b6bf4 change to conditions 2021-03-03 13:06:38 -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
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
2892a56a1c merge master 2020-12-04 01:17:39 -08:00
Michael Ball
ec352604b8
Use += instead of << with frozen string 2020-12-04 01:12:26 -08:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695) 
* Fix typos
 2020-10-30 11:06:43 +02: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