Michael Ball
ce8b1897fd
Merge branch 'master' of github.com:snap-cloud/snapcon
...
* 'master' of github.com:snap-cloud/snapcon:
Update gemfile
Add letter opener web
Use 2.5.9 ruby version for gh actions
Update mimemagic
Update chartkick to version 3.4.2
2021-05-04 16:54:16 -07:00
Michael Ball
e8610a9e62
merge master
2021-05-04 16:54:01 -07:00
Michael Ball
26c9b36682
Merge pull request #140 from snap-cloud/merge-osem
...
Merge osem
2021-05-04 16:16:06 -07:00
Michael Ball
20e39c015a
Update gemfile
2021-05-04 15:42:51 -07:00
Michael Ball
3b9c038947
merge master
2021-05-04 15:41:29 -07:00
Michael Ball
4da42e8492
Tidy Gemfile
...
Some basic reordering, remove mimemagic
2021-05-04 15:32:34 -07:00
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
dfa8800f18
Merge pull request #80 from CactusPuppy/badge-cleanup
...
Remove Spring 2021 badges
2021-05-02 23:42:23 -07:00
CactusPuppy
5f32deb87f
Remove Spring 2021 badges
2021-05-02 23:28:53 -07:00
CactusPuppy
1f687df291
Merge pull request #79 from CactusPuppy/snap-cloud-master
...
Pull in final golden repo changes
2021-05-02 22:19:30 -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
9ece3b0564
rubocop/linter fixes
2021-05-01 18:06:42 -07:00
rajavi-mishra
7cc25e09cf
addition test
2021-05-01 18:06:41 -07:00
rajavi-mishra
f09a56498a
added tests
2021-05-01 18:06:41 -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
Jimmy
33f5941fbb
[fix]Remove license key in schedules_controller
2021-05-01 18:06:37 -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
03b12eafb0
[feat]Change border color of event
2021-05-01 18:05:47 -07:00
Jimmy
29b7f057c7
[feat]Add valid date range to fullcalendar
2021-05-01 18:05:47 -07:00
Jimmy
4438b78069
[feat]Add now indicator to fullcalendar
2021-05-01 18:05:46 -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
Jimmy
e9145f8940
[feat]Remove All Day in fullcalendar view
2021-05-01 18:05:43 -07:00
Jimmy
3b15cca2b4
[style]Fix style
2021-05-01 18:05:41 -07:00
Jimmy
6f59613ee9
[fix]Fix Gemfile
2021-05-01 18:05:38 -07:00
Jimmy
f14cb8fe10
[doc]Add comment in fullcalendar.js so that if events are added to database with timezone info explicitly, the fullcalendar can be fixed
2021-05-01 18:05:18 -07:00
Jimmy
f36f25ca3f
[chore]Update rexml in Gemfile.lock for security reasons
2021-05-01 18:05:15 -07:00
Jimmy
d2a316d5e4
[fix]Fix route helpers in tests
2021-05-01 18:04:57 -07:00
Jimmy
f395f8a26e
[test]Move conference_schedule_spec to schedules_controller_spec
2021-05-01 18:04:56 -07:00
Jimmy
16e22b2ea5
[CI]Add more description to npm install
2021-05-01 18:04:55 -07:00
Jimmy
6c64114380
[CI]Try fixing travis by running npm install
2021-05-01 18:04:55 -07:00
Jimmy
c7533b4a33
[CI]Try fixing github workflow by adding npm install
2021-05-01 18:04:54 -07:00
Jimmy
de7caffbf5
[style]Fix rubocop
2021-05-01 18:04:52 -07:00
Jimmy
06a44132be
[chore]Clean up package.json and remove yarn.lock
2021-05-01 18:04:51 -07:00
Jimmy
83aeb5c330
[feat]Add url, background color, text color to events in vertical schedule
2021-05-01 18:04:51 -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
CactusPuppy
ce8215a3cb
Revert "Commit to using Yarn over NPM"
...
This reverts commit dd6a2600e7
2021-05-01 18:04:49 -07:00
CactusPuppy
818cb24dd3
Allow users who are not signed-in to view vertical_schedule endpoint
2021-05-01 18:04:48 -07:00
CactusPuppy
e534c6eee3
Commit to using Yarn over NPM
2021-05-01 18:04:47 -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
