Commit graph

2169 commits

Author SHA1 Message Date
rajavi-mishra
b72dfdabf8 conditions completed 2021-03-04 11:55:45 -08:00
Jimmy
7e37b52e20 temp 2021-03-04 11:37:16 -08:00
Jimmy
c1fe73df03 temp 2021-03-04 11:33:27 -08:00
rajavi-mishra
8c230352f9 added more conditions 2021-03-03 13:58:36 -08:00
Jimmy
48a689d452 temp 2021-03-03 13:29:54 -08:00
rajavi-mishra
3f7f5b6bf4 change to conditions 2021-03-03 13:06:38 -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
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
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
Michael Ball
2417bad4db No 24-hour clocks. This should be a user setting... 2020-07-31 12:26:45 -07:00
Michael Ball
01612a73cf Tighten up happening now 2020-07-31 12:24:25 -07:00
Michael Ball
7549d2793c Fix timezone relative link on happening_now 2020-07-31 11:25:52 -07:00
Michael Ball
0b0518d67d A better happening now, with admin debug on. LOL 2020-07-31 10:58:37 -07:00
Michael Ball
61f5c9e0ee More consistent happening now formatting 2020-07-31 10:26:23 -07:00
Michael Ball
9d9fd38a2b Happening now is broken 2020-07-31 10:17:36 -07:00
Michael Ball
839634e569 Happening now is broken 2020-07-31 10:16:21 -07:00
Michael Ball
0c15d6091a minor styling tweaks 2020-07-31 08:52:43 -07:00