Michael Ball
|
c18531ca21
|
Merge branch 'master' into master
|
2021-03-02 21:59:34 -08:00 |
|
Michael Ball
|
06b05b8177
|
Fixup the last trapeziod on social media section
|
2021-03-02 18:55:41 -08:00 |
|
CactusPuppy
|
207046dc65
|
Merge pull request #11 from CactusPuppy/176894810/add_summision_text
Add submission text to event proposals
|
2021-03-01 23:38:06 -08:00 |
|
lzy-1006
|
9ee29f6daa
|
Merge pull request #12 from CactusPuppy/176895037-add-link-to-view-event-from-admin-page
Add link to view event from admin page
|
2021-03-01 21:45:32 -08:00 |
|
CactusPuppy
|
626eaee761
|
Remove unnecessary self
|
2021-02-27 23:03:29 -08:00 |
|
CactusPuppy
|
16f5ed6138
|
Refactor calculation of submission limit and abstract limit into helper function
|
2021-02-27 22:54:35 -08:00 |
|
CactusPuppy
|
b94894fe87
|
Update annotate_models
|
2021-02-26 11:04:20 -08:00 |
|
CactusPuppy
|
42d43319c5
|
fix indentation error
|
2021-02-25 20:12:20 -08:00 |
|
CactusPuppy
|
d46e1e7397
|
Add JavaScript to make placeholder text update along with word count
|
2021-02-24 23:41:19 -08:00 |
|
madhekare
|
b8f531783b
|
submission text control/model modifications
|
2021-02-24 23:41:18 -08:00 |
|
madhekare
|
baf488ad8a
|
sumbission text views
|
2021-02-24 23:41:18 -08:00 |
|
Jimmy
|
4ee70899f5
|
[fix] Fix style
|
2021-02-24 22:17:47 -08:00 |
|
Jimmy
|
e44714b06b
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email
|
2021-02-24 22:08:12 -08:00 |
|
Jimmy
|
92d052970a
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page
|
2021-02-24 22:07:38 -08:00 |
|
Michael Ball
|
5c902e7e36
|
Delint from a local pronto run
|
2021-02-24 20:53:28 -08:00 |
|
CactusPuppy
|
21e282679f
|
Fix Rubocop issues
|
2021-02-24 20:24:03 -08:00 |
|
Michael Ball
|
005aebd936
|
Minor app helper tests
|
2021-02-24 20:07:12 -08:00 |
|
Jimmy
|
a0532b5d9f
|
[feat] Add a button in admin event view that links to user event view
|
2021-02-24 12:17:05 -08:00 |
|
Michael Ball
|
2b2745ade9
|
run rubocp --fix
|
2021-02-24 09:47:56 -08:00 |
|
Jimmy
|
17b1617df9
|
Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email
|
2021-02-23 23:04:33 -08:00 |
|
Jimmy
|
e127007c67
|
[feat] Add design elements to all provided templates
|
2021-02-23 23:03:33 -08:00 |
|
Michael Ball
|
dbc0b80aa4
|
Consistently use "Submit Proposal" wording
|
2021-02-23 22:19:26 -08:00 |
|
Michael Ball
|
8745825436
|
Fixup the commericals dispaly, correct some labels
|
2021-02-23 20:20:28 -08:00 |
|
Michael Ball
|
e0fd14e0ce
|
Cleanup omniauth specs
|
2021-02-23 19:49:34 -08:00 |
|
Michael Ball
|
2573dbee44
|
fix the alt text in the conference logo
|
2021-02-23 18:47:27 -08:00 |
|
Michael Ball
|
2dc3950cb0
|
Fix commericals feature specs (UI consistency).
|
2021-02-23 18:43:18 -08:00 |
|
Michael Ball
|
d4a2861051
|
Improve Registration Flow Some:
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
|
2021-02-23 18:17:45 -08:00 |
|
Jimmy
|
e7eca161c7
|
[fix] Email will not error out when logo is nil
|
2021-02-23 16:02:49 -08:00 |
|
Michael Ball
|
d7e24f6521
|
Run annotate_models
|
2021-02-20 09:57:27 -08:00 |
|
Jimmy
|
55f56495f4
|
[feat] Allow embedding user-defined logo and user-defined text in email template
|
2021-02-19 17:01:24 +08:00 |
|
Michael Ball
|
20ea622bd3
|
display all speakers in an event when highlighted
|
2020-12-10 23:27:16 -08:00 |
|
Michael Ball
|
4c97dacf5c
|
fix dynamic class name
|
2020-12-10 02:26:48 -08:00 |
|
Michael Ball
|
6522f46991
|
wider columns on the admin schedule page.
|
2020-12-10 02:14:36 -08:00 |
|
Michael Ball
|
0efc8c3b4a
|
import Google Calendar content
|
2020-12-09 02:59:11 -08:00 |
|
Michael Ball
|
4f27073f13
|
typo
|
2020-12-09 02:49:04 -08:00 |
|
Michael Ball
|
ab3c8ff4ca
|
tidy up event#show page, google calendar link
|
2020-12-09 02:46:16 -08:00 |
|
Michael Ball
|
acfc3e7aff
|
Use event type not track for schedule coloring.
Useful for Snapshot.
|
2020-12-09 02:23:24 -08:00 |
|
Michael Ball
|
f85a11f5d5
|
Merge branch 'master' of https://git.heroku.com/snapcon
* 'master' of https://git.heroku.com/snapcon:
snapshot logo
snapshot logo
|
2020-12-04 01:17:59 -08:00 |
|
Michael Ball
|
2892a56a1c
|
merge master
|
2020-12-04 01:17:39 -08:00 |
|
Michael Ball
|
ec352604b8
|
Use += instead of << with frozen string
|
2020-12-04 01:12:26 -08:00 |
|
Hiroshi SHIBATA
|
ae98ac1430
|
Fixed some typos (#2695)
* Fix typos
|
2020-10-30 11:06:43 +02:00 |
|
Michael Ball
|
7f827c844a
|
snapshot logo
|
2020-10-28 02:28:36 -07:00 |
|
Michael Ball
|
92efee7916
|
snapshot logo
|
2020-10-28 01:39:58 -07:00 |
|
Thomas Schmidt
|
588884bace
|
update jquery-ui-rails
|
2020-09-29 00:41:18 +02:00 |
|
Michael Ball
|
8af245a3a3
|
Try to fix nav link
|
2020-09-03 10:03:42 -07:00 |
|
Michael Ball
|
40d2a863d5
|
Some tidying of the conference page
|
2020-08-02 19:46:20 -07:00 |
|
Michael Ball
|
6186eee1d5
|
fix versions?
|
2020-08-02 14:26:44 -07:00 |
|
Michael Ball
|
0cca2dc619
|
handle nil case
|
2020-08-02 13:58:19 -07:00 |
|
Michael Ball
|
18eb6ac3d3
|
Patch for nil event schedules
|
2020-08-01 08:08:56 -07:00 |
|
Michael Ball
|
29cea21c84
|
Google Calendaer Link
|
2020-07-31 15:09:19 -07:00 |
|