CactusPuppy
|
f60b07eb32
|
Merge pull request #76 from CactusPuppy/176894996-vertical-schedule
Vertical schedule
|
2021-05-01 11:00:44 -07:00 |
|
Jimmy
|
4a0da37a96
|
merge
|
2021-05-01 01:42:03 +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 |
|
CactusPuppy
|
5b06b4d8bb
|
[feat] Prevent license key from being embedded in view
|
2021-04-30 09:56:40 -07:00 |
|
Jimmy
|
8aaabe4435
|
[feat]Add valid date range to fullcalendar
|
2021-04-30 19:06:50 +08:00 |
|
Jimmy
|
ccbc2ed0d5
|
[style]Fix haml-lint
|
2021-04-30 18:01:33 +08:00 |
|
Jimmy
|
c223959ffb
|
[feat]Read fullcalendar license key from ENV
|
2021-04-30 17:58:52 +08:00 |
|
Jimmy
|
a35badb2ca
|
[feat]Restrict fullcalendar to display time from the start hour to end hour of a conference
|
2021-04-30 17:33:16 +08:00 |
|
Rajavi Mishra
|
42882d852b
|
Merge branch 'master' into 176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration
|
2021-04-29 13:34:24 -07:00 |
|
Rajavi Mishra
|
b323018d43
|
Merge pull request #74 from CactusPuppy/176894823-Cleanup-Page-Title-on-Conference-Materials-Page
176894823 cleanup page title on conference materials page
|
2021-04-29 13:30:42 -07: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 |
|
CactusPuppy
|
2695aebc07
|
Remove Vertical Schedule tab
|
2021-04-28 23:21:53 -07:00 |
|
Jimmy
|
df729b7dde
|
[feat]Fullcalendar integration done
|
2021-04-26 17:33:31 +08: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 |
|
rajavi-mishra
|
4b2a2c5d5c
|
sign-in check added
|
2021-04-24 23:13:12 -07:00 |
|
rajavi-mishra
|
6ebfdefbbd
|
fixed the title
|
2021-04-24 22:19:36 -07:00 |
|
rajavi-mishra
|
6fa21fcba5
|
testing
|
2021-04-21 21:40:08 -07:00 |
|
rajavi-mishra
|
690ea5b2a9
|
[style] changes to styling and wording
|
2021-04-21 10:47:49 -07:00 |
|
Jimmy
|
83e4601ddb
|
[fix]Add nil check for happening_now partial
|
2021-04-22 01:13:56 +08:00 |
|
Jimmy
|
74437ab1e5
|
[fix]Remove unnecessary check in happening_now partial
|
2021-04-22 00:59:38 +08:00 |
|
Jimmy
|
c4920ba85d
|
[fix]Fix ajax for pagination
|
2021-04-22 00:40:53 +08:00 |
|
rajavi-mishra
|
d564de7caa
|
show happening now and happening next on the events page
|
2021-04-21 09:01:12 -07:00 |
|
Jimmy
|
2280d1f7b6
|
[fix]Change wording when no events is happening now or next
|
2021-04-20 13:21:19 +08:00 |
|
Jimmy
|
4e68989955
|
[test]Add integration tests for the happening now section on the splashpage
|
2021-04-19 14:24:54 +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
|
59c5d432ed
|
[style]Remove extra white space
|
2021-04-17 00:22:17 +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 |
|
CactusPuppy
|
272b5d20ce
|
Add newline at end of show.js.erb file
|
2021-04-11 13:46:56 -07:00 |
|
Jimmy
|
346f324bef
|
[feat]Display happening now only if program is also displayed
|
2021-04-10 00:44:42 +08:00 |
|
Jimmy
|
6c96328f46
|
[feat]Add brief version of event partial; fix style
|
2021-04-09 22:17:33 +08:00 |
|
Jimmy
|
02300ee8f2
|
[feat]Description / happening now takes the entire row if the other is empty
|
2021-04-09 22:01:57 +08:00 |
|
Jimmy
|
3c7cc6cfdb
|
[feat]Use Ajax for paginating happening_now
|
2021-04-09 17:16:16 +08:00 |
|
Jimmy
|
9601328df8
|
[style]Fix style
|
2021-04-09 16:51:04 +08:00 |
|
Jimmy
|
5f776f9275
|
[refactor]Delete unused javascript; Move about-and-happening-now to partial
|
2021-04-09 16:41:16 +08:00 |
|
Jimmy
|
185b2773d7
|
[feat]Add bootstrap style to pagination navbar
|
2021-04-09 16:33:39 +08:00 |
|
Jimmy
|
bb44f10120
|
[fix]Fix style; Re-enable checking happening now
|
2021-04-08 12:52:27 +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 |
|
Jimmy
|
8b6d70b73c
|
[fix]Fix trapezoid on splashpage
|
2021-04-07 22:50:27 +08:00 |
|
Jimmy
|
04455bbbdf
|
[feat]Add md lg view for happening_now column
|
2021-04-07 18:55:34 +08:00 |
|
Jimmy
|
7d51ff9eb4
|
[feat]Display description and happening now in two columns; display happening now first in sm view
|
2021-04-07 17:55:20 +08:00 |
|
Jimmy
|
9e2c78e236
|
[style]Fix style
|
2021-04-07 11:13:41 +08:00 |
|
Jimmy
|
4abcc57d7b
|
[feat]Add a title for happening now section in splashpage
|
2021-04-07 11:06:48 +08:00 |
|
Jimmy
|
8d71fa85cd
|
[feat]Center happening now events on the splashpage
|
2021-04-07 11:00:03 +08:00 |
|
Jimmy
|
eda0c1a175
|
[feat] Display happening now events in splashpage
|
2021-04-07 10:34:49 +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
|
093241fd0a
|
[temp] Add happening_now placeholder in splashpage
|
2021-04-01 13:30:44 +08:00 |
|