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

4057 commits

This branch
This branch
All branches
Author SHA1 Message Date
CactusPuppy
db30655465
Merge pull request #6 from CactusPuppy/176989612-add-badges 
Add or update badges for this fork
 2021-02-19 21:37:18 -08:00
CactusPuppy
53b0b6ee83
Merge branch 'master' into 176989612-add-badges 2021-02-19 21:36:33 -08:00
Ziyi
c79aa1f8bf Reformat README badges 2021-02-19 17:50:53 -08:00
Ziyi
a932c6dd03 Pivotal badge on README 2021-02-19 17:50:03 -08:00
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
Jimmy
55f56495f4 [feat] Allow embedding user-defined logo and user-defined text in email template 2021-02-19 17:01:24 +08:00
CactusPuppy
7f5d06b23c
Fix Rubocop issues 2021-02-18 21:03:28 -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
CactusPuppy
f473ca838f
Update README.md 2021-02-17 21:48:18 -08:00
CactusPuppy
9ed6210319
Remove double HTTP from app URL 2021-02-17 17:47:35 -08:00
CactusPuppy
c007bcf4c6
Update info.yml 2021-02-17 17:21:02 -08:00
CactusPuppy
8c1a8108c2
Create info.yml 2021-02-17 17:17:30 -08:00
CactusPuppy
20c6320dcd
Add Badges except for Bluejay 2021-02-17 15:17:54 -08:00
Ziyi
5746ae80aa gitignore for Mac 2021-02-17 12:44:25 -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
CactusPuppy
a45008640f
Add back user/password loading 2021-02-11 16:17:13 -08:00
CactusPuppy
46d1b5caf5
Add ability to use local environment variables via config/local_env.yml 2021-02-10 17:14:42 -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