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

3899 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
8745825436 Fixup the commericals dispaly, correct some labels 2021-02-23 20:20:28 -08:00
Michael Ball
e0fd14e0ce Cleanup omniauth specs 2021-02-23 19:49:34 -08:00
Michael Ball
2573dbee44 fix the alt text in the conference logo 2021-02-23 18:47:27 -08:00
Michael Ball
2dc3950cb0 Fix commericals feature specs (UI consistency). 2021-02-23 18:43:18 -08:00
Michael Ball
d4a2861051 Improve Registration Flow Some: 
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
 2021-02-23 18:17:45 -08:00
Michael Ball
62dd99b263 Fix cfp spec to use "Materials" instead of Commercials 2021-02-23 17:17:17 -08:00
Michael Ball
f0ea293a43 Enable saving rspec output for --only-failures 2021-02-22 22:57:26 -08:00
Michael Ball
88821b9c4b
Merge pull request #84 from snap-cloud/annotate 
Install Annotate models Gem
 2021-02-22 01:08:07 -08:00
Michael Ball
52f456bbac
Merge pull request #83 from snap-cloud/dep-updates 
Update Dependencies
 2021-02-21 02:47:25 -08:00
Michael Ball
d7e24f6521 Run annotate_models 2021-02-20 09:57:27 -08:00
Michael Ball
55e853d31d Add annotation task 2021-02-20 09:56:25 -08:00
Michael Ball
7f4022e6a5 fix sentry enabled command 2021-02-20 09:55:52 -08:00
Michael Ball
4cdd7dd21a Add annotate gem 2021-02-20 09:55:21 -08:00
Michael Ball
c107f36f6d Finish upgrading the sentry plugin 2021-02-20 09:50:48 -08:00
Michael Ball
fcbbd54f84 Dependency conflicts resolved 2021-02-18 16:40:21 -08:00
Michael Ball
6f90a10e15 relax gemfile version 2021-02-18 16:19:34 -08:00
Michael Ball
16a403e633 relax gemfile version 2021-02-18 16:18:38 -08:00
Michael Ball
7277c7dc51 Update oauth2 / omniauth dependencies 2021-02-18 13:59:46 -08:00
Michael Ball
56a2a89fe2 Try using ruby 2.5.8 2021-02-18 13:47:14 -08:00
Michael Ball
d44c495bc5 Bump Rails to 5.2.4.5 2021-02-18 13:35:48 -08:00
Michael Ball
8e8a04fca0 Merge branch 'master' of github.com:snap-cloud/snapcon 
* 'master' of github.com:snap-cloud/snapcon:
  Bump carrierwave from 1.3.1 to 1.3.2
 2021-02-18 13:11:30 -08:00
Michael Ball
c925db0ad2 Use web interface of letter opener 2021-02-18 13:09:50 -08:00
Michael Ball
5770e97c4b
Merge pull request #80 from snap-cloud/dependabot/bundler/carrierwave-1.3.2 
Bump carrierwave from 1.3.1 to 1.3.2
 2021-02-17 22:39:36 -08:00
Michael Ball
ab6e72d87f Merge branch 'master' of github.com:snap-cloud/snapcon 
* 'master' of github.com:snap-cloud/snapcon:
  Bump nokogiri from 1.10.10 to 1.11.0
  Create codeql-analysis.yml
  Bump redcarpet from 3.5.0 to 3.5.1
 2021-02-15 19:09:33 -08:00
dependabot[bot]
fcdc3121d6
Bump carrierwave from 1.3.1 to 1.3.2 
Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v1.3.1...v1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-08 21:14:24 +00:00
Michael Ball
6e745fdc67
Merge pull request #78 from snap-cloud/dependabot/bundler/nokogiri-1.11.0 
Bump nokogiri from 1.10.10 to 1.11.0
 2021-02-05 11:19:29 -08:00
dependabot[bot]
d471e23909
Bump nokogiri from 1.10.10 to 1.11.0 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-13 23:58:43 +00:00
Michael Ball
8389d4b1fa
Merge pull request #77 from snap-cloud/dependabot/bundler/redcarpet-3.5.1 
Bump redcarpet from 3.5.0 to 3.5.1
 2021-01-13 15:57:15 -08:00
Michael Ball
24ed544159
Create codeql-analysis.yml 2021-01-13 15:57:01 -08:00
dependabot[bot]
4b54c85a08
Bump redcarpet from 3.5.0 to 3.5.1 
Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-11 20:07:28 +00:00
Michael Ball
20ea622bd3 display all speakers in an event when highlighted 2020-12-10 23:27:16 -08:00
Michael Ball
4c97dacf5c fix dynamic class name 2020-12-10 02:26:48 -08:00
Michael Ball
6522f46991 wider columns on the admin schedule page. 2020-12-10 02:14:36 -08:00
Michael Ball
0efc8c3b4a import Google Calendar content 2020-12-09 02:59:11 -08:00
Michael Ball
4f27073f13 typo 2020-12-09 02:49:04 -08:00
Michael Ball
ab3c8ff4ca tidy up event#show page, google calendar link 2020-12-09 02:46:16 -08:00
Michael Ball
acfc3e7aff Use event type not track for schedule coloring. 
Useful for Snapshot.
 2020-12-09 02:23:24 -08:00
Michael Ball
f85a11f5d5 Merge branch 'master' of https://git.heroku.com/snapcon 
* 'master' of https://git.heroku.com/snapcon:
  snapshot logo
  snapshot logo
 2020-12-04 01:17:59 -08:00
Michael Ball
2892a56a1c merge master 2020-12-04 01:17:39 -08:00
Michael Ball
ec352604b8
Use += instead of << with frozen string 2020-12-04 01:12:26 -08:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695) 
* Fix typos
 2020-10-30 11:06:43 +02:00
Stella Rouzi
87144caeb3
Merge pull request #2691 from digitaltom/update_codecov_dependency 
Update gems with security issues - make CI green
 2020-10-29 09:40:17 +02:00
Stella Rouzi
e70cec6a5d
Merge pull request #2696 from differentreality/update_awesome_nested_set 
Update gem awesome_nested_set
 2020-10-29 08:58:33 +02:00
Thomas Schmidt
d097f1b29f
update awesome_nested_set 2020-10-28 23:32:32 +01:00
Stella Rouzi
dc4c4416e4 Update gem awesome_nested_set 2020-10-28 20:50:23 +02:00
Stella Rouzi
6956b2b48c
Merge pull request #2647 from AndrewKvalheim/chromium-dependencies 
Install missing test dependency in base image
 2020-10-28 18:11:29 +02:00
Stella Rouzi
90ef93cddd
Merge pull request #2673 from AndrewKvalheim/docker-production-assets 
Serve precompiled assets in example Docker Compose configuration
 2020-10-28 17:54:42 +02:00
Michael Ball
7f827c844a snapshot logo 2020-10-28 02:28:36 -07:00
Michael Ball
92efee7916 snapshot logo 2020-10-28 01:39:58 -07:00
Thomas Schmidt
588884bace
update jquery-ui-rails 2020-09-29 00:41:18 +02:00