Commit graph

  • 5f1f93d221 Add a snap logo to the navbar Michael Ball 2020-01-07 00:08:05 -08:00
  • 5a88299f76
    Remove travel schedule from registration James Mason 2018-12-29 15:36:17 -08:00
  • e38cfc55c4
    Merge pull request #2586 from rahul2240/bug1 Stella Rouzi 2020-01-07 00:34:38 +02:00
  • 3d74ba4742
    Merge pull request #2619 from bennettscience/master Stella Rouzi 2020-01-07 00:03:44 +02:00
  • b49bddafb6 Merge branch 'misc-release-tweaks' into remove-schedule Michael Ball 2020-01-05 15:44:35 -08:00
  • 2e817d8739 Improve markdown support and tweak sponsorship langage Michael Ball 2020-01-05 15:43:11 -08:00
  • 4c28ecf254 Use Ruby 2.5.5 since that is in the docker dev container Michael Ball 2020-01-05 15:16:14 -08:00
  • 690689b3df
    Merge pull request #13 from snap-cloud/upstream/updates Michael Ball 2020-01-05 15:06:57 -08:00
  • 2be789884b merge upstream Michael Ball 2020-01-05 13:50:57 -08:00
  • 7b94c24251 Do not need to specify callback url Michael Ball 2019-12-20 12:45:31 -08:00
  • 89de647968 attempt to fix the discourse callback URL Michael Ball 2019-12-20 12:14:14 -08:00
  • 2d31ababaa
    Correct variable error Brian 2019-12-20 10:38:14 -05:00
  • 50a5ca26ca
    Update nokogiri to version 1.10.7 depfu[bot] 2019-12-20 15:00:54 +00:00
  • 109cb7b114
    Merge pull request #2614 from openSUSE/depfu/update/shoulda-matchers-4.1.2 Henne Vogelsang 2019-12-20 15:59:22 +01:00
  • 62e5a03a6f
    Merge pull request #2617 from openSUSE/depfu/update/rack-2.0.8 Henne Vogelsang 2019-12-20 15:58:45 +01:00
  • b828a9d6c6
    fixes redirect loop Brian 2019-12-20 08:26:22 -05:00
  • 4ea5fb0892 use a div with padding. Michael Ball 2019-12-19 03:58:07 -08:00
  • 0c232ffc9d Help button is weird. Michael Ball 2019-12-19 03:53:09 -08:00
  • 55057686ec Dropdown menu style tweaks Michael Ball 2019-12-19 03:49:23 -08:00
  • 46a35cf704 fix logic for snap sso link Michael Ball 2019-12-19 03:42:41 -08:00
  • 640d33f187 tweak form display in dropdown Michael Ball 2019-12-19 03:42:10 -08:00
  • 2e62aaf0c8 Tweak devise modules list Michael Ball 2019-12-19 03:32:52 -08:00
  • 4d4bdd00c6 Work on omniauth setup Michael Ball 2019-12-19 03:06:12 -08:00
  • 8a35bb377e Minor HTML cleanup Michael Ball 2019-12-19 02:36:42 -08:00
  • 904ca19878 More CSS-y things Michael Ball 2019-12-19 02:32:18 -08:00
  • 767b0bcd19 BJC-ify a bunch of styles Michael Ball 2019-12-19 02:21:09 -08:00
  • 5b5e10ba50 More wording tweaks Michael Ball 2019-12-19 02:12:44 -08:00
  • cd2e2066f4 Tweak some wording, html and descriptions for Snap!Con Michael Ball 2019-12-19 02:00:32 -08:00
  • 43b65cc509 Enable a bunch more markdown options. Michael Ball 2019-12-19 01:45:04 -08:00
  • 78394bb0d3 Delete some unnecessary files Michael Ball 2019-12-19 01:41:17 -08:00
  • 624ee6cf6e attempt one more fix Michael Ball 2019-12-19 01:29:17 -08:00
  • 20129e2e77 readd back the group by Michael Ball 2019-12-19 01:23:54 -08:00
  • cdcf550ee0 more attempts to make datatables work Michael Ball 2019-12-19 01:13:58 -08:00
  • 544becd291
    Update rack to version 2.0.8 depfu[bot] 2019-12-18 22:50:29 +00:00
  • 29f6a41c98 Not ruby-ish but this should work Michael Ball 2019-12-17 12:56:51 -08:00
  • dbe0b1c09c try again with the query Michael Ball 2019-12-17 12:45:41 -08:00
  • 2c1b11d2c7 Fix a comma Michael Ball 2019-12-17 12:25:13 -08:00
  • 610ad32eda Merge branch 'snapcon' of github.com:snap-cloud/osem into snapcon Michael Ball 2019-12-17 12:21:25 -08:00
  • 1e86f36511
    Merge pull request #12 from snap-cloud/revert-4-depfu/update/rails-assets-bootstrap-select-1.13.10 Michael Ball 2019-12-17 12:21:17 -08:00
  • e7a8190302
    Revert "Update rails-assets-bootstrap-select to version 1.13.10" Michael Ball 2019-12-17 12:21:05 -08:00
  • 34e3258086 attempt to fix groupby issue Michael Ball 2019-12-17 11:28:40 -08:00
  • c1810b31c2 Merge branch 'snapcon' of github.com:snap-cloud/osem into snapcon Michael Ball 2019-12-17 11:17:22 -08:00
  • 8d6c9978b9 Hide the small image for now Michael Ball 2019-12-17 03:15:05 -08:00
  • beb1b8ae26 ugh fix js again Michael Ball 2019-12-17 02:48:47 -08:00
  • 9a21d4016d try again for picture_url Michael Ball 2019-12-17 02:18:44 -08:00
  • 94168ec23e JS conf picture URL try 2 Michael Ball 2019-12-17 01:59:42 -08:00
  • 03c420bcdd
    Merge pull request #5 from snap-cloud/depfu/update/shoulda-matchers-4.1.2 Michael Ball 2019-12-17 01:56:16 -08:00
  • e806f76c34
    Merge pull request #4 from snap-cloud/depfu/update/rails-assets-bootstrap-select-1.13.10 Michael Ball 2019-12-17 01:55:51 -08:00
  • ccc9e9c98e Try 3 for the image background Michael Ball 2019-12-17 01:51:15 -08:00
  • 7657ddf27f attempt to fix style syntax Michael Ball 2019-12-17 01:41:01 -08:00
  • de7a6036d1 Tweak the top heading if there is a image Michael Ball 2019-12-17 01:32:16 -08:00
  • 5441f83271 No mysql for SnapCon Michael Ball 2019-12-17 01:27:10 -08:00
  • e7d98999fb
    Merge pull request #2616 from openSUSE/depfu/update/puma-3.12.2 Henne Vogelsang 2019-12-06 12:59:04 +01:00
  • 66ff365e06
    Update puma to version 3.12.2 depfu[bot] 2019-12-06 10:26:38 +00:00
  • 3a94aeb073
    Remove travel schedule from registration James Mason 2018-12-29 15:36:17 -08:00
  • 33e07bfc28
    Update shoulda-matchers to version 4.1.2 depfu[bot] 2019-12-02 18:25:54 +00:00
  • 43ab8966e3
    Merge pull request #2613 from openSUSE/depfu/update/redcarpet-3.5.0 James Mason 2019-12-02 10:21:09 -08:00
  • b691568b61
    Merge pull request #2606 from openSUSE/depfu/update/leaflet-rails-1.5.1 James Mason 2019-12-02 10:20:42 -08:00
  • 842b83ba91
    Update leaflet-rails to version 1.5.1 depfu[bot] 2019-11-27 12:50:55 +00:00
  • 9c14a026d4
    Update redcarpet to version 3.5.0 depfu[bot] 2019-11-27 12:45:49 +00:00
  • 4078cd85ef
    Merge pull request #2609 from openSUSE/depfu/update/chartkick-3.3.0 Henne Vogelsang 2019-11-27 13:44:23 +01:00
  • be38aae203
    Merge pull request #2611 from openSUSE/depfu/update/ruby-openid-2.9.2 Henne Vogelsang 2019-11-26 17:05:29 +01:00
  • aeea38ae71
    Merge pull request #2608 from openSUSE/depfu/update/nokogiri-1.10.5 Henne Vogelsang 2019-11-26 17:05:18 +01:00
  • f823d8783a
    Update ruby-openid to version 2.9.2 depfu[bot] 2019-11-17 02:11:41 +00:00
  • 695c02bd62
    Update chartkick to version 3.2.2 depfu[bot] 2019-11-10 04:13:13 +00:00
  • 00bf2c24a7
    Update chartkick to version 3.3.0 depfu[bot] 2019-11-10 04:07:08 +00:00
  • 7336a67133
    Update nokogiri to version 1.10.5 depfu[bot] 2019-11-07 17:20:59 +00:00
  • a96cee7d4c
    Merge pull request #2607 from openSUSE/depfu/update/active_model_serializers-0.10.10 James Mason 2019-11-07 09:18:52 -08:00
  • c123de2552
    Update active_model_serializers to version 0.10.10 depfu[bot] 2019-10-31 18:00:49 +00:00
  • 2174227e15
    Merge pull request #2605 from openSUSE/depfu/update/sqlite3-1.4.1 Henne Vogelsang 2019-10-31 18:55:11 +01:00
  • 8bfa87f834
    Merge pull request #2604 from openSUSE/depfu/update/money-rails-1.13.3 Henne Vogelsang 2019-10-31 18:54:24 +01:00
  • e8dd6cba5e
    Update sqlite3 to version 1.4.1 depfu[bot] 2019-10-31 14:51:36 +00:00
  • 943301b4bc
    Merge pull request #2603 from openSUSE/depfu/update/autoprefixer-rails-9.6.4 Henne Vogelsang 2019-10-31 15:48:06 +01:00
  • 07a6deedb0
    Update money-rails to version 1.13.3 depfu[bot] 2019-10-31 14:47:57 +00:00
  • ebdac434bd
    Update autoprefixer-rails to version 9.6.4 depfu[bot] 2019-10-31 11:56:02 +00:00
  • f14f726741
    Merge pull request #2602 from openSUSE/depfu/update/webdrivers-4.1.3 Henne Vogelsang 2019-10-31 12:53:47 +01:00
  • 63c5864cc8
    Merge pull request #2601 from openSUSE/depfu/update/turbolinks-5.2.1 Henne Vogelsang 2019-10-31 12:53:30 +01:00
  • 1ce66a55bc
    Merge pull request #2596 from snpd25/branch1 Henne Vogelsang 2019-10-31 12:52:20 +01:00
  • dfbfc2eccc
    Update webdrivers to version 4.1.3 depfu[bot] 2019-10-25 23:00:50 +00:00
  • a9a5606b97
    Update turbolinks to version 5.2.1 depfu[bot] 2019-10-25 22:55:57 +00:00
  • 2b302045ac
    Merge pull request #2599 from openSUSE/depfu/update/paper_trail-10.3.1 Henne Vogelsang 2019-10-26 00:55:18 +02:00
  • 4730db1e0e
    Merge pull request #2600 from openSUSE/depfu/update/delayed_job_active_record-4.1.4 Henne Vogelsang 2019-10-26 00:55:08 +02:00
  • 98dde0afea
    Update delayed_job_active_record to version 4.1.4 depfu[bot] 2019-10-25 19:10:56 +00:00
  • 00ef0f6322
    Merge pull request #2594 from openSUSE/depfu/update/chartkick-3.2.1 Henne Vogelsang 2019-10-25 21:07:30 +02:00
  • 87d8522a58
    Update paper_trail to version 10.3.1 depfu[bot] 2019-10-25 18:36:08 +00:00
  • d229ef5bd3
    Merge pull request #2595 from openSUSE/depfu/update/dotenv-rails-2.7.5 Henne Vogelsang 2019-10-25 20:34:32 +02:00
  • 6b7a920ec0
    Update chartkick to version 3.2.1 depfu[bot] 2019-10-25 18:26:24 +00:00
  • bde5098a4c
    Update rails-assets-bootstrap-select to version 1.13.10 depfu[bot] 2019-10-25 18:26:21 +00:00
  • a8dca3e450
    Update dotenv-rails to version 2.7.5 depfu[bot] 2019-10-25 18:20:33 +00:00
  • af8cfafb2d
    Merge pull request #2598 from differentreality/disabled_user Henne Vogelsang 2019-10-25 20:00:54 +02:00
  • 8457cc5d9c add invite condition in ability and ability test Rahul 2019-08-10 15:09:22 +05:30
  • 1c04e820b8 add invites actions in controller and views Rahul 2019-08-10 14:35:07 +05:30
  • 654760c3fc initialize invites Rahul 2019-08-10 14:07:48 +05:30
  • a96722b3c3
    Merge pull request #2541 from rishabhptr/contactable Stella Rouzi 2019-10-24 19:02:03 +03:00
  • 8cf9c15a46 Revert change of active user definition Stella Rouzi 2019-10-24 18:34:12 +03:00
  • cb09d76f51
    Merge pull request #2597 from openSUSE/depfu/update/loofah-2.3.1 Henne Vogelsang 2019-10-24 15:29:04 +02:00
  • f1dd556a57
    Update loofah to version 2.3.1 depfu[bot] 2019-10-24 04:39:53 +00:00
  • 997dc668e0 Supports talks without speakers snpd 2019-09-04 17:48:18 +05:30
  • 12e90422ad
    Merge pull request #2590 from openSUSE/depfu/update/rubocop-rspec-1.36.0 Ana María Martínez Gómez 2019-10-22 21:04:52 -04:00
  • d21d485dd6 Modified user view for no speakers snpd 2019-10-22 17:47:34 +05:30