Commit graph

  • 2ff829bfec
    Merge pull request #2758 from openSUSE/depfu/update/delayed_job_active_record-4.1.6 Henne Vogelsang 2021-07-05 15:43:46 +02:00
  • e910b4844c
    Merge pull request #2754 from openSUSE/depfu/update/rolify-5.3.0 Henne Vogelsang 2021-07-05 15:43:16 +02:00
  • 8adc04a88e
    Merge pull request #2752 from openSUSE/depfu/update/byebug-11.1.3 Henne Vogelsang 2021-07-05 15:42:21 +02:00
  • de60cf1e1c
    Merge pull request #2751 from openSUSE/depfu/update/pg-1.2.3 Henne Vogelsang 2021-07-05 15:42:08 +02:00
  • 880a993dbd
    Update leaflet-rails to version 1.7.0 depfu[bot] 2021-07-05 13:41:55 +00:00
  • 12496833c8
    Merge pull request #2750 from openSUSE/depfu/update/mysql2-0.5.3 Henne Vogelsang 2021-07-05 15:41:54 +02:00
  • ccf3d4583b
    Merge pull request #2749 from openSUSE/depfu/update/uglifier-4.2.0 Henne Vogelsang 2021-07-05 15:41:40 +02:00
  • fcf3911e18
    Merge pull request #2748 from openSUSE/depfu/update/sass-rails-5.1.0 Henne Vogelsang 2021-07-05 15:40:28 +02:00
  • 798c329bc7
    Update jquery-rails to version 4.4.0 depfu[bot] 2021-07-05 13:36:02 +00:00
  • ed7cba80fc
    Update sass-rails to version 5.1.0 depfu[bot] 2021-07-05 13:31:04 +00:00
  • 9a98b341ea
    Merge pull request #2777 from openSUSE/depfu/update/nokogiri-1.11.7 Henne Vogelsang 2021-07-05 15:29:30 +02:00
  • ee9345936d
    Update nokogiri to version 1.11.7 depfu[bot] 2021-07-05 13:15:52 +00:00
  • 87879be840
    Merge pull request #2766 from openSUSE/depfu/update/group/rails-5.2.4.6 Henne Vogelsang 2021-07-05 15:14:29 +02:00
  • 7e8abbd3b9 Update Ruby dependency: 2.5.8 → 2.5.9 (patch) Andrew Kvalheim 2021-06-13 13:40:15 -07:00
  • 3576c463b1
    Update nokogiri to version 1.11.6 depfu[bot] 2021-06-02 13:46:08 +00:00
  • 07f5233104
    Update nokogiri to version 1.11.5 depfu[bot] 2021-05-20 10:34:19 +00:00
  • dff57939ab
    Update all of rails to version 5.2.4.6 depfu[bot] 2021-05-05 22:16:01 +00:00
  • ceeab39e3f Fix the show_votes? method again Michael Ball 2021-05-04 18:22:38 -07:00
  • 6965da9ece minor updates of some test gems Michael Ball 2021-05-04 17:37:21 -07:00
  • de483b032b Update webdrivers, webmock gems Michael Ball 2021-05-04 17:34:36 -07:00
  • e0d9feae6e Update development/test gems Michael Ball 2021-05-04 17:33:10 -07:00
  • fa9d0a9183 Cleanup dupe route from merge Michael Ball 2021-05-04 16:55:03 -07:00
  • ce8b1897fd Merge branch 'master' of github.com:snap-cloud/snapcon Michael Ball 2021-05-04 16:54:16 -07:00
  • e8610a9e62 merge master Michael Ball 2021-05-04 16:54:01 -07:00
  • 26c9b36682
    Merge pull request #140 from snap-cloud/merge-osem Michael Ball 2021-05-04 16:16:06 -07:00
  • 20e39c015a Update gemfile Michael Ball 2021-05-04 15:42:51 -07:00
  • 3b9c038947 merge master Michael Ball 2021-05-04 15:41:29 -07:00
  • 4da42e8492
    Tidy Gemfile Michael Ball 2021-05-04 15:32:34 -07:00
  • 23c14f82f8 Fix show_voting? so it is true even during the voting period Michael Ball 2021-05-03 03:36:55 -07:00
  • 653395c123
    Merge pull request #147 from CactusPuppy/master Michael Ball 2021-05-03 03:18:40 -07:00
  • 5688fd1d1a temporarily disable the conference specific email image Michael Ball 2021-05-03 03:17:28 -07:00
  • dfa8800f18
    Merge pull request #80 from CactusPuppy/badge-cleanup CactusPuppy 2021-05-02 23:42:23 -07:00
  • 5f32deb87f
    Remove Spring 2021 badges CactusPuppy 2021-05-02 23:28:53 -07:00
  • 1f687df291
    Merge pull request #79 from CactusPuppy/snap-cloud-master CactusPuppy 2021-05-02 22:19:30 -07:00
  • 07eb7114ca
    Merge branch 'snap-cloud-master' CactusPuppy 2021-05-01 18:12:02 -07:00
  • 6748d1ea1b
    [fix] Fix typo in header CactusPuppy 2021-05-01 14:50:03 -07:00
  • 4938efa2cb
    linter changes rajavi-mishra 2021-04-30 01:43:31 -07:00
  • 9ece3b0564
    rubocop/linter fixes rajavi-mishra 2021-04-30 01:15:55 -07:00
  • 7cc25e09cf
    addition test rajavi-mishra 2021-04-30 01:05:57 -07:00
  • f09a56498a
    added tests rajavi-mishra 2021-04-30 01:04:17 -07:00
  • 87901960ca
    changes to the feature rajavi-mishra 2021-04-30 01:04:05 -07:00
  • e2245001d4
    [feat] show alert when user has 0 ticket purchases rajavi-mishra 2021-04-30 00:23:47 -07:00
  • 33f5941fbb
    [fix]Remove license key in schedules_controller Jimmy 2021-05-01 01:46:06 +08:00
  • 2dbcf95425
    [feat] Prevent license key from being embedded in view CactusPuppy 2021-04-30 09:56:15 -07:00
  • 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 Jimmy 2021-05-01 01:37:52 +08:00
  • 03b12eafb0
    [feat]Change border color of event Jimmy 2021-04-30 19:19:30 +08:00
  • 29b7f057c7
    [feat]Add valid date range to fullcalendar Jimmy 2021-04-30 19:06:50 +08:00
  • 4438b78069
    [feat]Add now indicator to fullcalendar Jimmy 2021-04-30 18:59:21 +08:00
  • 13ec5c22d9
    [style]Fix haml-lint Jimmy 2021-04-30 18:01:33 +08:00
  • cb6219e812
    [feat]Read fullcalendar license key from ENV Jimmy 2021-04-30 17:58:52 +08:00
  • 657c9fdfb8
    [feat]Restrict fullcalendar to display time from the start hour to end hour of a conference Jimmy 2021-04-30 17:33:16 +08:00
  • e9145f8940
    [feat]Remove All Day in fullcalendar view Jimmy 2021-04-30 16:50:18 +08:00
  • 3b15cca2b4
    [style]Fix style Jimmy 2021-04-30 16:48:15 +08:00
  • 6f59613ee9
    [fix]Fix Gemfile Jimmy 2021-04-30 16:38:35 +08:00
  • f14cb8fe10
    [doc]Add comment in fullcalendar.js so that if events are added to database with timezone info explicitly, the fullcalendar can be fixed Jimmy 2021-04-30 16:32:06 +08:00
  • f36f25ca3f
    [chore]Update rexml in Gemfile.lock for security reasons Jimmy 2021-04-30 16:31:02 +08:00
  • d2a316d5e4
    [fix]Fix route helpers in tests Jimmy 2021-04-30 16:20:49 +08:00
  • f395f8a26e
    [test]Move conference_schedule_spec to schedules_controller_spec Jimmy 2021-04-30 16:17:39 +08:00
  • 16e22b2ea5
    [CI]Add more description to npm install Jimmy 2021-04-30 15:56:06 +08:00
  • 6c64114380
    [CI]Try fixing travis by running npm install Jimmy 2021-04-30 15:55:25 +08:00
  • c7533b4a33
    [CI]Try fixing github workflow by adding npm install Jimmy 2021-04-30 15:49:32 +08:00
  • de7caffbf5
    [style]Fix rubocop Jimmy 2021-04-30 15:41:06 +08:00
  • 06a44132be
    [chore]Clean up package.json and remove yarn.lock Jimmy 2021-04-30 15:39:14 +08:00
  • 83aeb5c330
    [feat]Add url, background color, text color to events in vertical schedule Jimmy 2021-04-30 15:14:46 +08:00
  • 468e170a2e
    Move JS out of view and have calendar start on same day as horizontal schedule CactusPuppy 2021-04-28 23:53:55 -07:00
  • 409fd09514
    Remove Vertical Schedule tab CactusPuppy 2021-04-28 23:21:53 -07:00
  • ce8215a3cb
    Revert "Commit to using Yarn over NPM" CactusPuppy 2021-04-28 23:07:13 -07:00
  • 818cb24dd3
    Allow users who are not signed-in to view vertical_schedule endpoint CactusPuppy 2021-04-28 21:44:00 -07:00
  • e534c6eee3
    Commit to using Yarn over NPM CactusPuppy 2021-04-28 21:42:16 -07:00
  • 5296d18c27
    [feat]Fullcalendar integration done Jimmy 2021-04-26 17:33:31 +08:00
  • 9d6ab55d13
    Fullcalendar integration in progress Jimmy 2021-04-26 11:07:20 +08:00
  • 1bc6b092de
    [feat]Add vertical schedule tab in Schedule Jimmy 2021-04-26 10:41:54 +08:00
  • 4b83ae8be7
    [feat]Implement FullCalendarFormatter#event_schedules_to_resources; Add tests Jimmy 2021-04-26 10:34:14 +08:00
  • abe2ea9bb3
    [feat]Implement FullCalendar#rooms_to_resources and add tests Jimmy 2021-04-26 09:48:16 +08:00
  • 40916b6a36
    FullCalendarFormatter spec init Ziyi 2021-04-24 19:30:52 -07:00
  • 5bc4a39c6c
    FullCalendar controller init, FullCalendarFormatter service Ziyi 2021-04-24 19:21:07 -07:00
  • 410012d6be
    Create route for vertical schedule and test confirming it works CactusPuppy 2021-04-24 18:54:58 -07:00
  • c372cbbd00
    Add FullCalendar module CactusPuppy 2021-04-19 21:52:42 -07:00
  • df9c7d5222
    gemfile changes for hakiri fix rajavi-mishra 2021-04-29 22:56:47 -07:00
  • 2e73eb46be
    gemfile changes to pass the hakiri check rajavi-mishra 2021-04-29 22:37:09 -07:00
  • 0a86b6b92a
    trying to fix hakiri rajavi-mishra 2021-04-29 22:32:51 -07:00
  • 7c86136eb2
    hakiri fix rajavi-mishra 2021-04-29 14:29:17 -07:00
  • 09c2bfc188
    rubocop fixes rajavi-mishra 2021-04-29 14:14:56 -07:00
  • 26d523cb5c
    remove whitespaces rajavi-mishra 2021-04-29 13:57:03 -07:00
  • 188c7fe2fc
    rubocop fixes rajavi-mishra 2021-04-29 13:54:35 -07:00
  • 6e4ec14b83
    PR review change rajavi-mishra 2021-04-29 13:52:00 -07:00
  • b1277b9d5b
    PR review changes rajavi-mishra 2021-04-29 13:51:45 -07:00
  • 99f84a597a
    rubocop fixed rajavi-mishra 2021-04-24 22:40:48 -07:00
  • db30c8de1b
    testing rajavi-mishra 2021-04-24 22:33:59 -07:00
  • 6f91b4de05
    fixed the title rajavi-mishra 2021-04-24 22:19:36 -07:00
  • 011084b13e
    testing rajavi-mishra 2021-04-21 21:40:08 -07:00
  • a2d775e36d
    [fix]Remove duplicate code Jimmy 2021-04-22 01:24:14 +08:00
  • 375f53cdf6
    [style] changes to styling and wording rajavi-mishra 2021-04-21 10:47:49 -07:00
  • 61d41fa931
    [fix]Add nil check for happening_now partial Jimmy 2021-04-22 01:13:56 +08:00
  • 15f30190e4
    [fix]Remove unnecessary check in happening_now partial Jimmy 2021-04-22 00:59:38 +08:00
  • 25af76d27a
    [style]Fix rubocop Jimmy 2021-04-22 00:43:27 +08:00
  • ae80f5c607
    [fix]Fix ajax for pagination Jimmy 2021-04-22 00:40:53 +08:00
  • 312d3e3a23
    show happening now and happening next on the events page rajavi-mishra 2021-04-21 09:01:12 -07:00
  • fd96f3d937
    rubocop fixes rajavi-mishra 2021-04-25 01:03:41 -07:00
  • 60b5e9a1c9
    testing rajavi-mishra 2021-04-25 01:02:41 -07:00