Commit graph

3908 commits

Author SHA1 Message Date
Michael Ball
77965b65f8 config that works without docker 2020-07-10 18:29:46 -07:00
Michael Ball
20f1afd4e6 Add some links to navbar 2020-07-10 18:29:20 -07:00
Michael Ball
2e24ae5d2c More login info 2020-07-08 20:51:50 -07:00
Michael Ball
b31e1a825d Custom login help info 2020-07-08 20:48:45 -07:00
Michael Ball
d5f0063de6 Run migration; add apple pay verification 2020-07-08 02:14:11 -07:00
Michael Ball
0e9d6b491b fix tickets bug with no description 2020-07-07 22:24:28 -07:00
Michael Ball
8d322f56ef WOW fix a bad bug!! 2020-07-06 00:58:59 -07:00
Michael Ball
59bf4f09dc Ugh, move constant 2020-07-01 02:04:27 -07:00
Michael Ball
d4c96dc722 young thinkers custom email 2020-07-01 01:27:15 -07:00
Michael Ball
cff6e55c9c Reduce data on conference dashboard b/c of timeouts 2020-06-30 01:38:43 -07:00
Michael Ball
0877aadb2e Merge some contributor fixes 2020-06-30 00:48:47 -07:00
Michael Ball
a56a0e7547 Merge master 2020-06-29 13:18:19 -07:00
Andrew Kvalheim
c2c074c3c5 Merge #​2673 "Serve precompiled assets in example Docker Compose configuration" 2020-06-26 20:19:41 -07:00
Andrew Kvalheim
3f1c8068ee Merge #​2667 "Work around bug in migrations to non-null columns" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
86713f992e Merge #​2666 "Fix migration that fails on conferences without pictures" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
e11f634377 Merge #​2665 "Annotate past migrations with Rails version" 2020-06-26 20:19:39 -07:00
Andrew Kvalheim
d7a5351b7c Merge #​2663 "Update Docker Compose file format: 2.0 → 2.4 (minor)" 2020-06-26 20:19:38 -07:00
Andrew Kvalheim
0618f93660 Merge #​2662 "Fix bug in test of animated form" 2020-06-26 20:19:37 -07:00
Andrew Kvalheim
943f0afaaf Merge #​2659 "Use Rails transactional tests" 2020-06-26 20:19:36 -07:00
Andrew Kvalheim
305c7cac28 Merge #​2658 "Fix bug in logging of screenshots of failed tests" 2020-06-26 20:19:36 -07:00
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Andrew Kvalheim
e4251d7b67 Merge #​2654 "Fix access to the version history of organization-level roles" 2020-06-26 20:19:34 -07:00
Andrew Kvalheim
668aa388a1 Merge #​2655 "Ignore schema.rb in RuboCop" 2020-06-26 20:19:34 -07:00
Andrew Kvalheim
042fe17fdb Merge #​2649 "Work around ChromeDriver/Chromium crash" 2020-06-26 20:19:33 -07:00
Andrew Kvalheim
09b30b4b23 Merge #​2648 "Resolve conflict between WebMock and Webdrivers" 2020-06-26 20:19:32 -07:00
Andrew Kvalheim
14fe81be29 Merge #​2647 "Install missing test dependency in base image" 2020-06-26 20:19:32 -07:00
Andrew Kvalheim
c5f937902a Merge #​2670 "Update all of rails: 5.2.3 → 5.2.4.3 (minor)" 2020-06-26 20:19:31 -07:00
Andrew Kvalheim
dd40243fbf Merge #​2646 "Use version range instead of OSEM_RUBY_VERSION." 2020-06-26 20:19:10 -07:00
Andrew Kvalheim
ace4fd4996 Merge #​2640 "Explicitly configure database authentication in Docker Compose" 2020-06-26 20:19:10 -07:00
Michael Ball
744fe48121
Merge pull request #39 from snap-cloud/more-fixes
More fixes
2020-06-24 03:12:47 -07:00
Michael Ball
46955e4ed9 Up max speakers to 100 2020-06-24 02:55:20 -07:00
depfu[bot]
7baf1099ab
Update all of rails to version 5.2.4.3 2020-06-20 02:40:59 +00:00
James Mason
6e6a6dcd39
Merge pull request #2679 from openSUSE/depfu/update/rack-2.1.4
🚨 [security] Update rack: 2.0.8 → 2.1.4 (minor)
2020-06-19 19:33:39 -07:00
depfu[bot]
3a3c0e6f2f
Update rack to version 2.1.4 2020-06-20 02:10:35 +00:00
James Mason
8c96a6cc9a
Merge pull request #2677 from openSUSE/depfu/update/websocket-extensions-0.1.5
🚨 [security] Update websocket-extensions: 0.1.4 → 0.1.5 (minor)
2020-06-19 19:09:34 -07:00
James Mason
0d876de27f
Merge pull request #2672 from openSUSE/depfu/update/puma-3.12.6
🚨 [security] Update puma: 3.12.4 → 3.12.6 (patch)
2020-06-19 19:09:13 -07:00
James Mason
754c47e41b
Merge pull request #2656 from AndrewKvalheim/ajax-datatables-rails-293-postgresql
Fix bug in UserDatatable query affecting PostgreSQL
2020-06-19 19:07:18 -07:00
Michael Ball
dbfebdcd01 Ooops. Fix indentation 2020-06-18 12:08:15 -07:00
Michael Ball
05fa9e8d3d set @user correctly 2020-06-18 12:02:59 -07:00
Michael Ball
3432b9fd9e ugh, typo 2020-06-18 11:50:34 -07:00
Michael Ball
68e574dd9e Add in registration warning 2020-06-18 11:37:26 -07:00
Michael Ball
38e3cc12fd strip text on homepage tickets 2020-06-18 11:04:11 -07:00
Michael Ball
1d478ba5b9 Fix split by newlines 2020-06-18 11:03:20 -07:00
Michael Ball
f9a3bd73a2 Add fallback oembeds 2020-06-18 11:01:39 -07:00
Michael Ball
26692027a5 Restore registration flow 2020-06-18 04:29:57 -07:00
Michael Ball
545b4b8852 Fix letter opener; tweak ticket display 2020-06-18 04:14:38 -07:00
Michael Ball
a5c10dc161 ugh typo 2020-06-15 10:55:26 -07:00
Michael Ball
77571b940b HACK!!! Return 0 so the method works. 2020-06-15 04:34:11 -07:00
Michael Ball
e8ab2e1b29 attempt to fix a bad bug?? 2020-06-15 04:32:53 -07:00
Michael Ball
985d2ca248 Update logo again 2020-06-09 18:59:41 -07:00