Michael Ball
|
04154020a5
|
Merge master, resolve schema conflicts
|
2021-03-02 22:35:01 -08:00 |
|
Michael Ball
|
634273e3ab
|
Merge pull request #104 from CactusPuppy/master
Iteration 1 & 2 tasks
|
2021-03-02 22:13:53 -08:00 |
|
Michael Ball
|
c18531ca21
|
Merge branch 'master' into master
|
2021-03-02 21:59:34 -08:00 |
|
Michael Ball
|
71eb408620
|
Fixup Routes: properly handle custom domains, add /events/:id alias
|
2021-03-02 21:50:59 -08:00 |
|
Michael Ball
|
b41b77c676
|
Add Committee Review Text Column
|
2021-03-02 21:21:29 -08:00 |
|
Michael Ball
|
4d067add46
|
Add Committee Review Text Column
|
2021-03-02 21:21:20 -08:00 |
|
Michael Ball
|
d067221f57
|
Show all conferences by default on Conferences#index
|
2021-03-02 20:46:35 -08:00 |
|
Michael Ball
|
d40ab944c2
|
Render conference md without escaping description html
|
2021-03-02 20:46:14 -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 |
|
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 |
|
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 |
|
Michael Ball
|
705cc469de
|
Update badges in README
|
2021-02-24 23:03:19 -08:00 |
|
depfu[bot]
|
2e6e60d568
|
Update puma to version 5.2.1
|
2021-02-25 06:58:49 +00:00 |
|
Michael Ball
|
8238ff03be
|
CodeClimate Test Reporter from Travis
|
2021-02-24 22:47:51 -08:00 |
|
Michael Ball
|
9d3043d810
|
Rails 5.2 is only good on Ruby 2.6. Will not run other versions until upgrade
|
2021-02-24 22:29:41 -08:00 |
|
Michael Ball
|
e7c564fc21
|
Merge branch 'master' into michael/ruby-versions
* master:
|
2021-02-24 22:26:01 -08:00 |
|
Jimmy
|
4ee70899f5
|
[fix] Fix style
|
2021-02-24 22:17:47 -08:00 |
|
Michael Ball
|
f10139efeb
|
Update badges and readme slightly
|
2021-02-24 22:11:32 -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 |
|