CactusPuppy
1c23033f1d
Move JS out of view and have calendar start on same day as horizontal schedule
2021-04-28 23:53:55 -07:00
CactusPuppy
2695aebc07
Remove Vertical Schedule tab
2021-04-28 23:21:53 -07:00
Michael Ball
d01dc9550b
Show ticket IDs on the admin ticket page
2021-04-28 10:20:03 -07:00
Jimmy
df729b7dde
[feat]Fullcalendar integration done
2021-04-26 17:33:31 +08:00
Jimmy
49cf115844
Fullcalendar integration in progress
2021-04-26 11:07:20 +08:00
Jimmy
4f2abd7e25
[feat]Add vertical schedule tab in Schedule
2021-04-26 10:41:54 +08:00
rajavi-mishra
4b2a2c5d5c
sign-in check added
2021-04-24 23:13:12 -07:00
rajavi-mishra
6ebfdefbbd
fixed the title
2021-04-24 22:19:36 -07:00
Michael Ball
7ee69bc172
Remove h2 from conference about sections
2021-04-23 13:12:36 -07:00
rajavi-mishra
6fa21fcba5
testing
2021-04-21 21:40:08 -07:00
rajavi-mishra
690ea5b2a9
[style] changes to styling and wording
2021-04-21 10:47:49 -07: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
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
Jimmy
2280d1f7b6
[fix]Change wording when no events is happening now or next
2021-04-20 13:21:19 +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
f6c7a50bba
Add {committee_review} to emails and support HTML
2021-04-16 01:08:28 -07:00
Michael Ball
9786843eac
Display Committee Review on #show and #edit.
...
Also show submission_text on the #show page for authors.
2021-04-16 00:33:47 -07:00
Michael Ball
0e74c2e296
Minor tidying up
2021-04-15 22:31:46 -07:00
Michael Ball
6ce36c0fca
Merge branch 'master' into submission-reviewer-comments
...
* master: (246 commits)
merge master
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
Run database migrations on release
[fix]Add mailbot.css to assets.rb
[fix]Fix empty string check
[fix]Fix program#any_event_for_this_date?
Add newline at end of show.js.erb file
[feat]Display happening now only if program is also displayed
[feat]Add brief version of event partial; fix style
[feat]Description / happening now takes the entire row if the other is empty
[feat]Use Ajax for paginating happening_now
[style]Fix style
[refactor]Delete unused javascript; Move about-and-happening-now to partial
[feat]Add bootstrap style to pagination navbar
[fix]Fix style; Re-enable checking happening now
items per page
pagination
...
2021-04-15 22:22:52 -07:00
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
