Jimmy
|
e08a465889
|
Merge branch 'master' into 177717903-move-constants-to-configuration-file
|
2021-04-13 12:06:59 +08:00 |
|
kingdish
|
e340758e6e
|
Merge pull request #66 from CactusPuppy/177736599-program#any_event_for_this_date
Fix program#any_event_for_this_date
|
2021-04-13 12:05:14 +08:00 |
|
Jimmy
|
7284f6f50d
|
[fix]Fix empty string check
|
2021-04-13 11:47:13 +08:00 |
|
Jimmy
|
b3b5e890ee
|
[fix]Fix program#any_event_for_this_date?
|
2021-04-13 11:41:13 +08:00 |
|
Jimmy
|
4fcc610b24
|
[feat]Config read from environment variables
|
2021-04-13 11:03:37 +08:00 |
|
CactusPuppy
|
db8cb3ea1a
|
Merge pull request #43 from CactusPuppy/176895554/mailbluster
Integrate Snapcon with Mailbluster
|
2021-04-12 15:46:25 -07:00 |
|
CactusPuppy
|
d6fe38bb2c
|
Merge branch 'master' into 176895554/mailbluster
|
2021-04-12 15:27:20 -07:00 |
|
Michael Ball
|
c64031e9b5
|
try pinning github to 2.6.6
|
2021-04-12 02:54:30 -07:00 |
|
Michael Ball
|
14b16b58eb
|
tweak continue-on-error: true
|
2021-04-11 23:46:25 -07:00 |
|
Jimmy
|
b7fbba162b
|
[refactor]Move constants to configuration file
|
2021-04-12 14:01:49 +08:00 |
|
kingdish
|
41a0193ad3
|
Merge pull request #45 from CactusPuppy/177261601-embed-happening-now-events-in-conference-splashpage
Embed happening now events in conference splashpage
|
2021-04-12 13:38:29 +08:00 |
|
CactusPuppy
|
272b5d20ce
|
Add newline at end of show.js.erb file
|
2021-04-11 13:46:56 -07:00 |
|
Michael Ball
|
878e0669a2
|
try continue on error: true
|
2021-04-10 18:22:06 -07:00 |
|
Michael Ball
|
8c91167687
|
rerun CI??
|
2021-04-10 15:47:18 -07:00 |
|
CactusPuppy
|
d6da99cc1f
|
Fix Rubocop complaints
|
2021-04-09 11:54:11 -07:00 |
|
CactusPuppy
|
34ac979109
|
Fix spec that was not updated with update to delete_lead
|
2021-04-09 11:53:54 -07:00 |
|
CactusPuppy
|
cacb265829
|
Get destroy job working properly and prevent misfires on updated users
|
2021-04-09 10:55:46 -07:00 |
|
Jimmy
|
346f324bef
|
[feat]Display happening now only if program is also displayed
|
2021-04-10 00:44:42 +08:00 |
|
Jimmy
|
6c96328f46
|
[feat]Add brief version of event partial; fix style
|
2021-04-09 22:17:33 +08:00 |
|
Jimmy
|
02300ee8f2
|
[feat]Description / happening now takes the entire row if the other is empty
|
2021-04-09 22:01:57 +08:00 |
|
Jimmy
|
3c7cc6cfdb
|
[feat]Use Ajax for paginating happening_now
|
2021-04-09 17:16:16 +08:00 |
|
Jimmy
|
9601328df8
|
[style]Fix style
|
2021-04-09 16:51:04 +08:00 |
|
Jimmy
|
5f776f9275
|
[refactor]Delete unused javascript; Move about-and-happening-now to partial
|
2021-04-09 16:41:16 +08:00 |
|
Jimmy
|
185b2773d7
|
[feat]Add bootstrap style to pagination navbar
|
2021-04-09 16:33:39 +08:00 |
|
CactusPuppy
|
757d16919d
|
Fix rubocop error with missing space after comma
|
2021-04-09 00:45:03 -07:00 |
|
CactusPuppy
|
3d9b6400b9
|
Fully address AR callback issues
|
2021-04-09 00:42:14 -07:00 |
|
CactusPuppy
|
29804c8681
|
Remove name conflict change which caused PaperTrail to fail
|
2021-04-07 22:48:57 -07:00 |
|
Jimmy
|
bb44f10120
|
[fix]Fix style; Re-enable checking happening now
|
2021-04-08 12:52:27 +08:00 |
|
madhekare
|
228ec4a650
|
items per page
|
2021-04-07 21:26:31 -07:00 |
|
madhekare
|
c9c31d6db5
|
pagination
|
2021-04-07 21:07:24 -07:00 |
|
madhekare
|
77b6dac6a2
|
pagination happening now
|
2021-04-07 20:56:03 -07:00 |
|
CactusPuppy
|
ce90dc5fc2
|
Add spec for query_api method
|
2021-04-07 14:50:34 -07:00 |
|
CactusPuppy
|
d780c2a6b3
|
Make body argument for query_api more clear
|
2021-04-07 14:50:33 -07:00 |
|
CactusPuppy
|
9361f0bfd5
|
Remove redundant comments
|
2021-04-07 14:50:33 -07:00 |
|
CactusPuppy
|
11785c665e
|
Actually properly track saved changes within the User model
|
2021-04-07 14:50:32 -07:00 |
|
CactusPuppy
|
dd2b229761
|
Rubocop linting issues fixed
|
2021-04-07 14:50:32 -07:00 |
|
Ziyi
|
2e3cdad0bc
|
Try fixing query_api 0 argument error
|
2021-04-07 14:50:32 -07:00 |
|
Ziyi
|
4afb92596d
|
self.query_api
|
2021-04-07 14:50:31 -07:00 |
|
Ziyi
|
ea681c030c
|
DRY query_api in mailbluster_manager
|
2021-04-07 14:50:31 -07:00 |
|
CactusPuppy
|
dcec2a6e01
|
Avoid repeating headers
|
2021-04-07 14:50:31 -07:00 |
|
CactusPuppy
|
b0104cac09
|
Actually remove redundant code from helpers
|
2021-04-07 14:50:30 -07:00 |
|
Ziyi
|
8c184d4f30
|
Edit lead when user changes name
|
2021-04-07 14:50:30 -07:00 |
|
CactusPuppy
|
d6341ff932
|
Prepare to add Mailbluster update name
|
2021-04-07 14:50:30 -07:00 |
|
CactusPuppy
|
66c2728998
|
Fix Rubocop linting issues
|
2021-04-07 14:50:29 -07:00 |
|
CactusPuppy
|
a49f5c7f72
|
Properly fire update_email hook after commit which changes user email
|
2021-04-07 14:50:29 -07:00 |
|
CactusPuppy
|
f0582c25bf
|
Move Mailbluster business logic to services/ instead of helpers/
|
2021-04-07 14:50:28 -07:00 |
|
CactusPuppy
|
1c1d09fefc
|
Fix Rubocop linting issues
|
2021-04-07 14:50:28 -07:00 |
|
CactusPuppy
|
02db4211ae
|
Properly rename job file
|
2021-04-07 14:50:28 -07:00 |
|
CactusPuppy
|
b980c88085
|
Fix typo in Mailbluster delete lead job
|
2021-04-07 14:50:27 -07:00 |
|
Ziyi
|
43911c4a38
|
Finished spec, added FIXME for caveat in email change
|
2021-04-07 14:50:27 -07:00 |
|