Commit graph

  • 10d58ef050 Support selecting various sizes of profile pics Michael Ball 2020-07-15 23:27:22 -07:00
  • 3883188dcd Support Users Directly Uploading Profile Pictures. Michael Ball 2020-07-14 21:06:15 -07:00
  • b66f69599a tweak method Michael Ball 2020-07-14 18:15:01 -07:00
  • 4c29d57aae Add a very basic custom_css property to a conference. Michael Ball 2020-07-14 17:43:48 -07:00
  • a1775674ce ugh datatables.... Michael Ball 2020-07-13 04:52:48 -07:00
  • 70e5cc8e96 maybe case matters here Michael Ball 2020-07-13 04:45:04 -07:00
  • 382e1719e9 Ugh assets. Michael Ball 2020-07-13 04:43:09 -07:00
  • 653a9f5cfb
    Merge pull request #42 from snap-cloud/misc-fixes Michael Ball 2020-07-13 04:25:35 -07:00
  • 61ca626df1 Improve the physical_tickets page Michael Ball 2020-07-13 04:21:31 -07:00
  • 0dffc20ad1 Add rake tasks to help manage registrations Michael Ball 2020-07-13 03:27:44 -07:00
  • cd88882714 upgrade datatables gem Michael Ball 2020-07-13 02:58:15 -07:00
  • 18ee10eef5 tweak payment text Michael Ball 2020-07-13 00:48:45 -07:00
  • fff156a453
    Merge pull request #41 from snap-cloud/enforce-ticket-registrations Michael Ball 2020-07-11 01:54:01 -07:00
  • 1964522f49 Add warnings when a user needs to register or complete a purchase Michael Ball 2020-07-11 01:50:17 -07:00
  • 5bef4b7004 Assert that a user has a paid ticket before registering for a conference. Michael Ball 2020-07-11 00:57:08 -07:00
  • 69b18a97e1 Merge branch 'master' of github.com:snap-cloud/snapcon Michael Ball 2020-07-10 23:59:29 -07:00
  • 3b2f854e9b
    Merge pull request #40 from snap-cloud/materials-schedule Michael Ball 2020-07-10 23:57:54 -07:00
  • 9325c3938b All events first on the schedule page Michael Ball 2020-07-10 23:52:25 -07:00
  • bf189af6e2 Fix registrations csv Michael Ball 2020-07-10 22:30:01 -07:00
  • b553e0fed7 Tweak Materials to allow anything Michael Ball 2020-07-10 22:03:51 -07:00
  • 74b77e132d A bit of a hack to accept any webpage... Michael Ball 2020-07-10 21:22:10 -07:00
  • 7d2135f851 Add the ability for Rooms to have a URL. Michael Ball 2020-07-10 20:18:10 -07:00
  • 636ad2cebd Add import rake task Michael Ball 2020-07-10 18:29:57 -07:00
  • 77965b65f8 config that works without docker Michael Ball 2020-07-10 18:29:46 -07:00
  • 20f1afd4e6 Add some links to navbar Michael Ball 2020-07-10 18:29:20 -07:00
  • d141cf537e Update CONTRIBUTING.md with OSEM_RUBY_VERSION instructions Carlos Coelho 2020-07-10 12:43:45 -03:00
  • 6a9b8c9f2b Add OSEM_RUBY_VERSION as build argument on Docker setup Carlos Coelho 2020-07-10 12:43:26 -03:00
  • 2e24ae5d2c More login info Michael Ball 2020-07-08 20:51:50 -07:00
  • b31e1a825d Custom login help info Michael Ball 2020-07-08 20:48:45 -07:00
  • d5f0063de6 Run migration; add apple pay verification Michael Ball 2020-07-08 02:14:11 -07:00
  • 0e9d6b491b fix tickets bug with no description Michael Ball 2020-07-07 22:24:28 -07:00
  • 8d322f56ef WOW fix a bad bug!! Michael Ball 2020-07-06 00:58:59 -07:00
  • 59bf4f09dc Ugh, move constant Michael Ball 2020-07-01 02:04:27 -07:00
  • d4c96dc722 young thinkers custom email Michael Ball 2020-07-01 01:27:15 -07:00
  • cff6e55c9c Reduce data on conference dashboard b/c of timeouts Michael Ball 2020-06-30 01:38:43 -07:00
  • 0877aadb2e Merge some contributor fixes Michael Ball 2020-06-30 00:48:47 -07:00
  • a56a0e7547 Merge master Michael Ball 2020-06-29 13:18:19 -07:00
  • c2c074c3c5 Merge #​2673 "Serve precompiled assets in example Docker Compose configuration" Andrew Kvalheim 2020-06-26 20:19:41 -07:00
  • 3f1c8068ee Merge #​2667 "Work around bug in migrations to non-null columns" Andrew Kvalheim 2020-06-26 20:19:40 -07:00
  • 86713f992e Merge #​2666 "Fix migration that fails on conferences without pictures" Andrew Kvalheim 2020-06-26 20:19:40 -07:00
  • e11f634377 Merge #​2665 "Annotate past migrations with Rails version" Andrew Kvalheim 2020-06-26 20:19:39 -07:00
  • d7a5351b7c Merge #​2663 "Update Docker Compose file format: 2.0 → 2.4 (minor)" Andrew Kvalheim 2020-06-26 20:19:38 -07:00
  • 0618f93660 Merge #​2662 "Fix bug in test of animated form" Andrew Kvalheim 2020-06-26 20:19:37 -07:00
  • 943f0afaaf Merge #​2659 "Use Rails transactional tests" Andrew Kvalheim 2020-06-26 20:19:36 -07:00
  • 305c7cac28 Merge #​2658 "Fix bug in logging of screenshots of failed tests" Andrew Kvalheim 2020-06-26 20:19:36 -07:00
  • 04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" Andrew Kvalheim 2020-06-26 20:19:35 -07:00
  • e4251d7b67 Merge #​2654 "Fix access to the version history of organization-level roles" Andrew Kvalheim 2020-06-26 20:19:34 -07:00
  • 668aa388a1 Merge #​2655 "Ignore schema.rb in RuboCop" Andrew Kvalheim 2020-06-26 20:19:34 -07:00
  • 042fe17fdb Merge #​2649 "Work around ChromeDriver/Chromium crash" Andrew Kvalheim 2020-06-26 20:19:33 -07:00
  • 09b30b4b23 Merge #​2648 "Resolve conflict between WebMock and Webdrivers" Andrew Kvalheim 2020-06-26 20:19:32 -07:00
  • 14fe81be29 Merge #​2647 "Install missing test dependency in base image" Andrew Kvalheim 2020-06-26 20:19:32 -07:00
  • c5f937902a Merge #​2670 "Update all of rails: 5.2.3 → 5.2.4.3 (minor)" Andrew Kvalheim 2020-06-26 20:19:31 -07:00
  • dd40243fbf Merge #​2646 "Use version range instead of OSEM_RUBY_VERSION." Andrew Kvalheim 2020-06-26 20:19:10 -07:00
  • ace4fd4996 Merge #​2640 "Explicitly configure database authentication in Docker Compose" Andrew Kvalheim 2020-06-26 20:19:10 -07:00
  • 744fe48121
    Merge pull request #39 from snap-cloud/more-fixes Michael Ball 2020-06-24 03:12:47 -07:00
  • 46955e4ed9 Up max speakers to 100 Michael Ball 2020-06-24 02:55:20 -07:00
  • 7baf1099ab
    Update all of rails to version 5.2.4.3 depfu[bot] 2020-06-20 02:40:59 +00:00
  • 4f2a22bba6
    Update jquery-ui-rails to version 6.0.1 depfu[bot] 2020-06-20 02:36:07 +00:00
  • 6e6a6dcd39
    Merge pull request #2679 from openSUSE/depfu/update/rack-2.1.4 James Mason 2020-06-19 19:33:39 -07:00
  • 3a3c0e6f2f
    Update rack to version 2.1.4 depfu[bot] 2020-06-20 02:10:35 +00:00
  • 8c96a6cc9a
    Merge pull request #2677 from openSUSE/depfu/update/websocket-extensions-0.1.5 James Mason 2020-06-19 19:09:34 -07:00
  • 0d876de27f
    Merge pull request #2672 from openSUSE/depfu/update/puma-3.12.6 James Mason 2020-06-19 19:09:13 -07:00
  • 754c47e41b
    Merge pull request #2656 from AndrewKvalheim/ajax-datatables-rails-293-postgresql James Mason 2020-06-19 19:07:18 -07:00
  • dbfebdcd01 Ooops. Fix indentation Michael Ball 2020-06-18 12:08:15 -07:00
  • 05fa9e8d3d set @user correctly Michael Ball 2020-06-18 12:02:59 -07:00
  • 3432b9fd9e ugh, typo Michael Ball 2020-06-18 11:50:34 -07:00
  • 68e574dd9e Add in registration warning Michael Ball 2020-06-18 11:37:26 -07:00
  • 38e3cc12fd strip text on homepage tickets Michael Ball 2020-06-18 11:04:11 -07:00
  • 1d478ba5b9 Fix split by newlines Michael Ball 2020-06-18 11:03:20 -07:00
  • f9a3bd73a2 Add fallback oembeds Michael Ball 2020-06-18 11:01:39 -07:00
  • 26692027a5 Restore registration flow Michael Ball 2020-06-18 04:29:57 -07:00
  • 545b4b8852 Fix letter opener; tweak ticket display Michael Ball 2020-06-18 04:14:38 -07:00
  • a5c10dc161 ugh typo Michael Ball 2020-06-15 10:55:26 -07:00
  • 77571b940b HACK!!! Return 0 so the method works. Michael Ball 2020-06-15 04:34:11 -07:00
  • e8ab2e1b29 attempt to fix a bad bug?? Michael Ball 2020-06-15 04:32:53 -07:00
  • 985d2ca248 Update logo again Michael Ball 2020-06-09 18:59:41 -07:00
  • 9cc2c103bc update snapcon logo Michael Ball 2020-06-09 18:20:21 -07:00
  • a3a7f54847 Fix link_to call in tickets view Michael Ball 2020-06-09 03:31:55 -07:00
  • d5cd328536 fix missing @ in @conference tickets view Michael Ball 2020-06-09 03:27:46 -07:00
  • 19ac2f8ea1 Do not allow registrations without tickets Michael Ball 2020-06-09 03:19:41 -07:00
  • 907cd182a0 Add purchase date to admin tickets Michael Ball 2020-06-09 02:51:05 -07:00
  • acb3654af2
    Update websocket-extensions to version 0.1.5 depfu[bot] 2020-06-05 18:44:31 +00:00
  • ce3f9e422a Tidy up some text around logins and proposals Michael Ball 2020-06-04 02:04:07 -07:00
  • 7d8245fa68
    Merge pull request #36 from snap-cloud/michael/rm-start-restriction Michael Ball 2020-06-02 02:40:06 -07:00
  • 8d5c300639
    Merge branch 'master' into michael/rm-start-restriction Michael Ball 2020-06-02 02:08:33 -07:00
  • 152f200f93 DatePickers: Remove enforcing start date min. Michael Ball 2020-06-02 02:04:38 -07:00
  • 0b9b100bf3 Merge master Michael Ball 2020-06-02 01:59:54 -07:00
  • b7187323a7 Serve precompiled assets in example Docker Compose configuration Andrew Kvalheim 2020-05-30 09:36:26 -07:00
  • 4e6c74ecb5
    Update puma to version 3.12.6 depfu[bot] 2020-05-22 20:50:27 +00:00
  • a89201ff82
    Merge pull request #2671 from ifellinaholeonce/master Stella Rouzi 2020-05-21 08:47:26 +03:00
  • 40036899b3 Add empty line at end of file Tymm Schmitke 2020-05-19 23:18:05 -04:00
  • aa99f909a6 Add uniqueness tests for Event scope on Vote model with User association Tymm Schmitke 2020-05-19 22:24:37 -04:00
  • 0791c04519
    Update rack to version 2.1.3 depfu[bot] 2020-05-13 00:23:07 +00:00
  • 16b7d6f69d Work around bug in migrations to non-null columns Andrew Kvalheim 2020-05-11 21:55:36 -07:00
  • 63aa240e65 Fix migration that fails on conferences without pictures Andrew Kvalheim 2020-05-11 12:50:34 -07:00
  • 4a0961e88e Annotate past migrations with Rails version Andrew Kvalheim 2020-05-11 12:38:36 -07:00
  • c34b55c1b8 Update Docker Compose file format: 2.0 → 2.4 (minor) Andrew Kvalheim 2020-04-13 08:13:07 -07:00
  • e657d37c8d Whitelist Webdrivers update URLs in WebMock Andrew Kvalheim 2020-03-16 19:03:56 -07:00
  • e077fe9671 Fix bug in test of animated form Andrew Kvalheim 2020-04-12 10:04:20 -07:00
  • 66c1c97c39
    Update all of rails to version 5.2.4.2 depfu[bot] 2020-04-06 16:50:49 +00:00