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

4629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
04f7b088a0 Remove mimemagic pinned version. That was a fun time.... 2021-04-30 09:39:27 -07:00
Michael Ball
3aa00d5afc
Merge pull request #145 from snap-cloud/ticket-purchase-ids 
Show ticket IDs on the admin ticket page
 2021-04-30 09:36:00 -07:00
Michael Ball
c20e1f6f37 boo, bad linters 2021-04-29 23:00:33 -07:00
Michael Ball
df118b9ae8 Address comment lints 2021-04-29 22:35:43 -07:00
Michael Ball
4cc2ead074 Hide the proposal task list since it is confusing to people 2021-04-29 21:17:05 -07:00
Michael Ball
016a2c4ef3 Improve the proposals task list slightly 2021-04-29 21:15:28 -07:00
Michael Ball
d01dc9550b Show ticket IDs on the admin ticket page 2021-04-28 10:20:03 -07:00
Michael Ball
7ee69bc172 Remove h2 from conference about sections 2021-04-23 13:12:36 -07:00
Michael Ball
3fc157ebc1
Merge pull request #127 from snap-cloud/depfu/update/rolify-5.3.0 
Update rolify: 5.2.0 → 5.3.0 (minor)
 2021-04-17 17:50:52 -07:00
Michael Ball
0d8a06184b
Merge pull request #129 from snap-cloud/submission-reviewer-comments 
Support Committee Review
 2021-04-17 17:46:21 -07:00
Michael Ball
b099246f78 delinting...space.... 2021-04-17 17:45:55 -07:00
Michael Ball
59f534a010 fix hash style 2021-04-17 17:33:59 -07:00
Michael Ball
f012201d3c Merge branch 'master' of git://github.com/CactusPuppy/snapcon into submission-reviewer-comments 
* 'master' of git://github.com/CactusPuppy/snapcon:
  Attempt to use stable release of codacy reporter
 2021-04-17 17:30:06 -07:00
Michael Ball
4c056f208e Delinting 2021-04-17 17:29:58 -07:00
Michael Ball
5a3012f0b7 Add comiittee_review(_html) options to email spec 2021-04-17 17:08:16 -07:00
CactusPuppy
e1c10d16b0
Merge pull request #71 from CactusPuppy/fix-github-actions 
Attempt to use stable release of codacy reporter
 2021-04-16 10:04:57 -07:00
CactusPuppy
9774779fbc
Attempt to use stable release of codacy reporter 2021-04-16 09:47:42 -07:00
Michael Ball
a88402642c What the heck! Add a short URL for conferences 2021-04-16 01:15:22 -07:00
Michael Ball
f6c7a50bba Add {committee_review} to emails and support HTML 2021-04-16 01:08:28 -07:00
Michael Ball
9786843eac Display Committee Review on #show and #edit. 
Also show submission_text on the #show page for authors.
 2021-04-16 00:33:47 -07:00
Michael Ball
0e74c2e296 Minor tidying up 2021-04-15 22:31:46 -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
4dedfdfe90 Merge branch 'master' of github.com:snap-cloud/snapcon 
* 'master' of github.com:snap-cloud/snapcon:
  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
 2021-04-15 22:22:23 -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
d4ffda5d58 merge master 2021-04-15 21:56:18 -07:00
Michael Ball
c0a086862a Skip datatable spec because github actions is weird. 2021-04-15 20:32:21 -07:00
Michael Ball
15e910a323
Merge pull request #137 from CactusPuppy/master 
Happening now endpoint + splash page / Mailbluster Integration
 2021-04-15 20:30:01 -07:00
Michael Ball
eaf13b1b69
Merge branch 'master' into master 2021-04-15 20:29:54 -07:00
Michael Ball
5fe94c99af
Merge pull request #133 from snap-cloud/rails-updates-enhanced-template 
Rails updates enhanced template
 2021-04-15 20:17:15 -07:00
Michael Ball
c1ebe95565 Add devise view files for email messages 2021-04-15 20:11:56 -07:00
Michael Ball
9f83965c18 Make the _mailbot_* files not depend on @conference 2021-04-15 20:11:40 -07:00
Michael Ball
d4dba945fc Tweak devise text for confirm emails 2021-04-15 19:10:21 -07:00
CactusPuppy
bf945c4b5a
Merge pull request #69 from CactusPuppy/migrate-on-deploy 
Run database migrations on Heroku deploy
 2021-04-13 16:30:08 -07:00
CactusPuppy
ad03f50200
Run database migrations on release 2021-04-13 15:45:51 -07:00
kingdish
e26181e1ec
Merge pull request #65 from CactusPuppy/177717903-move-constants-to-configuration-file 
Move constants to configuration file
 2021-04-14 06:36:23 +08:00
CactusPuppy
e2c30d22d7
Merge pull request #68 from CactusPuppy/pull-upstream 
Pull upstream changes into fork
 2021-04-13 12:03:32 -07:00
CactusPuppy
90d513ba0c
Merge branch 'master' into pull-upstream 2021-04-13 11:47:38 -07:00
Jimmy
0eb0ae9547
[fix]Add mailbot.css to assets.rb 2021-04-13 11:45:52 -07:00
Jimmy
8ff3958685
[fix]Fix empty string check 2021-04-13 11:45:52 -07:00
Jimmy
83ecd98997
[fix]Fix program#any_event_for_this_date? 2021-04-13 11:45:51 -07:00
CactusPuppy
4f68051b9e
Add newline at end of show.js.erb file 2021-04-13 11:45:51 -07:00
Jimmy
fec78dccce
[feat]Display happening now only if program is also displayed 2021-04-13 11:45:51 -07:00
Jimmy
497818cc45
[feat]Add brief version of event partial; fix style 2021-04-13 11:45:50 -07:00
Jimmy
7ae94589fa
[feat]Description / happening now takes the entire row if the other is empty 2021-04-13 11:45:50 -07:00
Jimmy
0c73d24f05
[feat]Use Ajax for paginating happening_now 2021-04-13 11:45:50 -07:00
Jimmy
46094306af
[style]Fix style 2021-04-13 11:45:49 -07:00
Jimmy
3ebcefded1
[refactor]Delete unused javascript; Move about-and-happening-now to partial 2021-04-13 11:45:49 -07:00
Jimmy
a649505104
[feat]Add bootstrap style to pagination navbar 2021-04-13 11:45:49 -07:00
Jimmy
385bc72973
[fix]Fix style; Re-enable checking happening now 2021-04-13 11:45:47 -07:00
madhekare
779ed123e7
items per page 2021-04-13 11:45:10 -07:00