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

400 commits

Author SHA1 Message Date
Michael Ball
3b9c038947 merge master 2021-05-04 15:41:29 -07:00
Jimmy
cb6219e812
[feat]Read fullcalendar license key from ENV 2021-05-01 18:05:45 -07:00
Jimmy
5296d18c27
[feat]Fullcalendar integration done 2021-05-01 18:04:47 -07:00
CactusPuppy
410012d6be
Create route for vertical schedule and test confirming it works 2021-05-01 18:04:40 -07:00
Michael Ball
927e8ec436 merge master 2021-04-16 01:23:39 -07:00
Michael Ball
a88402642c What the heck! Add a short URL for conferences 2021-04-16 01:15:22 -07:00
Michael Ball
6ce36c0fca Merge branch 'master' into submission-reviewer-comments 
* master: (246 commits)
  merge master
  Skip datatable spec because github actions is weird.
  Add devise view files for email messages
  Make the _mailbot_* files not depend on @conference
  Tweak devise text for confirm emails
  Run database migrations on release
  [fix]Add mailbot.css to assets.rb
  [fix]Fix empty string check
  [fix]Fix program#any_event_for_this_date?
  Add newline at end of show.js.erb file
  [feat]Display happening now only if program is also displayed
  [feat]Add brief version of event partial; fix style
  [feat]Description / happening now takes the entire row if the other is empty
  [feat]Use Ajax for paginating happening_now
  [style]Fix style
  [refactor]Delete unused javascript; Move about-and-happening-now to partial
  [feat]Add bootstrap style to pagination navbar
  [fix]Fix style; Re-enable checking happening now
  items per page
  pagination
  ...
 2021-04-15 22:22:52 -07:00
Michael Ball
68004c842e
Merge pull request #138 from snap-cloud/confirmation-email-update 
Improve the Account Confirmation Email
 2021-04-15 22:18:23 -07:00
Michael Ball
d4dba945fc Tweak devise text for confirm emails 2021-04-15 19:10:21 -07:00
Stella Rouzi
f97d4ca0f1 Add letter opener web 2021-04-14 10:46:45 +03:00
Jimmy
b70852e67e [fix]Add comma 2021-04-13 18:29:20 +08:00
Jimmy
d2f1720d70 [fix]Fix mailbot settings 2021-04-13 18:26:38 +08:00
kingdish
1118c3cbcc
Merge branch 'master' into 177717903-move-constants-to-configuration-file 2021-04-13 14:10:40 +08:00
Jimmy
25fc901128 [fix]Add mailbot.css to assets.rb 2021-04-13 13:51:18 +08:00
Jimmy
4fcc610b24 [feat]Config read from environment variables 2021-04-13 11:03:37 +08:00
Jimmy
b7fbba162b [refactor]Move constants to configuration file 2021-04-12 14:01:49 +08:00
Jimmy
3c7cc6cfdb [feat]Use Ajax for paginating happening_now 2021-04-09 17:16:16 +08:00
Jimmy
185b2773d7 [feat]Add bootstrap style to pagination navbar 2021-04-09 16:33:39 +08:00
Jimmy
bb44f10120 [fix]Fix style; Re-enable checking happening now 2021-04-08 12:52:27 +08:00
madhekare
77b6dac6a2 pagination happening now 2021-04-07 20:56:03 -07:00
Michael Ball
de8b06c4b3 Merge master tidy routes 2021-03-24 13:32:40 -07:00
CactusPuppy
8110d06ca7
Fix Rubocop linting issue 2021-03-19 01:26:53 -07:00
CactusPuppy
33af94badd
Allow ES6 JS syntax 2021-03-19 01:22:22 -07:00
Jimmy
11d4255c67 merge 2021-03-11 21:28:17 -08:00
Jimmy
899d4c91f6 [test] Simplify mailbot.rb; Add corresponding tests 2021-03-10 23:09:52 -08:00
Michael Ball
f57da2e9dc use heroku version for sentry release 2021-03-08 02:58:53 -08:00
Michael Ball
49f77423f8 Fix merge in config/sentry 2021-03-08 02:58:05 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Henne Vogelsang
d4e6122ba2
Set a release for sentry 2021-03-07 01:25:06 +01:00
Henne Vogelsang
b4b20bd135
Introduces sentry, removes airbrake 
Sentry is the premiere FOSS error tracking app.
 2021-03-06 23:13:59 +01:00
Henne Vogelsang
1291d1846d
Move cache to file 
No need to store caches in the cloud.
 2021-03-06 21:58:23 +01:00
Henne Vogelsang
e4c9100ea6
Merge pull request #2717 from hellcp/master 
Add icalendar files
 2021-03-06 21:36:50 +01:00
Sasi Olin
d540092bfc
Add icalendar files (fixes #2147) 2021-03-06 21:18:39 +01:00
Andrew Kvalheim
266fdbabea
Omit nil SMTP settings 
Allows leaving `smtp_settings[:domain]` unspecified. Explicitly setting
it to `nil` (as when `OSEM_SMTP_DOMAIN` is unset) overrides the default
value of `'localhost.localdomain'` and caused SMTP connections to fail
with `EOFError`.
 2021-03-06 21:10:36 +01:00
Espartaco Palma
2d17ce2667
Using Native ActiveRecord Logger 
Starting in Rails 5.2 there's a new setting to log ActiveRecord
queries making the LogQuerySource not needed anymore
 2021-03-06 19:03:47 +01:00
Emily Gonyer
77accc1100
removed-gendered-terms 2021-03-06 03:27:38 +01:00
Jimmy
c97b081b2c FOR DEMO ONLY 2021-03-05 09:30:01 -08:00
Michael Ball
ea6a29e667 Add cache_storage config for carrierwave 2 2021-03-04 01:41:49 -08:00
Michael Ball
04154020a5 Merge master, resolve schema conflicts 2021-03-02 22:35:01 -08:00
Michael Ball
c18531ca21
Merge branch 'master' into master 2021-03-02 21:59:34 -08:00
Michael Ball
71eb408620 Fixup Routes: properly handle custom domains, add /events/:id alias 2021-03-02 21:50:59 -08:00
Michael Ball
413e4f94bf Merge branch 'master' of https://git.heroku.com/snapcon into temp 
* 'master' of https://git.heroku.com/snapcon:
  Update sentry logging
 2021-02-24 21:26:38 -08:00
Michael Ball
5c902e7e36 Delint from a local pronto run 2021-02-24 20:53:28 -08:00
CactusPuppy
d63a22c54e
Fix Rubocop issues 2021-02-24 19:22:21 -08:00
CactusPuppy
a4a6306198
Add back user/password loading 2021-02-24 19:10:31 -08:00
CactusPuppy
ebc2bd20ef
Add ability to use local environment variables via config/local_env.yml 2021-02-24 19:10:17 -08:00
Michael Ball
2b2745ade9 run rubocp --fix 2021-02-24 09:47:56 -08:00
Michael Ball
13aa7db90d use TODO-SNAPCON for the comment tag since rubocop is not flexible enough 2021-02-24 03:32:19 -08:00
Michael Ball
e0fd14e0ce Cleanup omniauth specs 2021-02-23 19:49:34 -08:00
Michael Ball
36f7107874 Update sentry logging 2021-02-21 01:14:24 -08:00