Commit graph

  • 5121e0ba29
    sign-in check added rajavi-mishra 2021-04-24 23:13:12 -07:00
  • 2fa7ed5542
    Remove unnecessary dependence on WebMock within factories. CactusPuppy 2021-04-22 19:48:38 -07:00
  • a526938fa9
    [style]Fix style Jimmy 2021-04-20 13:52:44 +08:00
  • 6f9a6e2275
    [fix]Store current time to a variable to make sure timestamps are the same Jimmy 2021-04-20 13:48:47 +08:00
  • ef119d0fb6
    [fix]Change wording when no events is happening now or next Jimmy 2021-04-20 13:21:19 +08:00
  • 8a335e5e8d
    [style]Remove unused code Jimmy 2021-04-19 19:23:41 +08:00
  • 55ffee531a
    [style]Fix duplicate code in conference_helper Jimmy 2021-04-19 19:01:31 +08:00
  • 924d6d4e25
    [fix]Remove print Jimmy 2021-04-19 18:54:01 +08:00
  • 6461d94dd0
    [fix]Use full_splashpage instead of splashpage Jimmy 2021-04-19 18:47:21 +08:00
  • e6afb99dd6
    [temp]Print page.html Jimmy 2021-04-19 18:37:04 +08:00
  • 6d9b679cef
    [test]Use scenario instead of it Jimmy 2021-04-19 18:35:26 +08:00
  • 35f216778b
    [temp]Try feature:true Jimmy 2021-04-19 18:26:54 +08:00
  • 41312a4099
    [fix]Fix splashpage spec Jimmy 2021-04-19 17:50:01 +08:00
  • 62fc8b27e4
    [test]Add integration tests for the happening now section on the splashpage Jimmy 2021-04-19 14:24:54 +08:00
  • 648f3bacb5
    [test]Add test for ConferenceHelper#get_happening_next_events_schedules Jimmy 2021-04-19 13:33:00 +08:00
  • 612af49ca0
    [test]Add test for SchedulersController#happening_later? Jimmy 2021-04-19 13:23:49 +08:00
  • 47e580904d
    [refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later? Jimmy 2021-04-17 08:30:07 +08:00
  • 5aea1efab1
    [style]Remove extra white space Jimmy 2021-04-17 00:22:17 +08:00
  • 6e045061e7
    [feat]Splashpage will display happening next event if no event is happening now Jimmy 2021-04-17 00:00:52 +08:00
  • 25bc05b20c
    [fix]Fix rake data:test by including webmock Jimmy 2021-04-16 23:08:44 +08:00
  • 7ae22d6d2a
    Merge pull request #77 from CactusPuppy/176895045-clarify-registration-status-somehow Rajavi Mishra 2021-05-01 17:35:12 -07:00
  • 33552a5afa
    [fix] Fix typo in header CactusPuppy 2021-05-01 14:50:03 -07:00
  • f60b07eb32
    Merge pull request #76 from CactusPuppy/176894996-vertical-schedule CactusPuppy 2021-05-01 11:00:44 -07:00
  • 3a3619cb52
    [fix]Remove license key in schedules_controller Jimmy 2021-05-01 01:46:06 +08:00
  • 4a0da37a96
    merge Jimmy 2021-05-01 01:42:03 +08:00
  • 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 Jimmy 2021-05-01 01:37:52 +08:00
  • 5b06b4d8bb
    [feat] Prevent license key from being embedded in view CactusPuppy 2021-04-30 09:56:15 -07:00
  • 62f2b64e1c Resolve CVE in rexml Michael Ball 2021-04-30 09:55:53 -07:00
  • 04f7b088a0 Remove mimemagic pinned version. That was a fun time.... Michael Ball 2021-04-30 09:39:27 -07:00
  • 3aa00d5afc
    Merge pull request #145 from snap-cloud/ticket-purchase-ids Michael Ball 2021-04-30 09:36:00 -07:00
  • 66767c33a2
    [feat]Change border color of event Jimmy 2021-04-30 19:19:30 +08:00
  • 8aaabe4435
    [feat]Add valid date range to fullcalendar Jimmy 2021-04-30 19:06:50 +08:00
  • 5197ddbe24
    [feat]Add now indicator to fullcalendar Jimmy 2021-04-30 18:59:21 +08:00
  • ccbc2ed0d5
    [style]Fix haml-lint Jimmy 2021-04-30 18:01:33 +08:00
  • c223959ffb
    [feat]Read fullcalendar license key from ENV Jimmy 2021-04-30 17:58:52 +08:00
  • a35badb2ca
    [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
  • 982d62c93d
    Merge pull request #75 from CactusPuppy/176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration Rajavi Mishra 2021-04-30 01:53:33 -07:00
  • a0e3770dc3
    [feat]Remove All Day in fullcalendar view Jimmy 2021-04-30 16:50:18 +08:00
  • 4478bef67d hariki, dependencies, pronto rajavi-mishra 2021-04-30 01:49:10 -07:00
  • fdfa540a65
    [style]Fix style Jimmy 2021-04-30 16:48:15 +08:00
  • b450abddd1 linter changes rajavi-mishra 2021-04-30 01:43:31 -07:00
  • d54f6c540c
    [fix]Fix Gemfile Jimmy 2021-04-30 16:38:35 +08:00
  • 1de29c4df1
    [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
  • 92d6365f71
    [chore]Update rexml in Gemfile.lock for security reasons Jimmy 2021-04-30 16:31:02 +08:00
  • 38bac34583
    [fix]Fix route helpers in tests Jimmy 2021-04-30 16:20:49 +08:00
  • e4abc009e2
    [test]Move conference_schedule_spec to schedules_controller_spec Jimmy 2021-04-30 16:17:39 +08:00
  • a754f6040a rubocop/linter fixes rajavi-mishra 2021-04-30 01:15:55 -07:00
  • c635ccfbaf addition test rajavi-mishra 2021-04-30 01:05:57 -07:00
  • 1318930ab8 added tests rajavi-mishra 2021-04-30 01:04:17 -07:00
  • c9721aa4f9 changes to the feature rajavi-mishra 2021-04-30 01:04:05 -07:00
  • c2981eab7b
    [CI]Add more description to npm install Jimmy 2021-04-30 15:56:06 +08:00
  • 96f9cf1c4e
    [CI]Try fixing travis by running npm install Jimmy 2021-04-30 15:55:25 +08:00
  • de43982b44
    [CI]Try fixing github workflow by adding npm install Jimmy 2021-04-30 15:49:32 +08:00
  • 96944f704f
    [style]Fix rubocop Jimmy 2021-04-30 15:41:06 +08:00
  • b8f0db4a00
    [chore]Clean up package.json and remove yarn.lock Jimmy 2021-04-30 15:39:14 +08:00
  • 981c798e60 [feat] show alert when user has 0 ticket purchases rajavi-mishra 2021-04-30 00:23:47 -07:00
  • b754d68692
    [feat]Add url, background color, text color to events in vertical schedule Jimmy 2021-04-30 15:14:46 +08:00
  • c20e1f6f37 boo, bad linters Michael Ball 2021-04-29 23:00:33 -07:00
  • ed723239fd gemfile changes for hakiri fix rajavi-mishra 2021-04-29 22:56:47 -07:00
  • 5edb1ce491 gemfile changes to pass the hakiri check rajavi-mishra 2021-04-29 22:37:09 -07:00
  • df118b9ae8 Address comment lints Michael Ball 2021-04-29 22:35:43 -07:00
  • c21965b67f trying to fix hakiri rajavi-mishra 2021-04-29 22:32:51 -07:00
  • 4cc2ead074 Hide the proposal task list since it is confusing to people Michael Ball 2021-04-29 21:17:05 -07:00
  • 016a2c4ef3 Improve the proposals task list slightly Michael Ball 2021-04-29 21:15:28 -07:00
  • f0e3b2ca0c hakiri fix rajavi-mishra 2021-04-29 14:29:17 -07:00
  • 89e87a1be9 rubocop fixes rajavi-mishra 2021-04-29 14:14:56 -07:00
  • 40fd23e11b remove whitespaces rajavi-mishra 2021-04-29 13:57:03 -07:00
  • 0599da258e rubocop fixes rajavi-mishra 2021-04-29 13:54:35 -07:00
  • 90d6bb016c PR review change rajavi-mishra 2021-04-29 13:52:00 -07:00
  • 7444f86ce5 PR review changes rajavi-mishra 2021-04-29 13:51:45 -07:00
  • 42882d852b
    Merge branch 'master' into 176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration Rajavi Mishra 2021-04-29 13:34:24 -07:00
  • b323018d43
    Merge pull request #74 from CactusPuppy/176894823-Cleanup-Page-Title-on-Conference-Materials-Page Rajavi Mishra 2021-04-29 13:30:42 -07:00
  • 7039bf852e
    Merge pull request #72 from CactusPuppy/177571211-Embed-Happening-Now-Events-in-Event-Page Rajavi Mishra 2021-04-29 13:29:45 -07:00
  • 1c23033f1d
    Move JS out of view and have calendar start on same day as horizontal schedule CactusPuppy 2021-04-28 23:53:55 -07:00
  • 2695aebc07
    Remove Vertical Schedule tab CactusPuppy 2021-04-28 23:21:53 -07:00
  • 22961c4071
    Revert "Commit to using Yarn over NPM" CactusPuppy 2021-04-28 23:07:13 -07:00
  • a81519ce68
    Allow users who are not signed-in to view vertical_schedule endpoint CactusPuppy 2021-04-28 21:44:00 -07:00
  • dd6a2600e7
    Commit to using Yarn over NPM CactusPuppy 2021-04-28 21:42:16 -07:00
  • d01dc9550b Show ticket IDs on the admin ticket page Michael Ball 2021-04-28 10:20:03 -07:00
  • df729b7dde
    [feat]Fullcalendar integration done Jimmy 2021-04-26 17:33:31 +08:00
  • 49cf115844
    Fullcalendar integration in progress Jimmy 2021-04-26 11:07:20 +08:00
  • 4f2abd7e25
    [feat]Add vertical schedule tab in Schedule Jimmy 2021-04-26 10:41:54 +08:00
  • adb6eb8526
    [feat]Implement FullCalendarFormatter#event_schedules_to_resources; Add tests Jimmy 2021-04-26 10:34:14 +08:00
  • e1918fbf7e
    [feat]Implement FullCalendar#rooms_to_resources and add tests Jimmy 2021-04-26 09:48:16 +08:00
  • aebbe5615f rubocop fixes rajavi-mishra 2021-04-25 01:03:41 -07:00
  • 158cf85f72 testing rajavi-mishra 2021-04-25 01:02:41 -07:00
  • 4b2a2c5d5c sign-in check added rajavi-mishra 2021-04-24 23:13:12 -07:00
  • 4ce418002d rubocop fixed rajavi-mishra 2021-04-24 22:40:48 -07:00
  • 4307fa9538 testing rajavi-mishra 2021-04-24 22:33:59 -07:00
  • 6ebfdefbbd fixed the title rajavi-mishra 2021-04-24 22:19:36 -07:00
  • 54d7c31cac FullCalendarFormatter spec init Ziyi 2021-04-24 19:30:52 -07:00
  • 147b7f4939 FullCalendar controller init, FullCalendarFormatter service Ziyi 2021-04-24 19:21:07 -07:00
  • 82ac50786c
    Create route for vertical schedule and test confirming it works CactusPuppy 2021-04-24 18:54:58 -07:00
  • 7ee69bc172 Remove h2 from conference about sections Michael Ball 2021-04-23 13:12:36 -07:00
  • 6b186c074d
    Add FullCalendar module CactusPuppy 2021-04-19 21:52:42 -07:00
  • abad615f65
    Merge pull request #73 from CactusPuppy/fix-heroku CactusPuppy 2021-04-22 20:05:58 -07:00
  • ab6916e913
    Remove unnecessary dependence on WebMock within factories. CactusPuppy 2021-04-22 19:48:38 -07:00
  • 6fa21fcba5 testing rajavi-mishra 2021-04-21 21:40:08 -07:00
  • e73903b84f commit merged rajavi-mishra 2021-04-21 10:53:52 -07:00
  • 690ea5b2a9 [style] changes to styling and wording rajavi-mishra 2021-04-21 10:47:49 -07:00