Commit graph

3998 commits

Author SHA1 Message Date
CactusPuppy
d63cfb6d5c
Merge pull request #5 from CactusPuppy/depfu/update/chartkick-3.4.2
Update chartkick: 3.4.0 → 3.4.2 (patch)
2021-03-02 10:45:30 -08:00
depfu[bot]
f913d69ca9
Update chartkick to version 3.4.2 2021-03-02 10:32:40 -08:00
CactusPuppy
a76d5f2122
Merge pull request #8 from CactusPuppy/depfu/update/carrierwave-2.2.0
🚨 [security] Update carrierwave: 1.3.2 → 2.2.0 (major)
2021-03-02 10:20:28 -08:00
CactusPuppy
207046dc65
Merge pull request #11 from CactusPuppy/176894810/add_summision_text
Add submission text to event proposals
2021-03-01 23:38:06 -08:00
CactusPuppy
54a5f84d8b
Prefer single-quoted strings 2021-03-01 23:01:28 -08:00
CactusPuppy
30ec69282d
Fix '==' instead of assignment operator 2021-03-01 23:00:04 -08:00
CactusPuppy
c8e6dc86d7
Increase test coverage to stop codecov from complaining 2021-03-01 22:56:45 -08:00
lzy-1006
9ee29f6daa
Merge pull request #12 from CactusPuppy/176895037-add-link-to-view-event-from-admin-page
Add link to view event from admin page
2021-03-01 21:45:32 -08:00
CactusPuppy
626eaee761
Remove unnecessary self 2021-02-27 23:03:29 -08:00
CactusPuppy
16f5ed6138
Refactor calculation of submission limit and abstract limit into helper function 2021-02-27 22:54:35 -08:00
CactusPuppy
f207d070ac
Add spec for submission limits 2021-02-27 11:29:27 -08:00
CactusPuppy
0aa33c497c
Ensure that user is actually guest when testing 2021-02-27 11:25:37 -08:00
CactusPuppy
b94894fe87
Update annotate_models 2021-02-26 11:04:20 -08:00
CactusPuppy
974d12db30
Fix some rubocop complaints 2021-02-25 20:30:27 -08:00
CactusPuppy
42d43319c5
fix indentation error 2021-02-25 20:12:20 -08:00
Jimmy
05f877cfe5 [test] Add tests for previewing proposal in admin page 2021-02-25 11:15:23 -08:00
depfu[bot]
1a03b3e8cc
Update carrierwave to version 2.2.0 2021-02-25 08:13:40 +00:00
kingdish
56d93fa381
Merge pull request #7 from CactusPuppy/176917559-add-brand-elements-to-email
Add brand elements to email
2021-02-25 00:08:32 -08:00
CactusPuppy
d46e1e7397
Add JavaScript to make placeholder text update along with word count 2021-02-24 23:41:19 -08:00
madhekare
16d9dfef4c
submission_text rspec 2021-02-24 23:41:19 -08:00
madhekare
b8f531783b
submission text control/model modifications 2021-02-24 23:41:18 -08:00
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -08:00
madhekare
46fa17b55c
submission_text field migration 2021-02-24 23:41:18 -08:00
Jimmy
4ee70899f5 [fix] Fix style 2021-02-24 22:17:47 -08:00
Jimmy
e44714b06b Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email 2021-02-24 22:08:12 -08:00
Jimmy
92d052970a Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page 2021-02-24 22:07:38 -08:00
CactusPuppy
88373a7f47
Merge pull request #10 from CactusPuppy/176879873-fix-travis-tests
Turn CI green
2021-02-24 22:06:41 -08:00
Michael Ball
ad514b8908
Add a flay ignore file 2021-02-24 21:44:03 -08:00
Michael Ball
9abaf38e5a
Delint from a local pronto run 2021-02-24 21:44:02 -08:00
CactusPuppy
5f9f451dda
Merge branch 'master' into 176879873-fix-travis-tests 2021-02-24 21:35:59 -08:00
CactusPuppy
27fa018670
Merge branch 'master' into 176879873-fix-travis-tests 2021-02-24 21:27:00 -08:00
CactusPuppy
50675c8dbe
Fix a minor typo with spec description 2021-02-24 20:55:59 -08:00
CactusPuppy
38c10d326d
Fix spec incorrectly testing for conference org names 2021-02-24 20:55:30 -08:00
CactusPuppy
0d4823db38
Prevent contributors from accidentally committing their local_env.yml files 2021-02-24 20:36:49 -08:00
CactusPuppy
82a08ffa74
Fix typo 2021-02-24 20:28:13 -08:00
CactusPuppy
091105270b
Merge branch 'snap-cloud-michael/delint' into 176879873-fix-travis-tests 2021-02-24 20:24:57 -08:00
CactusPuppy
21e282679f
Fix Rubocop issues 2021-02-24 20:24:03 -08:00
CactusPuppy
f67c4aafe0
Add back user/password loading 2021-02-24 20:20:39 -08:00
CactusPuppy
a5e1cf17c5
Add ability to use local environment variables via config/local_env.yml 2021-02-24 20:20:29 -08:00
Michael Ball
c170221605 More image/nav tests 2021-02-24 20:10:05 -08:00
Michael Ball
005aebd936 Minor app helper tests 2021-02-24 20:07:12 -08:00
CactusPuppy
dea073f5b7
Merge branch 'snap-cloud-michael/delint' into 176879873-fix-travis-tests 2021-02-24 19:24:20 -08:00
CactusPuppy
d63a22c54e
Fix Rubocop issues 2021-02-24 19:22:21 -08:00
CactusPuppy
a4a6306198
Add back user/password loading 2021-02-24 19:10:31 -08:00
CactusPuppy
ebc2bd20ef
Add ability to use local environment variables via config/local_env.yml 2021-02-24 19:10:17 -08:00
Michael Ball
92f23a519e Fix outdated datatables spec 2021-02-24 12:53:01 -08:00
Jimmy
a0532b5d9f [feat] Add a button in admin event view that links to user event view 2021-02-24 12:17:05 -08:00
Michael Ball
2b2745ade9 run rubocp --fix 2021-02-24 09:47:56 -08:00
Michael Ball
1ca72dcf74 Attempt to fixup logo specs 2021-02-24 09:34:04 -08:00
Michael Ball
d4a86acfd3 Merge branch 'master' of github.com:snap-cloud/snapcon into michael/delint
* 'master' of github.com:snap-cloud/snapcon:
2021-02-24 03:36:54 -08:00