Michael Ball
4dedfdfe90
Merge branch 'master' of github.com:snap-cloud/snapcon
...
* 'master' of github.com:snap-cloud/snapcon:
Skip datatable spec because github actions is weird.
Add devise view files for email messages
Make the _mailbot_* files not depend on @conference
Tweak devise text for confirm emails
2021-04-15 22:22:23 -07:00
Michael Ball
68004c842e
Merge pull request #138 from snap-cloud/confirmation-email-update
...
Improve the Account Confirmation Email
2021-04-15 22:18:23 -07:00
Michael Ball
d4ffda5d58
merge master
2021-04-15 21:56:18 -07:00
Michael Ball
c1ebe95565
Add devise view files for email messages
2021-04-15 20:11:56 -07:00
Michael Ball
9f83965c18
Make the _mailbot_* files not depend on @conference
2021-04-15 20:11:40 -07:00
Michael Ball
d4dba945fc
Tweak devise text for confirm emails
2021-04-15 19:10:21 -07:00
CactusPuppy
272b5d20ce
Add newline at end of show.js.erb file
2021-04-11 13:46:56 -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
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
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
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
Michael Ball
617a4ad172
Control some lints
2021-03-24 13:54:20 -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
362853f4df
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 177195121-improve-email-templates
2021-03-18 08:40:49 +08:00
