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 |
|
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 |
|
Michael Ball
|
617a4ad172
|
Control some lints
|
2021-03-24 13:54:20 -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 |
|
Michael Ball
|
de607fc262
|
Cleanup conferences show page
|
2021-03-24 02:37:07 -07:00 |
|
Michael Ball
|
05a04427c2
|
delint
|
2021-03-24 02:33:50 -07:00 |
|
Michael Ball
|
e810fd442f
|
Cleanup the submission form, fix reset button
|
2021-03-23 23:06:34 -07:00 |
|
Michael Ball
|
df0aa087fb
|
Fix remember me checkbox.
|
2021-03-23 22:53:30 -07:00 |
|
Michael Ball
|
ed20ff3b51
|
Refactor the new/edit submission forms
|
2021-03-23 22:43:11 -07:00 |
|
Michael Ball
|
c55eff4eec
|
Improve the new proposal flow
|
2021-03-23 18:28:34 -07:00 |
|
Michael Ball
|
df5a767494
|
Improve the look of the conf dashboard
|
2021-03-23 17:37:04 -07:00 |
|
Michael Ball
|
1806a04b69
|
Conf Admin: Allow for stats to reflow on small screens
|
2021-03-23 16:30:13 -07:00 |
|
Michael Ball
|
20a80c2c31
|
tidy up the conference edit page
|
2021-03-23 16:26:09 -07:00 |
|
Michael Ball
|
f5e099501c
|
Minor updates to the conf edit page
|
2021-03-23 13:00:22 -07:00 |
|
Michael Ball
|
6e3e1199ef
|
Restore and cleanup the admin conf todo list
|
2021-03-23 12:54:07 -07:00 |
|
Michael Ball
|
586c6dff29
|
Cleanup todo.haml
|
2021-03-23 02:50:39 -07:00 |
|
Michael Ball
|
1658046a19
|
Do not show diffculty level in the progress checker
|
2021-03-23 02:47:18 -07:00 |
|
Michael Ball
|
e542bda8ef
|
tweak emails
|
2021-03-23 02:21:31 -07:00 |
|
Michael Ball
|
048207cd38
|
Some re-delinting
|
2021-03-22 03:18:47 -07:00 |
|
Michael Ball
|
75b60c2578
|
Use 'Description' on the submissions page. Fill template from submission_instructions
|
2021-03-22 02:59:35 -07:00 |
|
Michael Ball
|
f22ad296af
|
resolve conflicts with master
|
2021-03-21 12:59:43 -07:00 |
|
Jimmy
|
bfc39fdbe4
|
[feat] happening_now json endpoint returns event embedded in event_schedule
|
2021-03-20 13:34:14 +08:00 |
|
Jimmy
|
1ab580e7e6
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint
|
2021-03-19 17:23:47 +08:00 |
|
Jimmy
|
3019a022c7
|
[fix] Fix style; Fix start_hour and end_hour in test
|
2021-03-19 17:22:08 +08:00 |
|
Jimmy
|
1c54d38094
|
[fix] Fix time displayed in happening_now.haml; Make event_schedule#happening_now? more efficient
|
2021-03-19 17:13:34 +08:00 |
|
CactusPuppy
|
652381a0b8
|
Update annotate_models comments
|
2021-03-18 20:36:39 -07:00 |
|
Jimmy
|
cab293e947
|
[fix] Fix event_schedule# happening_now?; Add tests for happening_now JSON endpoint
|
2021-03-18 18:53:55 +08:00 |
|
Jimmy
|
d6e161b7e5
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895124-happening-now-json-api-endpoint
|
2021-03-18 08:41:41 +08:00 |
|
Jimmy
|
362853f4df
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates
|
2021-03-18 08:40:49 +08:00 |
|
Jimmy
|
871457f65b
|
[feat] Use existing #happening_now method; respond to both html and json requests
|
2021-03-17 21:02:35 +08:00 |
|
Jimmy
|
034313cccb
|
[fix] live_events return json; use the provided happening_now? function
|
2021-03-17 07:34:51 +08:00 |
|
Jimmy
|
4e1e9bdfbd
|
[fix] Fix function name
|
2021-03-16 22:16:21 +08:00 |
|
Jimmy
|
8e95325119
|
[feat] Endpoint implementation done
|
2021-03-16 22:13:55 +08:00 |
|
Jimmy
|
7475a40775
|
implementation in progress
|
2021-03-12 10:38:47 -08:00 |
|
rajavi-mishra
|
51f9ba0206
|
happening now - model implementation
|
2021-03-12 09:51:24 -08:00 |
|
Jimmy
|
fdb08b0c9a
|
[refactor] Move Mailbot#logo_url and #conference_color to ConferenceHelper
|
2021-03-12 00:14:29 -08:00 |
|