Commit graph

3887 commits

Author SHA1 Message Date
CactusPuppy
eaf4cef3c2 Update README.md 2021-02-19 09:44:25 -08:00
CactusPuppy
c9a6f55499 Add Badges except for Bluejay 2021-02-19 09:44:25 -08:00
CactusPuppy
3b724c28fa Remove double HTTP from app URL 2021-02-19 09:44:25 -08:00
CactusPuppy
424b225abd Update info.yml 2021-02-19 09:44:25 -08:00
CactusPuppy
65e2509c70 Create info.yml 2021-02-19 09:44:25 -08:00
Ziyi
d1ebc025d3 gitignore for Mac 2021-02-19 09:44:25 -08:00
CactusPuppy
d6da9b6380 Add back user/password loading 2021-02-19 09:44:25 -08:00
CactusPuppy
ae05f51669 Add ability to use local environment variables via config/local_env.yml 2021-02-19 09:44:25 -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
Thomas Schmidt
7d0297410e
update chartkick dep 2020-09-29 00:29:14 +02:00
Thomas Schmidt
bfb036fa96
upgrade rails to 5.2.4.4 2020-09-29 00:15:42 +02:00
Thomas Schmidt
f5ac859b9b
The "chromeOptions" key in chrome capabilities changed to "goog:chromeOptions".
But I'm rather switching to the 'option' array here for readability and alignment with Firefox options.
2020-09-29 00:02:18 +02:00
Thomas Schmidt
046ed9f7b7
Update codecov dependency to latest 0.2.11
The used version 0.1.14 was yanked from rubygems.org
2020-09-28 22:58:24 +02:00
Michael Ball
8af245a3a3 Try to fix nav link 2020-09-03 10:03:42 -07:00
Michael Ball
d306f3732c Attempt to fix custom domain routing 2020-08-19 13:31:04 -07:00
Michael Ball
40d2a863d5 Some tidying of the conference page 2020-08-02 19:46:20 -07:00
Michael Ball
081e433b24 longer timeout 2020-08-02 14:34:17 -07:00
Michael Ball
6186eee1d5 fix versions? 2020-08-02 14:26:44 -07:00
Michael Ball
0cca2dc619 handle nil case 2020-08-02 13:58:19 -07:00
Michael Ball
18eb6ac3d3 Patch for nil event schedules 2020-08-01 08:08:56 -07:00
Michael Ball
29cea21c84 Google Calendaer Link 2020-07-31 15:09:19 -07:00