Commit graph

  • dfb159a0e1
    Merge pull request #2638 from openSUSE/depfu/update/puma-3.12.4 James Mason 2020-04-06 09:48:04 -07:00
  • 49639dadb1
    Merge pull request #2637 from openSUSE/depfu/update/sqlite3-1.4.2 James Mason 2020-04-06 09:46:41 -07:00
  • 8403074765
    Merge pull request #2644 from openSUSE/depfu/update/json-2.3.0 James Mason 2020-04-06 09:46:08 -07:00
  • 303129bf45
    Merge pull request #2652 from AndrewKvalheim/test-unspecified-order-2 Stella Rouzi 2020-04-06 15:26:07 +03:00
  • ae00a7f055 Use Rails transactional tests Andrew Kvalheim 2020-04-05 12:51:30 -07:00
  • 11a7e056bf Fix bug in test database preparation Andrew Kvalheim 2020-04-05 11:16:15 -07:00
  • 3aa32aebe8 Remove redundant code Andrew Kvalheim 2020-04-05 07:59:29 -07:00
  • 75f64508de Work around RuboCop false positive Andrew Kvalheim 2020-04-05 10:20:46 -07:00
  • 3142c0f164 Fix bug in logging of screenshots of failed tests Andrew Kvalheim 2020-04-05 10:16:40 -07:00
  • 5b3520801f Use correct loading mode of Bootstrap-Markdown Andrew Kvalheim 2020-04-04 21:48:31 -07:00
  • 4182b6fb8f Fix bug in UserDatatable query affecting PostgreSQL Andrew Kvalheim 2020-04-04 10:06:20 -07:00
  • d3e73b103f Document workaround for jbox-web/ajax-datatables-rails#293 Andrew Kvalheim 2020-03-16 16:48:17 -07:00
  • 17c0abb2de Don't clobber RuboCop's default excludes Andrew Kvalheim 2020-04-03 17:06:36 -07:00
  • faffc49020 Exclude Rails database schema from linting Andrew Kvalheim 2020-04-03 16:32:03 -07:00
  • fe2e5febe3 Deconflate organization/conference IDs in role versions Andrew Kvalheim 2020-04-03 09:51:35 -07:00
  • 79cd1c9fcd Grant permission to read, revert organization_admin version Andrew Kvalheim 2020-04-03 09:47:31 -07:00
  • 71d9860124 Test access to organization_admin version as organization_admin Andrew Kvalheim 2020-04-02 21:29:33 -07:00
  • aa61ec9692 Remove unused code Andrew Kvalheim 2020-03-31 17:40:13 -07:00
  • a179a38fae Minor refactor Andrew Kvalheim 2020-04-01 08:53:01 -07:00
  • 10f0edac20 Decouple tests from unspecified data ordering Andrew Kvalheim 2020-03-29 09:05:31 -07:00
  • e709d080b4
    Merge pull request #2650 from AndrewKvalheim/test-unspecified-order Stella Rouzi 2020-03-29 15:55:34 +03:00
  • a7006a4edd Decouple tests from unspecified data ordering Andrew Kvalheim 2020-03-20 06:24:47 -07:00
  • f37eab88c7 Use Chrome::Options instead of Capabilities Andrew Kvalheim 2020-03-16 18:57:51 -07:00
  • d088a4ae17 Add missing Chromium dependencies in base image Andrew Kvalheim 2020-03-16 18:55:45 -07:00
  • 8eb696bb4a Use version range instead of OSEM_RUBY_VERSION Andrew Kvalheim 2020-03-16 16:05:00 -07:00
  • 0e3e832770
    Update json to version 2.3.0 depfu[bot] 2020-03-19 15:49:52 +00:00
  • cef0de4149
    Merge 9ec9ad0e73 into e6f3aa559e Abdul ghani qiq 2020-03-15 22:32:32 +07:00
  • 9ec9ad0e73
    Create go.yml Abdul ghani qiq 2020-03-15 22:32:00 +07:00
  • 38b6486550 Use database password in Docker Compose environment Andrew Kvalheim 2020-03-14 16:24:49 -07:00
  • 5c57ccdf5a
    Update puma to version 3.12.4 depfu[bot] 2020-03-03 11:18:54 +00:00
  • 408f341226 Allow in robots Michael Ball 2020-02-27 02:51:09 -08:00
  • 55ce5cb5f6 Add messages@snap as a bcc for all snapcon emails Michael Ball 2020-02-20 22:04:09 -08:00
  • 2ede9f310c Fix sentry-raven gem in the gemfile Michael Ball 2020-02-19 13:36:18 -08:00
  • 5932e27b85 Add sentry config Michael Ball 2020-02-19 13:16:48 -08:00
  • 8598652433
    Update sqlite3 to version 1.4.2 depfu[bot] 2020-02-19 13:11:48 +00:00
  • e6f3aa559e
    Merge pull request #2636 from openSUSE/depfu/update/nokogiri-1.10.8 Henne Vogelsang 2020-02-19 14:07:45 +01:00
  • 153b825923
    Update nokogiri to version 1.10.8 depfu[bot] 2020-02-11 11:47:10 +00:00
  • d3e58f405a
    Merge pull request #30 from snap-cloud/admin-ticketing Michael Ball 2020-02-06 02:10:30 -08:00
  • be991c53d3 Merge branch 'master' of github.com:snap-cloud/snapcon into admin-ticketing Michael Ball 2020-02-06 02:02:20 -08:00
  • 231b2a6d72 Update tickets controller spec for Rails 5 Michael Ball 2020-02-06 01:46:21 -08:00
  • d06c3ce035 Run db:migrate Michael Ball 2020-02-06 01:41:09 -08:00
  • 4306fbe636 Merge branch 'master' into admin-ticketing Michael Ball 2020-02-06 01:37:38 -08:00
  • 7586112f72 Merge master Michael Ball 2020-02-06 01:20:11 -08:00
  • 1b4132fb19
    Merge pull request #28 from snap-cloud/fix-build Michael Ball 2020-02-06 01:12:02 -08:00
  • a72633e2d9 Cleanup some Auth specs and weird haml syntax Michael Ball 2020-02-06 00:47:40 -08:00
  • cc9a759960 add sentry puma hooks Michael Ball 2020-02-05 23:25:08 -08:00
  • 142e93bebc fix user model spec Michael Ball 2020-02-05 23:25:00 -08:00
  • a6bac93788 Tweak Tickets Text Michael Ball 2020-02-05 23:20:31 -08:00
  • 9904ee67aa fix missing ] Michael Ball 2020-02-05 10:57:02 -08:00
  • 37ffc1765d Fix specs for omniauth providers? Michael Ball 2020-02-04 23:50:28 -08:00
  • bc6b76fcc3 Update stripe mock gem Michael Ball 2020-02-04 23:42:26 -08:00
  • 71659ae65f remove airbrake Michael Ball 2020-02-04 22:51:20 -08:00
  • b50972213a Add sentry logging Michael Ball 2020-02-04 22:48:58 -08:00
  • 165fe2b9ca Update stripe gem Michael Ball 2020-02-04 20:50:41 -08:00
  • 9355114960 Cleanup stripe stuff Michael Ball 2020-02-04 20:49:22 -08:00
  • 00c8903968 Fix the docker init script Michael Ball 2020-02-04 18:44:32 -08:00
  • daba37a116 Merge branch 'master' into fix-build Michael Ball 2020-02-04 18:10:29 -08:00
  • 5cd408f51e
    Merge pull request #27 from snap-cloud/rename-commercials Michael Ball 2020-02-04 17:54:55 -08:00
  • 7bf57b05f3 Cleanup specs Michael Ball 2020-01-29 16:51:27 -08:00
  • 3a2198d1fa Cleanup config file, ensure providers are set if present Michael Ball 2020-01-27 22:58:19 -08:00
  • e269e45a45 Fix format spec with new markdown options Michael Ball 2020-01-27 22:56:12 -08:00
  • d8ce3c2982 Try to update spec file with image in navbar Michael Ball 2020-01-27 22:54:03 -08:00
  • 35a532ceab Delint Michael Ball 2020-01-27 22:53:47 -08:00
  • 1ec99a5018 Delint helpers Michael Ball 2020-01-27 22:42:37 -08:00
  • 6dd501663c Lint: Sort gems Michael Ball 2020-01-27 22:31:57 -08:00
  • 506f0c946f Update user model spec Michael Ball 2020-01-27 15:23:54 -08:00
  • 7ea5ff9160 Restore gemfile to have the standard gems Michael Ball 2020-01-27 15:20:37 -08:00
  • 0aae8e79be Restore omniauth providers to keep conistency with master Michael Ball 2020-01-27 15:17:40 -08:00
  • 8a6bb87983 Replace more Commercials with Materials Michael Ball 2020-01-27 13:40:36 -08:00
  • 3eeaebbdc8 Rename more commericals to materials Michael Ball 2020-01-27 13:37:23 -08:00
  • 9a1739e86e UI -- Repalce "Commerials" with "Materials". Michael Ball 2020-01-18 10:57:42 -08:00
  • 1f7877ccd9 Re-order Conference Associations Michael Ball 2020-01-09 01:13:27 -08:00
  • 2a0c19b0e8
    Merge pull request #25 from snap-cloud/tweaks Michael Ball 2020-01-09 00:32:18 -08:00
  • ab4f8cbeac Merge branch 'snapcon' of github.com:snap-cloud/osem into tweaks Michael Ball 2020-01-09 00:28:32 -08:00
  • 843ec586ed Cleanup CSS add Snap! style block attachments Michael Ball 2020-01-08 23:18:03 -08:00
  • 9ed068c59a
    Merge pull request #23 from lmock/patch-1 Michael Ball 2020-01-08 11:13:06 -08:00
  • 9ea695640f
    Merge pull request #22 from snap-cloud/tweaks Michael Ball 2020-01-08 11:04:19 -08:00
  • 0b7085291f
    hide venue link if there is no venue link Lauren Mock 2020-01-08 10:52:03 -08:00
  • debefc307a No dropshadow Michael Ball 2020-01-08 02:01:43 -08:00
  • 843bd60026 Text with drop shadow for now Michael Ball 2020-01-08 01:47:27 -08:00
  • e9b1086f13 Tidy up the look of lodging panels Michael Ball 2020-01-08 01:20:18 -08:00
  • 0b512b1385 Show reg status for tickets. Michael Ball 2020-01-08 00:07:25 -08:00
  • 350371f79d Tweak CSS, fix loding order Michael Ball 2020-01-07 23:58:25 -08:00
  • fac7a14401
    Merge pull request #20 from snap-cloud/tweaks Michael Ball 2020-01-07 16:25:30 -08:00
  • 722bd8c008 Move the venue description to below the map. Michael Ball 2020-01-07 16:21:15 -08:00
  • 9a811b4a6c Update lodging styling. Add description for venu when map is shown. Michael Ball 2020-01-07 16:16:18 -08:00
  • 7553c15e5e CSS tweaks... Michael Ball 2020-01-07 16:06:51 -08:00
  • 2c9645895e Make the edit form not so wide. Michael Ball 2020-01-07 15:47:10 -08:00
  • bff830ec55 Support markdown in more fields Michael Ball 2020-01-07 15:38:17 -08:00
  • 16d2d8c4f0 Cleanup CSS ordering, fix coloring for navdropdowns Michael Ball 2020-01-07 15:38:00 -08:00
  • 1bcf1b8f06 dumb...fix order of link_to args Michael Ball 2020-01-07 02:47:33 -08:00
  • 7fc97a0655 show invited users in booths#show Rahul 2019-08-16 14:27:22 +05:30
  • af0799990c show invited users in invite field Rahul 2019-08-05 00:35:56 +05:30
  • bea9f79544 ARRRGHHH, another typo...same line... Michael Ball 2020-01-07 02:31:38 -08:00
  • d9155da176 fix typo Michael Ball 2020-01-07 02:26:32 -08:00
  • 4ba182b1fb
    Merge pull request #6 from snap-cloud/remove-travel-schedule Michael Ball 2020-01-07 01:10:27 -08:00
  • be657c45a4 Merge branch 'remove-travel-schedule' into remove-schedule Michael Ball 2020-01-07 00:58:53 -08:00
  • e59d69a038 HACK: allow the registration page to work Michael Ball 2020-01-07 00:42:20 -08:00
  • dbeebe50c1 make lodiging name a link, too Michael Ball 2020-01-07 00:23:42 -08:00
  • 2fc88b3555 Order lodgings by created_at. A temporary hack Michael Ball 2020-01-07 00:19:50 -08:00