Commit graph

4415 commits

Author SHA1 Message Date
depfu[bot]
03b943b3f5
Update cocoon to version 1.2.15 2021-03-10 13:25:45 -08:00
rajavi-mishra
1c28f3839e image tag 2021-03-10 11:18:39 -08:00
Jimmy
aa1b281f9a [test] Fix test for user#count_registration_tickets 2021-03-10 11:00:14 -08:00
rajavi-mishra
0a20f80d6e all layouts implemented in the emails 2021-03-10 10:25:41 -08:00
CactusPuppy
6cadf13a2a
Merge pull request #28 from CactusPuppy/177216921/sub-text-fill
Make submission text be auto-filled into text instead of placeholder
2021-03-10 10:15:03 -08:00
Michael Ball
0428d07736 Fixup specs for stripe to acctually run and be accurate. Mostly.
* extracts a bunch of logic to be more native capybara
* updates for existing changes in the app
* using ENV directly is an antipattern...but oh well.
* TBD: Why is unregister failing?
2021-03-10 03:30:22 -08:00
CactusPuppy
f6b026226a
Update comment in osem.js to be accurate 2021-03-09 19:08:13 -08:00
Jimmy
9fd6659d9d [style] fix style 2021-03-09 18:31:02 -08:00
Jimmy
59d19b3ae8 [style] fix style 2021-03-09 18:28:09 -08:00
Jimmy
11a4d200f7 [test] Fix style; add test for user#count_registration_tickets 2021-03-09 18:25:15 -08:00
Michael Ball
a7cf2d480d remove :linters group in gemfile 2021-03-08 21:32:46 -08:00
Michael Ball
7e2e785386
Merge pull request #115 from snap-cloud/admin-delete-users
Admin delete users
2021-03-08 21:25:09 -08:00
Michael Ball
d93390faa6 Fix datatables spec 2021-03-08 21:00:06 -08:00
depfu[bot]
4c11737c40
Update capybara to version 3.35.3 2021-03-09 04:56:48 +00:00
depfu[bot]
2e73853eb1
Update byebug to version 11.1.3 2021-03-09 04:37:02 +00:00
Michael Ball
19e029105c Merge branch 'master' into admin-delete-users
* master:
2021-03-08 20:31:33 -08:00
Michael Ball
81060a4d65
Merge pull request #114 from snap-cloud/merge-osem-master
Merge osem master
2021-03-08 20:30:40 -08:00
Michael Ball
332bf8f1df Support the ability for admins to delete users 2021-03-08 20:19:57 -08:00
Michael Ball
331e0a1610 better hidden class for admin datatable 2021-03-08 19:28:12 -08:00
Michael Ball
676d10ce36 HACK! Show confirmed status in the all users export 2021-03-08 19:24:34 -08:00
Michael Ball
e311a65f02 Delint Autofix 2021-03-08 16:50:56 -08:00
Michael Ball
f3271f5cdc Merge master 2021-03-08 16:48:06 -08:00
Michael Ball
743188d162
Merge pull request #107 from snap-cloud/michae/fixup-conferences-index-page
Cleanup All Conference Index
2021-03-08 15:56:22 -08:00
Michael Ball
3485a51ff1
Merge pull request #113 from snap-cloud/michael/add-separate-submission-instructions
Michael/add separate submission instructions
2021-03-08 15:55:10 -08:00
Michael Ball
fd4d776e2c datatables specs are passing on this fork! 2021-03-08 11:28:52 -08:00
CactusPuppy
9b77e9b155
Merge pull request #22 from CactusPuppy/codecov-travis-tweaks
Minor testing setup changes
2021-03-08 09:52:56 -08:00
Michael Ball
a293305fea Run gh specs even when linters fail.... 2021-03-08 03:10:56 -08:00
Michael Ball
4d34817928
Delint 2021-03-08 03:08:03 -08:00
Michael Ball
337a04d4ab
Delint 2021-03-08 03:07:56 -08:00
Michael Ball
f3401c46f8 use 2.6 for github actions 2021-03-08 03:05:01 -08:00
Michael Ball
061cb3e670 regenerate gemfile.lock 2021-03-08 03:04:53 -08:00
Michael Ball
f57da2e9dc use heroku version for sentry release 2021-03-08 02:58:53 -08:00
Michael Ball
49f77423f8 Fix merge in config/sentry 2021-03-08 02:58:05 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Michael Ball
8242eb3338 Remove submission_limit validation for submission_text 2021-03-08 02:18:44 -08:00
Michael Ball
2d1246448c Add some tests for the submission instructions 2021-03-08 02:13:57 -08:00
CactusPuppy
98649a6780
Add small accpetable test coverage dip threshold 2021-03-07 23:08:29 -08:00
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
Michael Ball
1a24533b00 Display submission instructions on the new/edit forms 2021-03-07 12:56:45 -08:00
Henne Vogelsang
5e70690619
Merge pull request #2740 from differentreality/survey_question_validation
Fix JS error when saving survey_question
2021-03-07 14:43:11 +01:00
Henne Vogelsang
26ebdd08b4
Merge pull request #2741 from hellcp/master
Don't set venue related values without a venue
2021-03-07 14:39:21 +01:00
Sasi Olin
56838b6eb0 Don't set venue related values without a venue 2021-03-07 10:19:10 +01: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
Stella Rouzi
ee5274b352 Fix JS error when saving survey_question 2021-03-07 07:32:52 +02: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
Henne Vogelsang
6b57c0be05
Merge pull request #2737 from hennevogel/feature/sentry-release
Set a release for sentry
2021-03-07 01:34:21 +01:00
Henne Vogelsang
d4e6122ba2
Set a release for sentry 2021-03-07 01:25:06 +01:00