Commit graph

3785 commits

Author SHA1 Message Date
Michael Ball
02f0d4a254 Fix navbar profile pics 2020-07-16 11:15:17 -07:00
Michael Ball
359f68e6df
Merge pull request #45 from snap-cloud/profile-pictures
Add Support for User-Uploaded Profile Pictures
2020-07-16 00:32:45 -07:00
Michael Ball
43c0d4a3f5 I think this fixes a bug in changing conference times 2020-07-16 00:32:32 -07:00
Michael Ball
d5a9b79f6e Show profile pictures to admins and allow them to upload pics 2020-07-15 23:37:40 -07:00
Michael Ball
10d58ef050 Support selecting various sizes of profile pics 2020-07-15 23:27:22 -07:00
Michael Ball
3883188dcd Support Users Directly Uploading Profile Pictures.
* Adds a `picture` attribute to `User`.
* Preserves Gravatar as a fallback option.
* Now, you should use `user.profile_picturer` instead of `gravatar_url`
* TODO: Ensure `profile_picture` handles sizing right for uploaded images.
2020-07-14 21:06:15 -07:00
Michael Ball
b66f69599a tweak method 2020-07-14 18:15:01 -07:00
Michael Ball
4c29d57aae Add a very basic custom_css property to a conference.
It is loaded on all pages for that conference.
2020-07-14 17:43:48 -07:00
Michael Ball
a1775674ce ugh datatables.... 2020-07-13 04:52:48 -07:00
Michael Ball
70e5cc8e96 maybe case matters here 2020-07-13 04:45:04 -07:00
Michael Ball
382e1719e9 Ugh assets. 2020-07-13 04:43:09 -07:00
Michael Ball
653a9f5cfb
Merge pull request #42 from snap-cloud/misc-fixes
A Bunch of Changes....
2020-07-13 04:25:35 -07:00
Michael Ball
61ca626df1 Improve the physical_tickets page 2020-07-13 04:21:31 -07:00
Michael Ball
0dffc20ad1 Add rake tasks to help manage registrations 2020-07-13 03:27:44 -07:00
Michael Ball
cd88882714 upgrade datatables gem 2020-07-13 02:58:15 -07:00
Michael Ball
18ee10eef5 tweak payment text 2020-07-13 00:48:45 -07:00
Michael Ball
fff156a453
Merge pull request #41 from snap-cloud/enforce-ticket-registrations
Enforce ticket registrations
2020-07-11 01:54:01 -07:00
Michael Ball
1964522f49 Add warnings when a user needs to register or complete a purchase 2020-07-11 01:50:17 -07:00
Michael Ball
5bef4b7004 Assert that a user has a paid ticket before registering for a conference. 2020-07-11 00:57:08 -07:00
Michael Ball
69b18a97e1 Merge branch 'master' of github.com:snap-cloud/snapcon
* 'master' of github.com:snap-cloud/snapcon:
  Fix registrations csv
  Tweak Materials to allow anything
  A bit of a hack to accept any webpage...
  Add the ability for Rooms to have a URL.
  Add import rake task
  config that works without docker
  Add some links to navbar
  More login info
  Custom login help info
  Run migration; add apple pay verification
  fix tickets bug with no description
2020-07-10 23:59:29 -07:00
Michael Ball
3b2f854e9b
Merge pull request #40 from snap-cloud/materials-schedule
Allow anything for materials, add URLs to Rooms
2020-07-10 23:57:54 -07:00
Michael Ball
9325c3938b All events first on the schedule page 2020-07-10 23:52:25 -07:00
Michael Ball
bf189af6e2 Fix registrations csv 2020-07-10 22:30:01 -07:00
Michael Ball
b553e0fed7 Tweak Materials to allow anything 2020-07-10 22:03:51 -07:00
Michael Ball
74b77e132d A bit of a hack to accept any webpage... 2020-07-10 21:22:10 -07:00
Michael Ball
7d2135f851 Add the ability for Rooms to have a URL.
The URL is shown on the schedule and the event/proposal page.
The URL is only when a user is logged in and registered.
2020-07-10 20:18:10 -07:00
Michael Ball
636ad2cebd Add import rake task 2020-07-10 18:29:57 -07:00
Michael Ball
77965b65f8 config that works without docker 2020-07-10 18:29:46 -07:00
Michael Ball
20f1afd4e6 Add some links to navbar 2020-07-10 18:29:20 -07:00
Michael Ball
2e24ae5d2c More login info 2020-07-08 20:51:50 -07:00
Michael Ball
b31e1a825d Custom login help info 2020-07-08 20:48:45 -07:00
Michael Ball
d5f0063de6 Run migration; add apple pay verification 2020-07-08 02:14:11 -07:00
Michael Ball
0e9d6b491b fix tickets bug with no description 2020-07-07 22:24:28 -07:00
Michael Ball
8d322f56ef WOW fix a bad bug!! 2020-07-06 00:58:59 -07:00
Michael Ball
59bf4f09dc Ugh, move constant 2020-07-01 02:04:27 -07:00
Michael Ball
d4c96dc722 young thinkers custom email 2020-07-01 01:27:15 -07:00
Michael Ball
cff6e55c9c Reduce data on conference dashboard b/c of timeouts 2020-06-30 01:38:43 -07:00
Michael Ball
0877aadb2e Merge some contributor fixes 2020-06-30 00:48:47 -07:00
Michael Ball
a56a0e7547 Merge master 2020-06-29 13:18:19 -07:00
Andrew Kvalheim
c2c074c3c5 Merge #​2673 "Serve precompiled assets in example Docker Compose configuration" 2020-06-26 20:19:41 -07:00
Andrew Kvalheim
3f1c8068ee Merge #​2667 "Work around bug in migrations to non-null columns" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
86713f992e Merge #​2666 "Fix migration that fails on conferences without pictures" 2020-06-26 20:19:40 -07:00
Andrew Kvalheim
e11f634377 Merge #​2665 "Annotate past migrations with Rails version" 2020-06-26 20:19:39 -07:00
Andrew Kvalheim
d7a5351b7c Merge #​2663 "Update Docker Compose file format: 2.0 → 2.4 (minor)" 2020-06-26 20:19:38 -07:00
Andrew Kvalheim
0618f93660 Merge #​2662 "Fix bug in test of animated form" 2020-06-26 20:19:37 -07:00
Andrew Kvalheim
943f0afaaf Merge #​2659 "Use Rails transactional tests" 2020-06-26 20:19:36 -07:00
Andrew Kvalheim
305c7cac28 Merge #​2658 "Fix bug in logging of screenshots of failed tests" 2020-06-26 20:19:36 -07:00
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Andrew Kvalheim
e4251d7b67 Merge #​2654 "Fix access to the version history of organization-level roles" 2020-06-26 20:19:34 -07:00
Andrew Kvalheim
668aa388a1 Merge #​2655 "Ignore schema.rb in RuboCop" 2020-06-26 20:19:34 -07:00