Commit graph

3607 commits

Author SHA1 Message Date
Michael Ball
20129e2e77 readd back the group by 2019-12-19 01:23:54 -08:00
Michael Ball
cdcf550ee0 more attempts to make datatables work 2019-12-19 01:13:58 -08:00
depfu[bot]
544becd291
Update rack to version 2.0.8 2019-12-18 22:50:29 +00:00
Michael Ball
29f6a41c98 Not ruby-ish but this should work 2019-12-17 12:56:51 -08:00
Michael Ball
dbe0b1c09c try again with the query 2019-12-17 12:45:41 -08:00
Michael Ball
2c1b11d2c7 Fix a comma 2019-12-17 12:25:13 -08:00
Michael Ball
610ad32eda Merge branch 'snapcon' of github.com:snap-cloud/osem into snapcon
* 'snapcon' of github.com:snap-cloud/osem:
  Revert "Update rails-assets-bootstrap-select to version 1.13.10"
2019-12-17 12:21:25 -08:00
Michael Ball
1e86f36511
Merge pull request #12 from snap-cloud/revert-4-depfu/update/rails-assets-bootstrap-select-1.13.10
Revert "Update rails-assets-bootstrap-select to version 1.13.10"
2019-12-17 12:21:17 -08:00
Michael Ball
e7a8190302
Revert "Update rails-assets-bootstrap-select to version 1.13.10" 2019-12-17 12:21:05 -08:00
Michael Ball
34e3258086 attempt to fix groupby issue 2019-12-17 11:28:40 -08:00
Michael Ball
c1810b31c2 Merge branch 'snapcon' of github.com:snap-cloud/osem into snapcon
* 'snapcon' of github.com:snap-cloud/osem:
  Update shoulda-matchers to version 4.1.2
  Update rails-assets-bootstrap-select to version 1.13.10
