Commit graph

  • 65119149ea [feat]Add include_happening_now checkbox to the admin splashpage Jimmy 2021-04-01 13:14:31 +08:00
  • 4aab0539b5 [feat] Add include_happening_now field to splashpages table Jimmy 2021-04-01 13:08:09 +08:00
  • 1977b5be49
    Merge pull request #36 from CactusPuppy/176895124-happening-now-json-api-endpoint kingdish 2021-03-31 12:21:30 -07:00
  • c3167a3503 [feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests Jimmy 2021-03-31 17:35:25 +08:00
  • 7b3d97fdbb [refactor] Change to_json to as_json Jimmy 2021-03-31 16:08:44 +08:00
  • 010f72d42f [fix] Fix event_schedule#happening_now? Jimmy 2021-03-31 08:34:04 +08:00
  • 455faed638 [fix] Remove unmerged code Jimmy 2021-03-31 07:52:55 +08:00
  • e2f5b5e933 Merge master Jimmy 2021-03-31 07:49:30 +08:00
  • 0ede07dfaa [fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? Jimmy 2021-03-31 07:45:26 +08:00
  • b194ad8ad6
    Merge pull request #39 from snap-cloud/master CactusPuppy 2021-03-26 16:43:39 -07:00
  • 048881fa48 Merge branch 'master' of github.com:snap-cloud/snapcon Michael Ball 2021-03-24 13:55:32 -07:00
  • 617a4ad172 Control some lints Michael Ball 2021-03-24 13:54:20 -07:00
  • 0cca5e4679
    Update mimemagic to version 0.3.6 depfu[bot] 2021-03-24 20:44:48 +00:00
  • de8b06c4b3 Merge master tidy routes Michael Ball 2021-03-24 13:32:40 -07:00
  • 5df2769207
    Update rolify to version 5.3.0 depfu[bot] 2021-03-24 11:26:29 +00:00
  • cedf995fd0
    Merge pull request #116 from snap-cloud/depfu/update/byebug-11.1.3 Michael Ball 2021-03-24 04:21:08 -07:00
  • fcac944c31
    Merge pull request #121 from snap-cloud/depfu/update/icalendar-2.7.1 Michael Ball 2021-03-24 04:20:36 -07:00
  • 676d16ef27
    Merge pull request #124 from snap-cloud/michael/fixes Michael Ball 2021-03-24 03:12:36 -07:00
  • 7106e1fc21 more delinting Michael Ball 2021-03-24 03:05:08 -07:00
  • 2dc6da87e5 Fix indentation on admin show page Michael Ball 2021-03-24 03:02:43 -07:00
  • 81b963ddc8 Delint some more Michael Ball 2021-03-24 02:50:44 -07:00
  • de607fc262 Cleanup conferences show page Michael Ball 2021-03-24 02:37:07 -07:00
  • 05a04427c2 delint Michael Ball 2021-03-24 02:33:50 -07:00
  • 82e45fff0a fix typo in spec Michael Ball 2021-03-24 02:28:43 -07:00
  • e810fd442f Cleanup the submission form, fix reset button Michael Ball 2021-03-23 23:06:34 -07:00
  • df0aa087fb Fix remember me checkbox. Michael Ball 2021-03-23 22:53:30 -07:00
  • ed20ff3b51 Refactor the new/edit submission forms Michael Ball 2021-03-23 22:43:11 -07:00
  • c55eff4eec Improve the new proposal flow Michael Ball 2021-03-23 18:28:34 -07:00
  • df5a767494 Improve the look of the conf dashboard Michael Ball 2021-03-23 17:37:04 -07:00
  • 1806a04b69 Conf Admin: Allow for stats to reflow on small screens Michael Ball 2021-03-23 16:30:13 -07:00
  • 20a80c2c31 tidy up the conference edit page Michael Ball 2021-03-23 16:26:09 -07:00
  • f5e099501c Minor updates to the conf edit page Michael Ball 2021-03-23 13:00:22 -07:00
  • 6e3e1199ef Restore and cleanup the admin conf todo list Michael Ball 2021-03-23 12:54:07 -07:00
  • 76df9c9782 Fix typo in spec Michael Ball 2021-03-23 12:33:41 -07:00
  • 586c6dff29 Cleanup todo.haml Michael Ball 2021-03-23 02:50:39 -07:00
  • 1658046a19 Do not show diffculty level in the progress checker Michael Ball 2021-03-23 02:47:18 -07:00
  • e542bda8ef tweak emails Michael Ball 2021-03-23 02:21:31 -07:00
  • 2899da9823 Update spec with submission instructions. Michael Ball 2021-03-22 03:21:11 -07:00
  • 048207cd38 Some re-delinting Michael Ball 2021-03-22 03:18:47 -07:00
  • 75b60c2578 Use 'Description' on the submissions page. Fill template from submission_instructions Michael Ball 2021-03-22 02:59:35 -07:00
  • 225da34f76
    Update icalendar to version 2.7.1 depfu[bot] 2021-03-21 20:06:24 +00:00
  • b4a174944e Codecov removed from gemfile Michael Ball 2021-03-21 13:02:38 -07:00
  • 072307a7b9 Merge branch 'CactusPuppy-master' Michael Ball 2021-03-21 13:00:12 -07:00
  • f22ad296af resolve conflicts with master Michael Ball 2021-03-21 12:59:43 -07:00
  • 4d1edf5872 Merge branch 'delint' Michael Ball 2021-03-21 12:53:52 -07:00
  • 6f2525efcf
    Merge pull request #111 from snap-cloud/depfu/update/awesome_nested_set-3.4.0 Michael Ball 2021-03-21 12:49:54 -07:00
  • 481375f59d
    Merge pull request #110 from snap-cloud/depfu/update/active_model_serializers-0.10.12 Michael Ball 2021-03-21 12:48:46 -07:00
  • f26605d417
    Merge pull request #99 from snap-cloud/depfu/update/delayed_job_active_record-4.1.5 Michael Ball 2021-03-21 12:47:36 -07:00
  • 45fcd81093
    Merge pull request #92 from snap-cloud/depfu/update/pg-1.2.3 Michael Ball 2021-03-21 12:47:02 -07:00
  • bfc39fdbe4 [feat] happening_now json endpoint returns event embedded in event_schedule Jimmy 2021-03-20 13:34:14 +08:00
  • 1ab580e7e6 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint Jimmy 2021-03-19 17:23:47 +08:00
  • 3019a022c7 [fix] Fix style; Fix start_hour and end_hour in test Jimmy 2021-03-19 17:22:08 +08:00
  • 1c54d38094 [fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient Jimmy 2021-03-19 17:13:34 +08:00
  • 9f558c68c2
    Merge pull request #38 from CactusPuppy/fix-heroku-deploy CactusPuppy 2021-03-19 01:39:49 -07:00
  • 8110d06ca7
    Fix Rubocop linting issue CactusPuppy 2021-03-19 01:26:53 -07:00
  • 33af94badd
    Allow ES6 JS syntax CactusPuppy 2021-03-19 01:22:22 -07:00
  • 28e45d6162
    Revert "Avoid using ES6 syntax to prevent Heroku asset compilation from failing" CactusPuppy 2021-03-19 01:21:26 -07:00
  • f5a8587b4c
    Avoid using ES6 syntax to prevent Heroku asset compilation from failing CactusPuppy 2021-03-19 01:16:43 -07:00
  • 12f4b75e16
    Merge pull request #35 from CactusPuppy/fix-ci CactusPuppy 2021-03-19 00:55:48 -07:00
  • 8adc70ffa8
    Ensure sqlite isn't trying to be loaded on Heroku CactusPuppy 2021-03-19 00:31:14 -07:00
  • 8b7f0551ae
    Only upload coverage reports from Travis if based in master CactusPuppy 2021-03-18 23:48:06 -07:00
  • 9167f2f2e6
    Unpend test because I guess it works on Travis CactusPuppy 2021-03-18 23:21:51 -07:00
  • e51dcc6d05
    Pend test so that error is exposed instead of skipping CactusPuppy 2021-03-18 23:01:54 -07:00
  • 4fbe48692e
    Actually run rest tests instead of features twice CactusPuppy 2021-03-18 23:01:24 -07:00
  • 6fed679644
    Merge branch 'return-to-code-climate-coverage' into fix-ci CactusPuppy 2021-03-18 20:47:14 -07:00
  • 652381a0b8
    Update annotate_models comments CactusPuppy 2021-03-18 20:36:39 -07:00
  • ee8de1ce2d
    Temp pend failing test, as it does not reflect local verification CactusPuppy 2021-03-18 20:31:40 -07:00
  • 039a931c90
    Ensure coverage.xml is generated on Travis CactusPuppy 2021-03-17 16:14:33 -07:00
  • 2e9150887e
    Prevent overwriting of jobs by matrix CactusPuppy 2021-03-17 15:56:50 -07:00
  • 9ad9a24d74
    Actually properly report parallel stages CactusPuppy 2021-03-17 15:50:37 -07:00
  • c4e07e858f
    Fix minor typo in .travis.yml CactusPuppy 2021-03-17 14:27:25 -07:00
  • 3b768dda4b
    Specify where the coverage report is CactusPuppy 2021-03-17 14:25:43 -07:00
  • d8168559be
    Switch to using Codacy for code coverage (following OSEM example) CactusPuppy 2021-03-17 14:12:29 -07:00
  • 89149d53d6
    Switch CodeCov badge to Code Climate badge CactusPuppy 2021-03-12 00:47:29 -08:00
  • 4989b0e4e9
    Avoid installing Ruby in finalize stage CactusPuppy 2021-03-18 17:23:12 -07:00
  • 554f897b27
    Ensure finalize stage does not have unecessary installation to do CactusPuppy 2021-03-18 17:16:28 -07:00
  • fb741ca28d
    Restore Code Coverage badge CactusPuppy 2021-03-18 16:44:38 -07:00
  • f5b9806aca
    Correct path to Cobertura output CactusPuppy 2021-03-18 16:32:45 -07:00
  • 1c0b477c1b
    Try using Cobertura output instead of resultset.json CactusPuppy 2021-03-18 16:24:01 -07:00
  • 728b6084f9
    Try CodeClimate reporting again CactusPuppy 2021-03-18 16:10:24 -07:00
  • 81e12d5e60
    Merge pull request #33 from CactusPuppy/177195121-improve-email-templates kingdish 2021-03-18 04:14:12 -07:00
  • cab293e947 [fix] Fix event_schedule# happening_now?; Add tests for happening_now JSON endpoint Jimmy 2021-03-18 18:53:55 +08:00
  • 8f1df20c54
    Properly format jobs list CactusPuppy 2021-03-17 20:41:13 -07:00
  • 8342b4c283
    Try an experimental .travis.yml which uploads coverage to CodeClimate CactusPuppy 2021-03-17 20:38:14 -07:00
  • d6e161b7e5 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint Jimmy 2021-03-18 08:41:41 +08:00
  • 362853f4df Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates Jimmy 2021-03-18 08:40:49 +08:00
  • c7482bef1b
    Ensure coverage.xml is generated on Travis CactusPuppy 2021-03-17 16:14:33 -07:00
  • 0e28b5694a
    Prevent overwriting of jobs by matrix CactusPuppy 2021-03-17 15:56:50 -07:00
  • 1a56c9c984
    Actually properly report parallel stages CactusPuppy 2021-03-17 15:50:37 -07:00
  • 9357c71eee
    Fix minor typo in .travis.yml CactusPuppy 2021-03-17 14:27:25 -07:00
  • 584e5827a1
    Specify where the coverage report is CactusPuppy 2021-03-17 14:25:43 -07:00
  • fd0931f9c2
    Switch to using Codacy for code coverage (following OSEM example) CactusPuppy 2021-03-17 14:12:29 -07:00
  • 1936e43735
    Switch CodeCov badge to Code Climate badge CactusPuppy 2021-03-12 00:47:29 -08:00
  • 7f13c5a4c7
    Merge pull request #34 from CactusPuppy/fix-ci CactusPuppy 2021-03-17 11:19:52 -07:00
  • 871457f65b [feat] Use existing #happening_now method; respond to both html and json requests Jimmy 2021-03-17 21:02:35 +08:00
  • 034313cccb [fix] live_events return json; use the provided happening_now? function Jimmy 2021-03-17 07:34:42 +08:00
  • c966177a76 merge Jimmy 2021-03-16 22:16:54 +08:00
  • 4e1e9bdfbd [fix] Fix function name Jimmy 2021-03-16 22:16:21 +08:00
  • 8e95325119 [feat] Endpoint implementation done Jimmy 2021-03-16 22:10:37 +08:00
  • 21f7d1d8ca [feat] Endpoint implementation done Jimmy 2021-03-16 22:10:37 +08:00