rajavi-mishra
|
c9721aa4f9
|
changes to the feature
|
2021-04-30 01:04:05 -07:00 |
|
rajavi-mishra
|
981c798e60
|
[feat] show alert when user has 0 ticket purchases
|
2021-04-30 00:23:47 -07:00 |
|
Rajavi Mishra
|
b323018d43
|
Merge pull request #74 from CactusPuppy/176894823-Cleanup-Page-Title-on-Conference-Materials-Page
176894823 cleanup page title on conference materials page
|
2021-04-29 13:30:42 -07:00 |
|
rajavi-mishra
|
6ebfdefbbd
|
fixed the title
|
2021-04-24 22:19:36 -07:00 |
|
rajavi-mishra
|
6fa21fcba5
|
testing
|
2021-04-21 21:40:08 -07:00 |
|
rajavi-mishra
|
e73903b84f
|
commit merged
|
2021-04-21 10:53:52 -07:00 |
|
rajavi-mishra
|
690ea5b2a9
|
[style] changes to styling and wording
|
2021-04-21 10:47:49 -07:00 |
|
Jimmy
|
bafeca7ab9
|
[fix]Remove duplicate code
|
2021-04-22 01:24:14 +08:00 |
|
Jimmy
|
83e4601ddb
|
[fix]Add nil check for happening_now partial
|
2021-04-22 01:13:56 +08:00 |
|
Jimmy
|
74437ab1e5
|
[fix]Remove unnecessary check in happening_now partial
|
2021-04-22 00:59:38 +08:00 |
|
Jimmy
|
83e7321b69
|
[style]Fix rubocop
|
2021-04-22 00:43:27 +08:00 |
|
Jimmy
|
c4920ba85d
|
[fix]Fix ajax for pagination
|
2021-04-22 00:40:53 +08:00 |
|
rajavi-mishra
|
d564de7caa
|
show happening now and happening next on the events page
|
2021-04-21 09:01:12 -07:00 |
|
kingdish
|
014613248e
|
Merge pull request #70 from CactusPuppy/177555226-happening-next
Happening next events
|
2021-04-21 08:24:49 +08:00 |
|
Jimmy
|
2280d1f7b6
|
[fix]Change wording when no events is happening now or next
|
2021-04-20 13:21:19 +08:00 |
|
Jimmy
|
24d2fa89a8
|
[style]Remove unused code
|
2021-04-19 19:23:41 +08:00 |
|
Jimmy
|
47f183fc89
|
[style]Fix duplicate code in conference_helper
|
2021-04-19 19:01:31 +08:00 |
|
Jimmy
|
4e68989955
|
[test]Add integration tests for the happening now section on the splashpage
|
2021-04-19 14:24:54 +08:00 |
|
Jimmy
|
ab15a3fb10
|
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later?
|
2021-04-17 08:30:07 +08:00 |
|
Jimmy
|
59c5d432ed
|
[style]Remove extra white space
|
2021-04-17 00:22:17 +08:00 |
|
Jimmy
|
2f8cee3c4f
|
[feat]Splashpage will display happening next event if no event is happening now
|
2021-04-17 00:00:52 +08:00 |
|
Michael Ball
|
eaf13b1b69
|
Merge branch 'master' into master
|
2021-04-15 20:29:54 -07:00 |
|
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
|
d6fe38bb2c
|
Merge branch 'master' into 176895554/mailbluster
|
2021-04-12 15:27:20 -07:00 |
|
Jimmy
|
b7fbba162b
|
[refactor]Move constants to configuration file
|
2021-04-12 14:01:49 +08:00 |
|
CactusPuppy
|
272b5d20ce
|
Add newline at end of show.js.erb file
|
2021-04-11 13:46:56 -07:00 |
|
CactusPuppy
|
d6da99cc1f
|
Fix Rubocop complaints
|
2021-04-09 11:54:11 -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
|
d780c2a6b3
|
Make body argument for query_api more clear
|
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 |
|