2019-12-17 11:17:22 -08:00
Michael Ball
8d6c9978b9 Hide the small image for now 2019-12-17 03:15:05 -08:00
Michael Ball
beb1b8ae26 ugh fix js again 2019-12-17 02:48:47 -08:00
Michael Ball
9a21d4016d try again for picture_url 2019-12-17 02:18:44 -08:00
Michael Ball
94168ec23e JS conf picture URL try 2 2019-12-17 01:59:42 -08:00
Michael Ball
03c420bcdd
Merge pull request #5 from snap-cloud/depfu/update/shoulda-matchers-4.1.2
Update shoulda-matchers to version 4.1.2
2019-12-17 01:56:16 -08:00
Michael Ball
e806f76c34
Merge pull request #4 from snap-cloud/depfu/update/rails-assets-bootstrap-select-1.13.10
Update rails-assets-bootstrap-select to version 1.13.10
2019-12-17 01:55:51 -08:00
Michael Ball
ccc9e9c98e Try 3 for the image background 2019-12-17 01:51:15 -08:00
Michael Ball
7657ddf27f attempt to fix style syntax 2019-12-17 01:41:01 -08:00
Michael Ball
de7a6036d1 Tweak the top heading if there is a image 2019-12-17 01:32:16 -08:00
Michael Ball
5441f83271 No mysql for SnapCon 2019-12-17 01:27:10 -08:00
Henne Vogelsang
e7d98999fb
Merge pull request #2616 from openSUSE/depfu/update/puma-3.12.2
🚨 [security] Update puma: 3.12.1 → 3.12.2 (patch)
2019-12-06 12:59:04 +01:00
depfu[bot]
66ff365e06
Update puma to version 3.12.2 2019-12-06 10:26:38 +00:00
James Mason
3a94aeb073
Remove travel schedule from registration
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
2019-12-02 14:19:12 -08:00
depfu[bot]
33e07bfc28
Update shoulda-matchers to version 4.1.2 2019-12-02 18:25:54 +00:00
James Mason
43ab8966e3
Merge pull request #2613 from openSUSE/depfu/update/redcarpet-3.5.0
Update redcarpet: 3.4.0 → 3.5.0 (minor)
2019-12-02 10:21:09 -08:00
James Mason
b691568b61
Merge pull request #2606 from openSUSE/depfu/update/leaflet-rails-1.5.1
Update leaflet-rails: 1.4.0 → 1.5.1 (minor)
2019-12-02 10:20:42 -08:00
depfu[bot]
842b83ba91
Update leaflet-rails to version 1.5.1 2019-11-27 12:50:55 +00:00
depfu[bot]
9c14a026d4
Update redcarpet to version 3.5.0 2019-11-27 12:45:49 +00:00
Henne Vogelsang
4078cd85ef
Merge pull request #2609 from openSUSE/depfu/update/chartkick-3.3.0
🚨 [security] Update chartkick: 3.2.1 → 3.3.0 (minor)
2019-11-27 13:44:23 +01:00
Henne Vogelsang
be38aae203
Merge pull request #2611 from openSUSE/depfu/update/ruby-openid-2.9.2
🚨 [security] Update ruby-openid: 2.5.0 → 2.9.2 (minor)
2019-11-26 17:05:29 +01:00
Henne Vogelsang
aeea38ae71
Merge pull request #2608 from openSUSE/depfu/update/nokogiri-1.10.5
🚨 [security] Update nokogiri: 1.10.4 → 1.10.5 (patch)
2019-11-26 17:05:18 +01:00
depfu[bot]
f823d8783a
Update ruby-openid to version 2.9.2 2019-11-17 02:11:41 +00:00
depfu[bot]
00bf2c24a7
Update chartkick to version 3.3.0 2019-11-10 04:07:08 +00:00
depfu[bot]
7336a67133
Update nokogiri to version 1.10.5 2019-11-07 17:20:59 +00:00
James Mason
a96cee7d4c
Merge pull request #2607 from openSUSE/depfu/update/active_model_serializers-0.10.10
Update active_model_serializers: 0.10.9 → 0.10.10 (minor)
2019-11-07 09:18:52 -08:00
depfu[bot]
c123de2552
Update active_model_serializers to version 0.10.10 2019-10-31 18:00:49 +00:00
Henne Vogelsang
2174227e15
Merge pull request #2605 from openSUSE/depfu/update/sqlite3-1.4.1
Update sqlite3: 1.3.13 → 1.4.1 (minor)
2019-10-31 18:55:11 +01:00
Henne Vogelsang
8bfa87f834
Merge pull request #2604 from openSUSE/depfu/update/money-rails-1.13.3
Update money-rails: 1.13.2 → 1.13.3 (patch)
2019-10-31 18:54:24 +01:00
depfu[bot]
e8dd6cba5e
Update sqlite3 to version 1.4.1 2019-10-31 14:51:36 +00:00
Henne Vogelsang
943301b4bc
Merge pull request #2603 from openSUSE/depfu/update/autoprefixer-rails-9.6.4
Update autoprefixer-rails: 9.6.0 → 9.6.4 (patch)
2019-10-31 15:48:06 +01:00
depfu[bot]
07a6deedb0
Update money-rails to version 1.13.3 2019-10-31 14:47:57 +00:00
depfu[bot]
ebdac434bd
Update autoprefixer-rails to version 9.6.4 2019-10-31 11:56:02 +00:00
Henne Vogelsang
f14f726741
Merge pull request #2602 from openSUSE/depfu/update/webdrivers-4.1.3
Update webdrivers: 4.1.0 → 4.1.3 (patch)
2019-10-31 12:53:47 +01:00
Henne Vogelsang
63c5864cc8
Merge pull request #2601 from openSUSE/depfu/update/turbolinks-5.2.1
Update turbolinks: 5.2.0 → 5.2.1 (patch)
2019-10-31 12:53:30 +01:00
Henne Vogelsang
1ce66a55bc
Merge pull request #2596 from snpd25/branch1
Supports talks without speakers
2019-10-31 12:52:20 +01:00
depfu[bot]
dfbfc2eccc
Update webdrivers to version 4.1.3 2019-10-25 23:00:50 +00:00
depfu[bot]
a9a5606b97
Update turbolinks to version 5.2.1 2019-10-25 22:55:57 +00:00
Henne Vogelsang
2b302045ac
Merge pull request #2599 from openSUSE/depfu/update/paper_trail-10.3.1
Update paper_trail: 10.3.0 → 10.3.1 (patch)
2019-10-26 00:55:18 +02:00
Henne Vogelsang
4730db1e0e
Merge pull request #2600 from openSUSE/depfu/update/delayed_job_active_record-4.1.4
Update delayed_job_active_record: 4.1.3 → 4.1.4 (patch)
2019-10-26 00:55:08 +02:00