Commit graph

4366 commits

Author SHA1 Message Date
CactusPuppy
c6c2c4e264
Merge pull request #50 from CactusPuppy/pend-instead-of-skip-datatables
Properly pend outputs context
2021-04-07 14:16:02 -07:00
CactusPuppy
8f48edf897
Prevent working test from causing failure, since Travis and Github Actions fail differently 2021-04-07 13:49:39 -07:00
CactusPuppy
09298ed38e
Properly pend outputs context 2021-04-07 13:21:37 -07:00
kingdish
fd3d7f565f
Merge pull request #46 from CactusPuppy/fix-ci-4-7-21
Fix CI. Skip datatable tests.
2021-04-07 12:55:07 -07:00
Jimmy
2e7bcf255c [style]Fix style in user_datatable_spec 2021-04-08 03:40:27 +08:00
Jimmy
acb48e9230 [fix]Revert github workflow; Change datatable tests to pending 2021-04-08 03:30:32 +08:00
Jimmy
065466e6d1 fix syntax 2021-04-08 00:52:02 +08:00
Jimmy
a397a03721 try again 2021-04-08 00:49:13 +08:00
Jimmy
1dd43fa323 try ignoring datatables 2021-04-08 00:31:13 +08:00
Jimmy
dd9d2e1b93 try running rspec instead of rake 2021-04-08 00:24:36 +08:00
Jimmy
103dccc59e ignore user datatable 2021-04-08 00:05:07 +08:00
Jimmy
2d9622ed22 [style]Fix order of gem 2021-04-07 23:26:05 +08:00
Jimmy
680979f1d1 [fix]Fix ruby version and update mimemagic 2021-04-07 23:22:40 +08:00
Jimmy
db8e292490 temp 2021-04-07 23:18:51 +08:00
kingdish
1977b5be49
Merge pull request #36 from CactusPuppy/176895124-happening-now-json-api-endpoint
Happening now json api endpoint
2021-03-31 12:21:30 -07:00
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