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

3880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
89de647968 attempt to fix the discourse callback URL 2019-12-20 12:14:14 -08:00
Brian
2d31ababaa
Correct variable error 
Line 30 was missing the `@` in `@event.speakers.any`, which caused a 500 error when clicking on a session in the program. Corrected the typo.
 2019-12-20 10:38:14 -05:00
Henne Vogelsang
109cb7b114
Merge pull request #2614 from openSUSE/depfu/update/shoulda-matchers-4.1.2 
Update shoulda-matchers: 4.0.1 → 4.1.2 (minor)
 2019-12-20 15:59:22 +01:00
Henne Vogelsang
62e5a03a6f
Merge pull request #2617 from openSUSE/depfu/update/rack-2.0.8 
🚨 [security] Update rack: 2.0.7 → 2.0.8 (patch)
 2019-12-20 15:58:45 +01:00
Brian
b828a9d6c6
fixes redirect loop 
Redirecting users to `/account/sign_in` caused a redirect loop which crashed the page, but still adds them to the `users` table correctly.. Forcing users to the `root_path` solves the redirect loop.
 2019-12-20 08:26:22 -05:00
Michael Ball
4ea5fb0892 use a div with padding. 2019-12-19 03:58:07 -08:00
Michael Ball
0c232ffc9d Help button is weird. 2019-12-19 03:53:09 -08:00
Michael Ball
55057686ec Dropdown menu style tweaks 2019-12-19 03:49:23 -08:00
Michael Ball
46a35cf704 fix logic for snap sso link 2019-12-19 03:42:41 -08:00
Michael Ball
640d33f187 tweak form display in dropdown 2019-12-19 03:42:10 -08:00
Michael Ball
2e62aaf0c8 Tweak devise modules list 2019-12-19 03:32:52 -08:00
Michael Ball
4d4bdd00c6 Work on omniauth setup 2019-12-19 03:06:12 -08:00
Michael Ball
8a35bb377e Minor HTML cleanup 2019-12-19 02:36:42 -08:00
Michael Ball
904ca19878 More CSS-y things 2019-12-19 02:32:18 -08:00
Michael Ball
767b0bcd19 BJC-ify a bunch of styles 2019-12-19 02:21:09 -08:00
Michael Ball
5b5e10ba50 More wording tweaks 2019-12-19 02:12:44 -08:00
Michael Ball
cd2e2066f4 Tweak some wording, html and descriptions for Snap!Con 2019-12-19 02:00:32 -08:00
Michael Ball
43b65cc509 Enable a bunch more markdown options. 
Allow Snap_!_ to be rendered right.
 2019-12-19 01:45:04 -08:00
Michael Ball
78394bb0d3 Delete some unnecessary files 2019-12-19 01:41:17 -08:00
Michael Ball
624ee6cf6e attempt one more fix 2019-12-19 01:29:17 -08:00
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