Commit graph

4048 commits

Author SHA1 Message Date
CactusPuppy
2e61bc2948
Include help data for event types in new proposal view
(Why doesn't the new view use the proposal form partial?)
2021-03-07 23:02:49 -08:00
CactusPuppy
cdbeb6ec4c
Add test for covering Rest to Template button 2021-03-07 23:00:40 -08:00
CactusPuppy
8f465136c3
Add buttons for submission text template reset 2021-03-06 22:56:37 -08:00
CactusPuppy
71ce82c968
Create JS hook for template reset 2021-03-06 22:56:36 -08:00
CactusPuppy
1f9da86e39
Fill submission text if the field is currently empty 2021-03-06 22:56:36 -08:00
CactusPuppy
e4fea7188b
Merge pull request #23 from snap-cloud/master
Pull in changes from golden repo
2021-03-06 20:43:06 -08:00
Michael Ball
4610ca485b
Merge pull request #109 from snap-cloud/depfu/update/puma-5.2.2
Update puma: 5.2.1 → 5.2.2 (patch)
2021-03-06 11:06:43 -08:00
Michael Ball
a4d9d4bc6c
Merge pull request #108 from snap-cloud/depfu/update/rails-controller-testing-1.0.5
Update rails-controller-testing: 1.0.4 → 1.0.5 (patch)
2021-03-06 11:06:28 -08:00
depfu[bot]
dee3e8ad23
Update puma to version 5.2.2 2021-03-04 11:06:08 +00:00
depfu[bot]
1133dcb30b
Update rails-controller-testing to version 1.0.5 2021-03-04 10:46:20 +00:00
Michael Ball
4900f0c14a
Merge pull request #101 from snap-cloud/depfu/update/dotenv-rails-2.7.6
Update dotenv-rails: 2.7.5 → 2.7.6 (patch)
2021-03-04 02:44:46 -08:00
Michael Ball
cd74abc07e
Merge pull request #105 from snap-cloud/depfu/update/font-awesome-rails-4.7.0.7
Update font-awesome-rails: 4.7.0.5 → 4.7.0.7 (patch)
2021-03-04 02:44:24 -08:00
Michael Ball
d5796619c9
Merge pull request #106 from snap-cloud/fix-carrierwave
Fix carrierwave
2021-03-04 02:42:14 -08:00
Michael Ball
ea6a29e667 Add cache_storage config for carrierwave 2 2021-03-04 01:41:49 -08:00
Michael Ball
072ca83052 Add pry-byebug gem 2021-03-04 01:39:46 -08:00
CactusPuppy
cfbb3bc36f
Merge pull request #13 from CactusPuppy/depfu/update/cocoon-1.2.15
Update cocoon: 1.2.14 → 1.2.15 (patch)
2021-03-03 12:17:42 -08:00
depfu[bot]
92a781a595
Update font-awesome-rails to version 4.7.0.7 2021-03-03 06:16:49 +00:00
Michael Ball
634273e3ab
Merge pull request #104 from CactusPuppy/master
Iteration 1 & 2 tasks
2021-03-02 22:13:53 -08:00
depfu[bot]
5e0848ef4e
Update cocoon to version 1.2.15 2021-03-03 06:04:48 +00:00
Michael Ball
c18531ca21
Merge branch 'master' into master 2021-03-02 21:59:34 -08:00
Michael Ball
61ce7073de
Merge pull request #103 from snap-cloud/michael/fix-contact-link-styling
Fixup the last trapeziod on social media section
2021-03-02 20:07:52 -08:00
Michael Ball
06b05b8177 Fixup the last trapeziod on social media section 2021-03-02 18:55:41 -08:00
depfu[bot]
a304780459
Update dotenv-rails to version 2.7.6 2021-03-03 00:36:15 +00:00
Michael Ball
5827861ed2
Merge pull request #95 from snap-cloud/depfu/update/codecov-0.5.0
Update codecov: 0.2.11 → 0.5.0 (major)
2021-03-02 14:39:56 -08:00
Michael Ball
8eaf1e0a61
Merge pull request #90 from snap-cloud/depfu/update/puma-5.2.1
🚨 [security] Upgrade puma: 3.12.6 → 5.2.1 (major)
2021-03-02 14:38:08 -08:00
depfu[bot]
27b0022a88
Update codecov to version 0.5.0 2021-03-02 22:16:32 +00:00
Michael Ball
31f81a6661
Merge pull request #94 from snap-cloud/why-the-heck-cant-i-build-on-travis-🍊🍊
Why the heck cant i build on travis 🍊🍊
2021-03-02 13:56:10 -08:00
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
Michael Ball
fa85205d27 Cleanup travis a bit, add postgres, but its not used yet... 2021-02-25 15:52:51 -08:00
Michael Ball
c6640c0de2 Update travis config. Try bionic build. 2021-02-25 14:15:10 -08:00
Jimmy
05f877cfe5 [test] Add tests for previewing proposal in admin page 2021-02-25 11:15:23 -08:00
Michael Ball
6cb8fe3787 Comment out all codeclimate references 2021-02-25 01:51:55 -08:00
Michael Ball
56042226a1 CodeClimate isnt quite configured right... 2021-02-25 01:28:07 -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