gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4351 commits 2 branches 2 tags 50 MiB
Commit graph

4351 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jimmy
c3167a3503 [feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests 2021-03-31 17:35:25 +08:00
Jimmy
7b3d97fdbb [refactor] Change to_json to as_json 2021-03-31 16:08:44 +08:00
Jimmy
010f72d42f [fix] Fix event_schedule#happening_now? 2021-03-31 08:34:04 +08:00
Jimmy
455faed638 [fix] Remove unmerged code 2021-03-31 07:52:55 +08:00
Jimmy
e2f5b5e933 Merge master 2021-03-31 07:49:30 +08:00
Jimmy
0ede07dfaa [fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? 2021-03-31 07:45:26 +08:00
CactusPuppy
b194ad8ad6
Merge pull request #39 from snap-cloud/master 
Pull golden repo changes
 2021-03-26 16:43:39 -07:00
Michael Ball
048881fa48 Merge branch 'master' of github.com:snap-cloud/snapcon 
* 'master' of github.com:snap-cloud/snapcon:
  Update icalendar to version 2.7.1
  Update byebug to version 11.1.3
 2021-03-24 13:55:32 -07:00
Michael Ball
617a4ad172 Control some lints 2021-03-24 13:54:20 -07:00
Michael Ball
cedf995fd0
Merge pull request #116 from snap-cloud/depfu/update/byebug-11.1.3 
Update byebug: 11.0.1 → 11.1.3 (minor)
 2021-03-24 04:21:08 -07:00
Michael Ball
fcac944c31
Merge pull request #121 from snap-cloud/depfu/update/icalendar-2.7.1 
Update icalendar: 2.7.0 → 2.7.1 (patch)
 2021-03-24 04:20:36 -07:00
Michael Ball
676d16ef27
Merge pull request #124 from snap-cloud/michael/fixes 
Snap!Con Updates
 2021-03-24 03:12:36 -07:00
Michael Ball
7106e1fc21 more delinting 2021-03-24 03:05:08 -07:00
Michael Ball
2dc6da87e5 Fix indentation on admin show page 2021-03-24 03:02:43 -07:00
Michael Ball
81b963ddc8 Delint some more 2021-03-24 02:50:44 -07:00
Michael Ball
de607fc262 Cleanup conferences show page 2021-03-24 02:37:07 -07:00
Michael Ball
05a04427c2 delint 2021-03-24 02:33:50 -07:00
Michael Ball
82e45fff0a fix typo in spec 2021-03-24 02:28:43 -07:00
Michael Ball
e810fd442f Cleanup the submission form, fix reset button 2021-03-23 23:06:34 -07:00
Michael Ball
df0aa087fb Fix remember me checkbox. 2021-03-23 22:53:30 -07:00
Michael Ball
ed20ff3b51 Refactor the new/edit submission forms 2021-03-23 22:43:11 -07:00
Michael Ball
c55eff4eec Improve the new proposal flow 2021-03-23 18:28:34 -07:00
Michael Ball
df5a767494 Improve the look of the conf dashboard 2021-03-23 17:37:04 -07:00
Michael Ball
1806a04b69 Conf Admin: Allow for stats to reflow on small screens 2021-03-23 16:30:13 -07:00
Michael Ball
20a80c2c31 tidy up the conference edit page 2021-03-23 16:26:09 -07:00
Michael Ball
f5e099501c Minor updates to the conf edit page 2021-03-23 13:00:22 -07:00
Michael Ball
6e3e1199ef Restore and cleanup the admin conf todo list 2021-03-23 12:54:07 -07:00
Michael Ball
76df9c9782 Fix typo in spec 2021-03-23 12:33:41 -07:00
Michael Ball
586c6dff29 Cleanup todo.haml 2021-03-23 02:50:39 -07:00
Michael Ball
1658046a19 Do not show diffculty level in the progress checker 2021-03-23 02:47:18 -07:00
Michael Ball
e542bda8ef tweak emails 2021-03-23 02:21:31 -07:00
Michael Ball
2899da9823 Update spec with submission instructions. 2021-03-22 03:21:11 -07:00
Michael Ball
048207cd38 Some re-delinting 2021-03-22 03:18:47 -07:00
Michael Ball
75b60c2578 Use 'Description' on the submissions page. Fill template from submission_instructions 2021-03-22 02:59:35 -07:00
depfu[bot]
225da34f76
Update icalendar to version 2.7.1 2021-03-21 20:06:24 +00:00
Michael Ball
b4a174944e Codecov removed from gemfile 2021-03-21 13:02:38 -07:00
Michael Ball
072307a7b9 Merge branch 'CactusPuppy-master' 
* CactusPuppy-master: (99 commits)
  Fix Rubocop linting issue
  Allow ES6 JS syntax
  Revert "Avoid using ES6 syntax to prevent Heroku asset compilation from failing"
  Avoid using ES6 syntax to prevent Heroku asset compilation from failing
  Ensure sqlite isn't trying to be loaded on Heroku
  Only upload coverage reports from Travis if based in master
  Unpend test because I guess it works on Travis
  Pend test so that error is exposed instead of skipping
  Actually run rest tests instead of features twice
  Update annotate_models comments
  Temp pend failing test, as it does not reflect local verification
  Ensure coverage.xml is generated on Travis
  Prevent overwriting of jobs by matrix
  Actually properly report parallel stages
  Fix minor typo in .travis.yml
  Specify where the coverage report is
  Switch to using Codacy for code coverage (following OSEM example)
  Switch CodeCov badge to Code Climate badge
  Avoid installing Ruby in finalize stage
  Ensure finalize stage does not have unecessary installation to do
  ...
 2021-03-21 13:00:12 -07:00
Michael Ball
f22ad296af resolve conflicts with master 2021-03-21 12:59:43 -07:00
Michael Ball
4d1edf5872 Merge branch 'delint' 
* delint:
  Hide stuff again on admin conf show
  update snapcon logo
  more delinting
  Delint event page
  Delint by re-enabling everying on the conference admin page
 2021-03-21 12:53:52 -07:00
Michael Ball
6f2525efcf
Merge pull request #111 from snap-cloud/depfu/update/awesome_nested_set-3.4.0 
Update awesome_nested_set: 3.2.1 → 3.4.0 (minor)
 2021-03-21 12:49:54 -07:00
Michael Ball
481375f59d
Merge pull request #110 from snap-cloud/depfu/update/active_model_serializers-0.10.12 
Update active_model_serializers: 0.10.10 → 0.10.12 (minor)
 2021-03-21 12:48:46 -07:00
Michael Ball
f26605d417
Merge pull request #99 from snap-cloud/depfu/update/delayed_job_active_record-4.1.5 
Update delayed_job_active_record: 4.1.4 → 4.1.5 (patch)
 2021-03-21 12:47:36 -07:00
Michael Ball
45fcd81093
Merge pull request #92 from snap-cloud/depfu/update/pg-1.2.3 
Update pg: 1.1.4 → 1.2.3 (minor)
 2021-03-21 12:47:02 -07:00
Jimmy
bfc39fdbe4 [feat] happening_now json endpoint returns event embedded in event_schedule 2021-03-20 13:34:14 +08:00
Jimmy
1ab580e7e6 Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint 2021-03-19 17:23:47 +08:00
Jimmy
3019a022c7 [fix] Fix style; Fix start_hour and end_hour in test 2021-03-19 17:22:08 +08:00
Jimmy
1c54d38094 [fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient 2021-03-19 17:13:34 +08:00
CactusPuppy
9f558c68c2
Merge pull request #38 from CactusPuppy/fix-heroku-deploy 
Fix Heroku deploys
 2021-03-19 01:39:49 -07:00
CactusPuppy
8110d06ca7
Fix Rubocop linting issue 2021-03-19 01:26:53 -07:00
CactusPuppy
33af94badd
Allow ES6 JS syntax 2021-03-19 01:22:22 -07:00