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
|
66767c33a2
|
[feat]Change border color of event
|
2021-04-30 19:19:30 +08:00 |
|
Jimmy
|
8aaabe4435
|
[feat]Add valid date range to fullcalendar
|
2021-04-30 19:06:50 +08:00 |
|
Jimmy
|
5197ddbe24
|
[feat]Add now indicator to fullcalendar
|
2021-04-30 18:59:21 +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 |
|
Jimmy
|
a0e3770dc3
|
[feat]Remove All Day in fullcalendar view
|
2021-04-30 16:50:18 +08:00 |
|
Jimmy
|
1de29c4df1
|
[doc]Add comment in fullcalendar.js so that if events are added to database with timezone info explicitly, the fullcalendar can be fixed
|
2021-04-30 16:32:06 +08:00 |
|
Jimmy
|
96944f704f
|
[style]Fix rubocop
|
2021-04-30 15:41:06 +08:00 |
|
Jimmy
|
b754d68692
|
[feat]Add url, background color, text color to events in vertical schedule
|
2021-04-30 15:14:46 +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 |
|
CactusPuppy
|
2695aebc07
|
Remove Vertical Schedule tab
|
2021-04-28 23:21:53 -07:00 |
|
CactusPuppy
|
22961c4071
|
Revert "Commit to using Yarn over NPM"
This reverts commit dd6a2600e7.
|
2021-04-28 23:07:13 -07:00 |
|
CactusPuppy
|
a81519ce68
|
Allow users who are not signed-in to view vertical_schedule endpoint
|
2021-04-28 21:44:00 -07:00 |
|
CactusPuppy
|
dd6a2600e7
|
Commit to using Yarn over NPM
|
2021-04-28 21:42:16 -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 |
|
Jimmy
|
adb6eb8526
|
[feat]Implement FullCalendarFormatter#event_schedules_to_resources; Add tests
|
2021-04-26 10:34:14 +08:00 |
|
Jimmy
|
e1918fbf7e
|
[feat]Implement FullCalendar#rooms_to_resources and add tests
|
2021-04-26 09:48:16 +08:00 |
|
Ziyi
|
54d7c31cac
|
FullCalendarFormatter spec init
|
2021-04-24 19:30:52 -07:00 |
|
Ziyi
|
147b7f4939
|
FullCalendar controller init, FullCalendarFormatter service
|
2021-04-24 19:21:07 -07:00 |
|
kingdish
|
014613248e
|
Merge pull request #70 from CactusPuppy/177555226-happening-next
Happening next events
|
2021-04-21 08:24:49 +08:00 |
|
Jimmy
|
2280d1f7b6
|
[fix]Change wording when no events is happening now or next
|
2021-04-20 13:21:19 +08:00 |
|
Jimmy
|
24d2fa89a8
|
[style]Remove unused code
|
2021-04-19 19:23:41 +08:00 |
|
Jimmy
|
47f183fc89
|
[style]Fix duplicate code in conference_helper
|
2021-04-19 19:01:31 +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 |
|
Michael Ball
|
eaf13b1b69
|
Merge branch 'master' into master
|
2021-04-15 20:29:54 -07:00 |
|
Jimmy
|
e08a465889
|
Merge branch 'master' into 177717903-move-constants-to-configuration-file
|
2021-04-13 12:06:59 +08:00 |
|
kingdish
|
e340758e6e
|
Merge pull request #66 from CactusPuppy/177736599-program#any_event_for_this_date
Fix program#any_event_for_this_date
|
2021-04-13 12:05:14 +08:00 |
|
Jimmy
|
7284f6f50d
|
[fix]Fix empty string check
|
2021-04-13 11:47:13 +08:00 |
|
Jimmy
|
b3b5e890ee
|
[fix]Fix program#any_event_for_this_date?
|
2021-04-13 11:41:13 +08:00 |
|
Jimmy
|
4fcc610b24
|
[feat]Config read from environment variables
|
2021-04-13 11:03:37 +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 |
|
CactusPuppy
|
272b5d20ce
|
Add newline at end of show.js.erb file
|
2021-04-11 13:46:56 -07:00 |
|
CactusPuppy
|
d6da99cc1f
|
Fix Rubocop complaints
|
2021-04-09 11:54:11 -07:00 |
|
CactusPuppy
|
cacb265829
|
Get destroy job working properly and prevent misfires on updated users
|
2021-04-09 10:55:46 -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 |
|