Michael Ball
|
23c14f82f8
|
Fix show_voting? so it is true even during the voting period
|
2021-05-03 03:36:55 -07:00 |
|
Michael Ball
|
653395c123
|
Merge pull request #147 from CactusPuppy/master
CS169L Spring 2021 Team 5 Final PR
|
2021-05-03 03:18:40 -07:00 |
|
Michael Ball
|
5688fd1d1a
|
temporarily disable the conference specific email image
|
2021-05-03 03:17:28 -07:00 |
|
CactusPuppy
|
07eb7114ca
|
Merge branch 'snap-cloud-master'
|
2021-05-01 18:12:02 -07:00 |
|
CactusPuppy
|
6748d1ea1b
|
[fix] Fix typo in header
|
2021-05-01 18:06:44 -07:00 |
|
rajavi-mishra
|
4938efa2cb
|
linter changes
|
2021-05-01 18:06:43 -07:00 |
|
rajavi-mishra
|
87901960ca
|
changes to the feature
|
2021-05-01 18:06:40 -07:00 |
|
rajavi-mishra
|
e2245001d4
|
[feat] show alert when user has 0 ticket purchases
|
2021-05-01 18:06:38 -07:00 |
|
CactusPuppy
|
2dbcf95425
|
[feat] Prevent license key from being embedded in view
|
2021-05-01 18:06:35 -07:00 |
|
Jimmy
|
6777ffb0bb
|
[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 18:05:48 -07:00 |
|
Jimmy
|
29b7f057c7
|
[feat]Add valid date range to fullcalendar
|
2021-05-01 18:05:47 -07:00 |
|
Jimmy
|
13ec5c22d9
|
[style]Fix haml-lint
|
2021-05-01 18:05:45 -07:00 |
|
Jimmy
|
cb6219e812
|
[feat]Read fullcalendar license key from ENV
|
2021-05-01 18:05:45 -07:00 |
|
Jimmy
|
657c9fdfb8
|
[feat]Restrict fullcalendar to display time from the start hour to end hour of a conference
|
2021-05-01 18:05:44 -07:00 |
|
CactusPuppy
|
468e170a2e
|
Move JS out of view and have calendar start on same day as horizontal schedule
|
2021-05-01 18:04:50 -07:00 |
|
CactusPuppy
|
409fd09514
|
Remove Vertical Schedule tab
|
2021-05-01 18:04:49 -07:00 |
|
Jimmy
|
5296d18c27
|
[feat]Fullcalendar integration done
|
2021-05-01 18:04:47 -07:00 |
|
Jimmy
|
9d6ab55d13
|
Fullcalendar integration in progress
|
2021-05-01 18:04:46 -07:00 |
|
Jimmy
|
1bc6b092de
|
[feat]Add vertical schedule tab in Schedule
|
2021-05-01 18:04:45 -07:00 |
|
rajavi-mishra
|
6f91b4de05
|
fixed the title
|
2021-05-01 18:03:26 -07:00 |
|
rajavi-mishra
|
011084b13e
|
testing
|
2021-05-01 18:03:21 -07:00 |
|
rajavi-mishra
|
375f53cdf6
|
[style] changes to styling and wording
|
2021-05-01 18:02:25 -07:00 |
|
Jimmy
|
61d41fa931
|
[fix]Add nil check for happening_now partial
|
2021-05-01 18:02:24 -07:00 |
|
Jimmy
|
15f30190e4
|
[fix]Remove unnecessary check in happening_now partial
|
2021-05-01 18:02:23 -07:00 |
|
Jimmy
|
ae80f5c607
|
[fix]Fix ajax for pagination
|
2021-05-01 18:02:22 -07:00 |
|
rajavi-mishra
|
312d3e3a23
|
show happening now and happening next on the events page
|
2021-05-01 18:02:16 -07:00 |
|
rajavi-mishra
|
5121e0ba29
|
sign-in check added
|
2021-05-01 17:59:21 -07:00 |
|
Jimmy
|
ef119d0fb6
|
[fix]Change wording when no events is happening now or next
|
2021-05-01 17:59:18 -07:00 |
|
Jimmy
|
62fc8b27e4
|
[test]Add integration tests for the happening now section on the splashpage
|
2021-05-01 17:59:10 -07:00 |
|
Jimmy
|
47e580904d
|
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later?
|
2021-05-01 17:59:08 -07:00 |
|
Jimmy
|
5aea1efab1
|
[style]Remove extra white space
|
2021-05-01 17:59:07 -07:00 |
|
Jimmy
|
6e045061e7
|
[feat]Splashpage will display happening next event if no event is happening now
|
2021-05-01 17:59:06 -07:00 |
|
Rajavi Mishra
|
7ae22d6d2a
|
Merge pull request #77 from CactusPuppy/176895045-clarify-registration-status-somehow
176895045 clarify registration status somehow
|
2021-05-01 17:35:12 -07:00 |
|
CactusPuppy
|
33552a5afa
|
[fix] Fix typo in header
|
2021-05-01 14:50:03 -07:00 |
|
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
|
b450abddd1
|
linter changes
|
2021-04-30 01:43:31 -07:00 |
|
rajavi-mishra
|
c9721aa4f9
|
changes to the feature
|
2021-04-30 01:04:05 -07:00 |
|
rajavi-mishra
|
981c798e60
|
[feat] show alert when user has 0 ticket purchases
|
2021-04-30 00:23:47 -07:00 |
|
Michael Ball
|
df118b9ae8
|
Address comment lints
|
2021-04-29 22:35:43 -07:00 |
|
Michael Ball
|
4cc2ead074
|
Hide the proposal task list since it is confusing to people
|
2021-04-29 21:17:05 -07:00 |
|
Michael Ball
|
016a2c4ef3
|
Improve the proposals task list slightly
|
2021-04-29 21:15:28 -07: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 |
|