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
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
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
CactusPuppy
28e45d6162
Revert "Avoid using ES6 syntax to prevent Heroku asset compilation from failing"
...
This reverts commit f5a8587b4c
2021-03-19 01:21:26 -07:00
CactusPuppy
f5a8587b4c
Avoid using ES6 syntax to prevent Heroku asset compilation from failing
2021-03-19 01:16:43 -07:00
CactusPuppy
12f4b75e16
Merge pull request #35 from CactusPuppy/fix-ci
...
Fix continuous integration pipeline
2021-03-19 00:55:48 -07:00
CactusPuppy
8adc70ffa8
Ensure sqlite isn't trying to be loaded on Heroku
2021-03-19 00:31:14 -07:00
CactusPuppy
8b7f0551ae
Only upload coverage reports from Travis if based in master
2021-03-18 23:48:06 -07:00
CactusPuppy
9167f2f2e6
Unpend test because I guess it works on Travis
2021-03-18 23:21:51 -07:00
CactusPuppy
e51dcc6d05
Pend test so that error is exposed instead of skipping
2021-03-18 23:01:54 -07:00
CactusPuppy
4fbe48692e
Actually run rest tests instead of features twice
2021-03-18 23:01:24 -07:00
CactusPuppy
6fed679644
Merge branch 'return-to-code-climate-coverage' into fix-ci
2021-03-18 20:47:14 -07:00
CactusPuppy
652381a0b8
Update annotate_models comments
2021-03-18 20:36:39 -07:00
CactusPuppy
ee8de1ce2d
Temp pend failing test, as it does not reflect local verification
2021-03-18 20:32:58 -07:00
CactusPuppy
039a931c90
Ensure coverage.xml is generated on Travis
2021-03-18 20:32:57 -07:00
CactusPuppy
2e9150887e
Prevent overwriting of jobs by matrix
2021-03-18 20:32:57 -07:00
CactusPuppy
9ad9a24d74
Actually properly report parallel stages
2021-03-18 20:32:56 -07:00
CactusPuppy
c4e07e858f
Fix minor typo in .travis.yml
2021-03-18 20:32:56 -07:00
CactusPuppy
3b768dda4b
Specify where the coverage report is
2021-03-18 20:32:55 -07:00
