Michael Ball
927e8ec436
merge master
2021-04-16 01:23:39 -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
Stella Rouzi
3c2a0826c9
Merge pull request #2746 from differentreality/letter_opener_web
...
Letter opener web
2021-04-14 11:21:39 +03:00
Stella Rouzi
f97d4ca0f1
Add letter opener web
2021-04-14 10:46:45 +03: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
madhekare
80d94337a2
pagination
2021-04-13 11:45:10 -07:00
madhekare
847357dae7
pagination happening now
2021-04-13 11:45:07 -07:00
Jimmy
7f133928b6
[fix]Fix trapezoid on splashpage
2021-04-13 11:44:42 -07:00
Jimmy
011f7ecab5
[feat]Add md lg view for happening_now column
2021-04-13 11:44:42 -07:00
Jimmy
f320f3202a
[feat]Display description and happening now in two columns; display happening now first in sm view
2021-04-13 11:44:42 -07:00
Jimmy
26ddb198a1
[style]Fix style
2021-04-13 11:44:41 -07:00
Jimmy
9d890d637e
[feat]Add a title for happening now section in splashpage
2021-04-13 11:44:41 -07:00
Jimmy
71d926b4a0
[feat]Center happening now events on the splashpage
2021-04-13 11:44:41 -07:00
Jimmy
3b96d9e63e
[feat] Display happening now events in splashpage
2021-04-13 11:44:40 -07:00
Jimmy
a7a6255656
[style] Fix name of method
2021-04-13 11:44:40 -07:00
Jimmy
2ea27b21da
[feat]Move happening_now to ConferenceHelper
2021-04-13 11:44:40 -07:00
Jimmy
322a5b40bc
[temp] Add no events happening now in splashpage
2021-04-13 11:44:39 -07:00
Jimmy
f260139b2d
[temp]Ajax request of happening now JSON in progress
2021-04-13 11:44:39 -07:00
Jimmy
ca2e053fc4
[temp] Add happening_now placeholder in splashpage
2021-04-13 11:44:39 -07:00
Jimmy
6fd3c88f76
[feat]Add include_happening_now checkbox to the admin splashpage
2021-04-13 11:44:38 -07:00
Jimmy
fd8652d768
[feat] Add include_happening_now field to splashpages table
2021-04-13 11:44:38 -07:00
CactusPuppy
1e88ff6ad7
Fix Rubocop complaints
2021-04-13 11:44:38 -07:00
CactusPuppy
e65108e2fb
Fix spec that was not updated with update to delete_lead
2021-04-13 11:44:37 -07:00
CactusPuppy
aab281e116
Get destroy job working properly and prevent misfires on updated users
2021-04-13 11:44:37 -07:00
