gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3706 commits 2 branches 2 tags 50 MiB
Commit graph

3706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
a56a0e7547 Merge master 2020-06-29 13:18:19 -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
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
Michael Ball
9cc2c103bc update snapcon logo 2020-06-09 18:20:21 -07:00
Michael Ball
a3a7f54847 Fix link_to call in tickets view 2020-06-09 03:31:55 -07:00
Michael Ball
d5cd328536 fix missing @ in @conference tickets view 2020-06-09 03:27:46 -07:00
Michael Ball
19ac2f8ea1 Do not allow registrations without tickets 2020-06-09 03:19:41 -07:00
Michael Ball
907cd182a0 Add purchase date to admin tickets 2020-06-09 02:51:05 -07:00
depfu[bot]
acb3654af2
Update websocket-extensions to version 0.1.5 2020-06-05 18:44:31 +00:00
Michael Ball
ce3f9e422a Tidy up some text around logins and proposals 2020-06-04 02:04:07 -07:00
Michael Ball
7d8245fa68
Merge pull request #36 from snap-cloud/michael/rm-start-restriction 
DatePickers: Remove enforcing start date min.
 2020-06-02 02:40:06 -07:00
Michael Ball
8d5c300639
Merge branch 'master' into michael/rm-start-restriction 2020-06-02 02:08:33 -07:00
Michael Ball
152f200f93 DatePickers: Remove enforcing start date min. 
You might want to edit conference metadata after the start date has past, so it is
logical to allow the start date to be earlier than "today". As there are no backend
validations, this change is safe and removes a UI bug.
 2020-06-02 02:04:38 -07:00
Michael Ball
0b9b100bf3 Merge master 2020-06-02 01:59:54 -07:00
depfu[bot]
4e6c74ecb5
Update puma to version 3.12.6 2020-05-22 20:50:27 +00:00
Stella Rouzi
a89201ff82
Merge pull request #2671 from ifellinaholeonce/master 
Add uniqueness tests for Event scope on Vote model with User association
 2020-05-21 08:47:26 +03:00
Tymm Schmitke
40036899b3 Add empty line at end of file 2020-05-19 23:18:05 -04:00
Tymm Schmitke
aa99f909a6 Add uniqueness tests for Event scope on Vote model with User association 2020-05-19 22:24:37 -04:00
James Mason
dfb159a0e1
Merge pull request #2638 from openSUSE/depfu/update/puma-3.12.4 
🚨 [security] Update puma: 3.12.2 → 3.12.4 (patch)
 2020-04-06 09:48:04 -07:00
James Mason
49639dadb1
Merge pull request #2637 from openSUSE/depfu/update/sqlite3-1.4.2 
Update sqlite3: 1.4.1 → 1.4.2 (patch)
 2020-04-06 09:46:41 -07:00
James Mason
8403074765
Merge pull request #2644 from openSUSE/depfu/update/json-2.3.0 
🚨 [security] Update json: 2.2.0 → 2.3.0 (minor)
 2020-04-06 09:46:08 -07:00
Stella Rouzi
303129bf45
Merge pull request #2652 from AndrewKvalheim/test-unspecified-order-2 
Decouple tests from unspecified data ordering (part 2)
 2020-04-06 15:26:07 +03:00
Andrew Kvalheim
4182b6fb8f Fix bug in UserDatatable query affecting PostgreSQL 
Resolves:

    $ docker-compose run --rm osem bundle exec rspec ./spec/datatables/user_datatable_spec.rb:97
    …
    ActiveRecord::StatementInvalid:
    PG::GroupingError: ERROR:  column "users.id" must appear in the GROUP BY clause or be used in an aggregate function
 2020-04-04 10:35:56 -07:00
Andrew Kvalheim
d3e73b103f Document workaround for jbox-web/ajax-datatables-rails#293 2020-04-04 10:35:44 -07:00
Andrew Kvalheim
a179a38fae Minor refactor 2020-04-01 08:53:46 -07:00
Andrew Kvalheim
10f0edac20 Decouple tests from unspecified data ordering 
These tests have been passing with SQLite, but don't reflect guaranteed
behavior and with PostgreSQL failed intermittently.
 2020-03-29 09:06:47 -07:00
Stella Rouzi
e709d080b4
Merge pull request #2650 from AndrewKvalheim/test-unspecified-order 
Decouple tests from unspecified data ordering
 2020-03-29 15:55:34 +03:00
Andrew Kvalheim
a7006a4edd Decouple tests from unspecified data ordering 
These tests have been passing with SQLite, but don't reflect guaranteed
behavior and with PostgreSQL failed intermittently.
 2020-03-28 15:15:01 -07:00
depfu[bot]
0e3e832770
Update json to version 2.3.0 2020-03-19 15:49:52 +00:00
depfu[bot]
5c57ccdf5a
Update puma to version 3.12.4 2020-03-03 11:18:54 +00:00
Michael Ball
408f341226 Allow in robots 2020-02-27 02:51:09 -08:00
Michael Ball
55ce5cb5f6 Add messages@snap as a bcc for all snapcon emails 2020-02-20 22:04:09 -08:00