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 |
|
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 |
|
Jimmy
|
27f83ddd18
|
Merge branch 'master' into 177261601-embed-happening-now-events-in-conference-splashpage
|
2021-04-08 04:04:12 +08:00 |
|
kingdish
|
fd3d7f565f
|
Merge pull request #46 from CactusPuppy/fix-ci-4-7-21
Fix CI. Skip datatable tests.
|
2021-04-07 12:55:07 -07:00 |
|
Jimmy
|
2e7bcf255c
|
[style]Fix style in user_datatable_spec
|
2021-04-08 03:40:27 +08:00 |
|
Jimmy
|
acb48e9230
|
[fix]Revert github workflow; Change datatable tests to pending
|
2021-04-08 03:30:32 +08:00 |
|
Jimmy
|
065466e6d1
|
fix syntax
|
2021-04-08 00:52:02 +08:00 |
|
Jimmy
|
a397a03721
|
try again
|
2021-04-08 00:49:13 +08:00 |
|
Jimmy
|
1dd43fa323
|
try ignoring datatables
|
2021-04-08 00:31:13 +08:00 |
|
Jimmy
|
dd9d2e1b93
|
try running rspec instead of rake
|
2021-04-08 00:24:36 +08:00 |
|
Jimmy
|
103dccc59e
|
ignore user datatable
|
2021-04-08 00:05:07 +08:00 |
|
Jimmy
|
2d9622ed22
|
[style]Fix order of gem
|
2021-04-07 23:26:05 +08:00 |
|
Jimmy
|
680979f1d1
|
[fix]Fix ruby version and update mimemagic
|
2021-04-07 23:22:40 +08:00 |
|
Jimmy
|
db8e292490
|
temp
|
2021-04-07 23:18:51 +08:00 |
|
Jimmy
|
8b6d70b73c
|
[fix]Fix trapezoid on splashpage
|
2021-04-07 22:50:27 +08:00 |
|
Jimmy
|
04455bbbdf
|
[feat]Add md lg view for happening_now column
|
2021-04-07 18:55:34 +08:00 |
|
Jimmy
|
7d51ff9eb4
|
[feat]Display description and happening now in two columns; display happening now first in sm view
|
2021-04-07 17:55:20 +08:00 |
|
Jimmy
|
9e2c78e236
|
[style]Fix style
|
2021-04-07 11:13:41 +08:00 |
|
Jimmy
|
4abcc57d7b
|
[feat]Add a title for happening now section in splashpage
|
2021-04-07 11:06:48 +08:00 |
|
Jimmy
|
8d71fa85cd
|
[feat]Center happening now events on the splashpage
|
2021-04-07 11:00:03 +08:00 |
|
Jimmy
|
eda0c1a175
|
[feat] Display happening now events in splashpage
|
2021-04-07 10:34:49 +08:00 |
|
Jimmy
|
85cfb0cbef
|
[style] Fix name of method
|
2021-04-06 13:27:05 +08:00 |
|
Jimmy
|
d6cfecc960
|
[feat]Move happening_now to ConferenceHelper
|
2021-04-06 13:16:59 +08:00 |
|
Jimmy
|
e2d775e398
|
[temp] Add no events happening now in splashpage
|
2021-04-05 20:45:40 +08:00 |
|
Jimmy
|
9bfe64c28f
|
[temp]Ajax request of happening now JSON in progress
|
2021-04-05 15:07:18 +08:00 |
|
Jimmy
|
093241fd0a
|
[temp] Add happening_now placeholder in splashpage
|
2021-04-01 13:30:44 +08:00 |
|
Jimmy
|
65119149ea
|
[feat]Add include_happening_now checkbox to the admin splashpage
|
2021-04-01 13:14:31 +08:00 |
|
Jimmy
|
4aab0539b5
|
[feat] Add include_happening_now field to splashpages table
|
2021-04-01 13:08:09 +08:00 |
|
kingdish
|
1977b5be49
|
Merge pull request #36 from CactusPuppy/176895124-happening-now-json-api-endpoint
Happening now json api endpoint
|
2021-03-31 12:21:30 -07:00 |
|
Jimmy
|
c3167a3503
|
[feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests
|
2021-03-31 17:35:25 +08:00 |
|
Jimmy
|
7b3d97fdbb
|
[refactor] Change to_json to as_json
|
2021-03-31 16:08:44 +08:00 |
|
Jimmy
|
010f72d42f
|
[fix] Fix event_schedule#happening_now?
|
2021-03-31 08:34:04 +08:00 |
|
Jimmy
|
455faed638
|
[fix] Remove unmerged code
|
2021-03-31 07:52:55 +08:00 |
|
Jimmy
|
e2f5b5e933
|
Merge master
|
2021-03-31 07:49:30 +08:00 |
|
Jimmy
|
0ede07dfaa
|
[fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now?
|
2021-03-31 07:45:26 +08:00 |
|
CactusPuppy
|
b194ad8ad6
|
Merge pull request #39 from snap-cloud/master
Pull golden repo changes
|
2021-03-26 16:43:39 -07:00 |
|
Michael Ball
|
048881fa48
|
Merge branch 'master' of github.com:snap-cloud/snapcon
* 'master' of github.com:snap-cloud/snapcon:
Update icalendar to version 2.7.1
Update byebug to version 11.1.3
|
2021-03-24 13:55:32 -07:00 |
|
Michael Ball
|
617a4ad172
|
Control some lints
|
2021-03-24 13:54:20 -07:00 |
|
Michael Ball
|
cedf995fd0
|
Merge pull request #116 from snap-cloud/depfu/update/byebug-11.1.3
Update byebug: 11.0.1 → 11.1.3 (minor)
|
2021-03-24 04:21:08 -07:00 |
|
Michael Ball
|
fcac944c31
|
Merge pull request #121 from snap-cloud/depfu/update/icalendar-2.7.1
Update icalendar: 2.7.0 → 2.7.1 (patch)
|
2021-03-24 04:20:36 -07:00 |
|
Michael Ball
|
676d16ef27
|
Merge pull request #124 from snap-cloud/michael/fixes
Snap!Con Updates
|
2021-03-24 03:12:36 -07:00 |
|
Michael Ball
|
7106e1fc21
|
more delinting
|
2021-03-24 03:05:08 -07:00 |
|
Michael Ball
|
2dc6da87e5
|
Fix indentation on admin show page
|
2021-03-24 03:02:43 -07:00 |
|
Michael Ball
|
81b963ddc8
|
Delint some more
|
2021-03-24 02:50:44 -07:00 |
|