CactusPuppy
|
f60b07eb32
|
Merge pull request #76 from CactusPuppy/176894996-vertical-schedule
Vertical schedule
|
2021-05-01 11:00:44 -07:00 |
|
Jimmy
|
3a3619cb52
|
[fix]Remove license key in schedules_controller
|
2021-05-01 01:46:06 +08:00 |
|
Jimmy
|
bc115d6f90
|
[feat]Properly add timezone to events starttime and endtime; set now to be the time in conference timezone instead of the user s time zone in fullcalendar
|
2021-05-01 01:37:52 +08:00 |
|
Jimmy
|
c223959ffb
|
[feat]Read fullcalendar license key from ENV
|
2021-04-30 17:58:52 +08:00 |
|
CactusPuppy
|
1c23033f1d
|
Move JS out of view and have calendar start on same day as horizontal schedule
|
2021-04-28 23:53:55 -07:00 |
|
Jimmy
|
49cf115844
|
Fullcalendar integration in progress
|
2021-04-26 11:07:20 +08:00 |
|
Jimmy
|
4f2abd7e25
|
[feat]Add vertical schedule tab in Schedule
|
2021-04-26 10:41:54 +08:00 |
|
Jimmy
|
e1918fbf7e
|
[feat]Implement FullCalendar#rooms_to_resources and add tests
|
2021-04-26 09:48:16 +08:00 |
|
Ziyi
|
147b7f4939
|
FullCalendar controller init, FullCalendarFormatter service
|
2021-04-24 19:21:07 -07:00 |
|
Jimmy
|
bafeca7ab9
|
[fix]Remove duplicate code
|
2021-04-22 01:24:14 +08:00 |
|
Jimmy
|
83e7321b69
|
[style]Fix rubocop
|
2021-04-22 00:43:27 +08:00 |
|
rajavi-mishra
|
d564de7caa
|
show happening now and happening next on the events page
|
2021-04-21 09:01:12 -07:00 |
|
Jimmy
|
24d2fa89a8
|
[style]Remove unused code
|
2021-04-19 19:23:41 +08:00 |
|
Jimmy
|
ab15a3fb10
|
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later?
|
2021-04-17 08:30:07 +08:00 |
|
Jimmy
|
2f8cee3c4f
|
[feat]Splashpage will display happening next event if no event is happening now
|
2021-04-17 00:00:52 +08:00 |
|
Jimmy
|
e08a465889
|
Merge branch 'master' into 177717903-move-constants-to-configuration-file
|
2021-04-13 12:06:59 +08:00 |
|
CactusPuppy
|
d6fe38bb2c
|
Merge branch 'master' into 176895554/mailbluster
|
2021-04-12 15:27:20 -07:00 |
|
Jimmy
|
b7fbba162b
|
[refactor]Move constants to configuration file
|
2021-04-12 14:01:49 +08:00 |
|
Jimmy
|
346f324bef
|
[feat]Display happening now only if program is also displayed
|
2021-04-10 00:44:42 +08:00 |
|
Jimmy
|
3c7cc6cfdb
|
[feat]Use Ajax for paginating happening_now
|
2021-04-09 17:16:16 +08:00 |
|
Jimmy
|
185b2773d7
|
[feat]Add bootstrap style to pagination navbar
|
2021-04-09 16:33:39 +08:00 |
|
madhekare
|
228ec4a650
|
items per page
|
2021-04-07 21:26:31 -07:00 |
|
madhekare
|
c9c31d6db5
|
pagination
|
2021-04-07 21:07:24 -07:00 |
|
madhekare
|
77b6dac6a2
|
pagination happening now
|
2021-04-07 20:56:03 -07:00 |
|
Ziyi
|
efdf1f03df
|
Call mailbluster helpers when registering / cancelling reg to conference
|
2021-04-07 14:50:27 -07:00 |
|
Jimmy
|
eda0c1a175
|
[feat] Display happening now events in splashpage
|
2021-04-07 10:34:49 +08:00 |
|
Jimmy
|
85cfb0cbef
|
[style] Fix name of method
|
2021-04-06 13:27:05 +08:00 |
|
Jimmy
|
d6cfecc960
|
[feat]Move happening_now to ConferenceHelper
|
2021-04-06 13:16:59 +08:00 |
|
Jimmy
|
e2d775e398
|
[temp] Add no events happening now in splashpage
|
2021-04-05 20:45:40 +08:00 |
|
Jimmy
|
9bfe64c28f
|
[temp]Ajax request of happening now JSON in progress
|
2021-04-05 15:07:18 +08:00 |
|
Jimmy
|
65119149ea
|
[feat]Add include_happening_now checkbox to the admin splashpage
|
2021-04-01 13:14:31 +08:00 |
|
Jimmy
|
7b3d97fdbb
|
[refactor] Change to_json to as_json
|
2021-03-31 16:08:44 +08:00 |
|
Jimmy
|
e2f5b5e933
|
Merge master
|
2021-03-31 07:49:30 +08:00 |
|
Jimmy
|
0ede07dfaa
|
[fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now?
|
2021-03-31 07:45:26 +08:00 |
|
Michael Ball
|
6e3e1199ef
|
Restore and cleanup the admin conf todo list
|
2021-03-23 12:54:07 -07:00 |
|
Jimmy
|
bfc39fdbe4
|
[feat] happening_now json endpoint returns event embedded in event_schedule
|
2021-03-20 13:34:14 +08:00 |
|
Jimmy
|
871457f65b
|
[feat] Use existing #happening_now method; respond to both html and json requests
|
2021-03-17 21:02:35 +08:00 |
|
Jimmy
|
034313cccb
|
[fix] live_events return json; use the provided happening_now? function
|
2021-03-17 07:34:51 +08:00 |
|
Jimmy
|
8e95325119
|
[feat] Endpoint implementation done
|
2021-03-16 22:13:55 +08:00 |
|
Jimmy
|
7475a40775
|
implementation in progress
|
2021-03-12 10:38:47 -08: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 |
|