rajavi-mishra
|
4b2a2c5d5c
|
sign-in check added
|
2021-04-24 23:13:12 -07:00 |
|
CactusPuppy
|
abad615f65
|
Merge pull request #73 from CactusPuppy/fix-heroku
Fix Heroku deploys
|
2021-04-22 20:05:58 -07:00 |
|
CactusPuppy
|
ab6916e913
|
Remove unnecessary dependence on WebMock within factories.
|
2021-04-22 19:48:38 -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
|
ad5a6c264a
|
[style]Fix style
|
2021-04-20 13:52:44 +08:00 |
|
Jimmy
|
e4df68f2d8
|
[fix]Store current time to a variable to make sure timestamps are the same
|
2021-04-20 13:48:47 +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
|
5de9f97ea8
|
[fix]Remove print
|
2021-04-19 18:54:01 +08:00 |
|
Jimmy
|
54e051be90
|
[fix]Use full_splashpage instead of splashpage
|
2021-04-19 18:47:21 +08:00 |
|
Jimmy
|
9af06715e1
|
[temp]Print page.html
|
2021-04-19 18:37:04 +08:00 |
|
Jimmy
|
bb665c934f
|
[test]Use scenario instead of it
|
2021-04-19 18:35:26 +08:00 |
|
Jimmy
|
d3ed87211a
|
[temp]Try feature:true
|
2021-04-19 18:26:54 +08:00 |
|
Jimmy
|
c7490dfe77
|
[fix]Fix splashpage spec
|
2021-04-19 17:50:01 +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
|
1fd1d395d5
|
[test]Add test for ConferenceHelper#get_happening_next_events_schedules
|
2021-04-19 13:33:00 +08:00 |
|
Jimmy
|
b32f2416da
|
[test]Add test for SchedulersController#happening_later?
|
2021-04-19 13:23:49 +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 |
|
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 |
|
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 |
|
Jimmy
|
19af4e4f12
|
[fix]Fix rake data:test by including webmock
|
2021-04-16 23:08:44 +08: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 |
|
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 |
|