rajavi-mishra
312d3e3a23
show happening now and happening next on the events page
2021-05-01 18:02:16 -07:00
rajavi-mishra
fd96f3d937
rubocop fixes
2021-05-01 17:59:23 -07:00
rajavi-mishra
60b5e9a1c9
testing
2021-05-01 17:59:23 -07:00
rajavi-mishra
5121e0ba29
sign-in check added
2021-05-01 17:59:21 -07:00
CactusPuppy
2fa7ed5542
Remove unnecessary dependence on WebMock within factories.
2021-05-01 17:59:20 -07:00
Jimmy
a526938fa9
[style]Fix style
2021-05-01 17:59:19 -07:00
Jimmy
6f9a6e2275
[fix]Store current time to a variable to make sure timestamps are the same
2021-05-01 17:59:18 -07:00
Jimmy
ef119d0fb6
[fix]Change wording when no events is happening now or next
2021-05-01 17:59:18 -07:00
Jimmy
8a335e5e8d
[style]Remove unused code
2021-05-01 17:59:17 -07:00
Jimmy
55ffee531a
[style]Fix duplicate code in conference_helper
2021-05-01 17:59:16 -07:00
Jimmy
924d6d4e25
[fix]Remove print
2021-05-01 17:59:15 -07:00
Jimmy
6461d94dd0
[fix]Use full_splashpage instead of splashpage
2021-05-01 17:59:15 -07:00
Jimmy
e6afb99dd6
[temp]Print page.html
2021-05-01 17:59:14 -07:00
Jimmy
6d9b679cef
[test]Use scenario instead of it
2021-05-01 17:59:13 -07:00
Jimmy
35f216778b
[temp]Try feature:true
2021-05-01 17:59:12 -07:00
Jimmy
41312a4099
[fix]Fix splashpage spec
2021-05-01 17:59:11 -07:00
Jimmy
62fc8b27e4
[test]Add integration tests for the happening now section on the splashpage
2021-05-01 17:59:10 -07:00
Jimmy
648f3bacb5
[test]Add test for ConferenceHelper#get_happening_next_events_schedules
2021-05-01 17:59:09 -07:00
Jimmy
612af49ca0
[test]Add test for SchedulersController#happening_later?
2021-05-01 17:59:09 -07:00
Jimmy
47e580904d
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later?
2021-05-01 17:59:08 -07:00
Jimmy
5aea1efab1
[style]Remove extra white space
2021-05-01 17:59:07 -07:00
Jimmy
6e045061e7
[feat]Splashpage will display happening next event if no event is happening now
2021-05-01 17:59:06 -07:00
Jimmy
25bc05b20c
[fix]Fix rake data:test by including webmock
2021-05-01 17:58:57 -07:00
Michael Ball
62f2b64e1c
Resolve CVE in rexml
2021-04-30 09:55:53 -07:00
Michael Ball
04f7b088a0
Remove mimemagic pinned version. That was a fun time....
2021-04-30 09:39:27 -07:00
Michael Ball
3aa00d5afc
Merge pull request #145 from snap-cloud/ticket-purchase-ids
...
Show ticket IDs on the admin ticket page
2021-04-30 09:36:00 -07:00
Michael Ball
c20e1f6f37
boo, bad linters
2021-04-29 23:00:33 -07:00
Michael Ball
df118b9ae8
Address comment lints
2021-04-29 22:35:43 -07:00
Michael Ball
4cc2ead074
Hide the proposal task list since it is confusing to people
2021-04-29 21:17:05 -07:00
Michael Ball
016a2c4ef3
Improve the proposals task list slightly
2021-04-29 21:15:28 -07:00
Michael Ball
d01dc9550b
Show ticket IDs on the admin ticket page
2021-04-28 10:20:03 -07:00
Michael Ball
7ee69bc172
Remove h2 from conference about sections
2021-04-23 13:12:36 -07:00
Michael Ball
3fc157ebc1
Merge pull request #127 from snap-cloud/depfu/update/rolify-5.3.0
...
Update rolify: 5.2.0 → 5.3.0 (minor)
2021-04-17 17:50:52 -07:00
Michael Ball
0d8a06184b
Merge pull request #129 from snap-cloud/submission-reviewer-comments
...
Support Committee Review
2021-04-17 17:46:21 -07:00
Michael Ball
b099246f78
delinting...space....
2021-04-17 17:45:55 -07:00
Michael Ball
59f534a010
fix hash style
2021-04-17 17:33:59 -07:00
Michael Ball
f012201d3c
Merge branch 'master' of git://github.com/CactusPuppy/snapcon into submission-reviewer-comments
...
* 'master' of git://github.com/CactusPuppy/snapcon:
Attempt to use stable release of codacy reporter
2021-04-17 17:30:06 -07:00
Michael Ball
4c056f208e
Delinting
2021-04-17 17:29:58 -07:00
Michael Ball
5a3012f0b7
Add comiittee_review(_html) options to email spec
2021-04-17 17:08:16 -07: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
Michael Ball
a88402642c
What the heck! Add a short URL for conferences
2021-04-16 01:15:22 -07: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
c0a086862a
Skip datatable spec because github actions is weird.
2021-04-15 20:32:21 -07:00
