gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3635 commits 2 branches 2 tags 50 MiB
Commit graph

3635 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Ball
bc6b76fcc3 Update stripe mock gem 2020-02-04 23:42:26 -08:00
Michael Ball
71659ae65f remove airbrake 2020-02-04 22:51:20 -08:00
Michael Ball
b50972213a Add sentry logging 2020-02-04 22:48:58 -08:00
Michael Ball
165fe2b9ca Update stripe gem 2020-02-04 20:50:41 -08:00
Michael Ball
9355114960 Cleanup stripe stuff 2020-02-04 20:49:22 -08:00
Michael Ball
00c8903968 Fix the docker init script 2020-02-04 18:44:32 -08:00
Michael Ball
daba37a116 Merge branch 'master' into fix-build 
* master:
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
 2020-02-04 18:10:29 -08:00
Michael Ball
5cd408f51e
Merge pull request #27 from snap-cloud/rename-commercials 
UI -- Repalce "Commerials" with "Materials".
 2020-02-04 17:54:55 -08:00
Michael Ball
7bf57b05f3 Cleanup specs 2020-01-29 16:51:27 -08:00
Michael Ball
3a2198d1fa Cleanup config file, ensure providers are set if present 2020-01-27 22:58:19 -08:00
Michael Ball
e269e45a45 Fix format spec with new markdown options 2020-01-27 22:56:12 -08:00
Michael Ball
d8ce3c2982 Try to update spec file with image in navbar 2020-01-27 22:54:03 -08:00
Michael Ball
35a532ceab Delint 2020-01-27 22:53:47 -08:00
Michael Ball
1ec99a5018 Delint helpers 2020-01-27 22:42:37 -08:00
Michael Ball
6dd501663c Lint: Sort gems 2020-01-27 22:31:57 -08:00
Michael Ball
506f0c946f Update user model spec 2020-01-27 15:23:54 -08:00
Michael Ball
7ea5ff9160 Restore gemfile to have the standard gems 2020-01-27 15:20:37 -08:00
Michael Ball
0aae8e79be Restore omniauth providers to keep conistency with master 2020-01-27 15:17:40 -08:00
Michael Ball
8a6bb87983 Replace more Commercials with Materials 2020-01-27 13:40:36 -08:00
Michael Ball
3eeaebbdc8 Rename more commericals to materials 2020-01-27 13:37:23 -08:00
Michael Ball
9a1739e86e UI -- Repalce "Commerials" with "Materials". 
This only replaces the UI facing wording. Specs will fail
as they have not been updated yet.
 2020-01-18 10:57:42 -08:00
Michael Ball
1f7877ccd9 Re-order Conference Associations 
The current order leads to an error on the route
GET /conferences/:short_name/physical_tickets

The Rails error message was rather helpful! 😁

```
Completed 500 Internal Server Error in 35ms (ActiveRecord: 12.0ms)
ActiveRecord::HasManyThroughOrderError (Cannot have a has_many :through association 'Conference#physical_tickets' which goes through 'Conference#ticket_purchases' before the through association is defined.):
 app/controllers/admin/physical_tickets_controller.rb:11:in `index'
```
 2020-01-09 01:13:27 -08:00
Michael Ball
2a0c19b0e8
Merge pull request #25 from snap-cloud/tweaks 
Tweaks
 2020-01-09 00:32:18 -08:00
Michael Ball
ab4f8cbeac Merge branch 'snapcon' of github.com:snap-cloud/osem into tweaks 
* 'snapcon' of github.com:snap-cloud/osem:
  hide venue link if there is no venue link
 2020-01-09 00:28:32 -08:00
Michael Ball
843ec586ed Cleanup CSS add Snap! style block attachments 2020-01-08 23:18:03 -08:00
Michael Ball
9ed068c59a
Merge pull request #23 from lmock/patch-1 
hide venue link if there is no venue link
 2020-01-08 11:13:06 -08:00
Michael Ball
9ea695640f
Merge pull request #22 from snap-cloud/tweaks 
Tweaks
 2020-01-08 11:04:19 -08:00
Lauren Mock
0b7085291f
hide venue link if there is no venue link 2020-01-08 10:52:03 -08:00
Michael Ball
debefc307a No dropshadow 2020-01-08 02:01:43 -08:00
Michael Ball
843bd60026 Text with drop shadow for now 2020-01-08 01:47:27 -08:00
Michael Ball
e9b1086f13 Tidy up the look of lodging panels 2020-01-08 01:20:18 -08:00
Michael Ball
0b512b1385 Show reg status for tickets. 2020-01-08 00:07:25 -08:00
Michael Ball
350371f79d Tweak CSS, fix loding order 2020-01-07 23:58:25 -08:00
Michael Ball
fac7a14401
Merge pull request #20 from snap-cloud/tweaks 
Tweaks
 2020-01-07 16:25:30 -08:00
Michael Ball
722bd8c008 Move the venue description to below the map. 2020-01-07 16:21:15 -08:00
Michael Ball
9a811b4a6c Update lodging styling. Add description for venu when map is shown. 2020-01-07 16:16:18 -08:00
Michael Ball
7553c15e5e CSS tweaks... 2020-01-07 16:06:51 -08:00
Michael Ball
2c9645895e Make the edit form not so wide. 2020-01-07 15:47:10 -08:00
Michael Ball
bff830ec55 Support markdown in more fields 2020-01-07 15:38:17 -08:00
Michael Ball
16d2d8c4f0 Cleanup CSS ordering, fix coloring for navdropdowns 2020-01-07 15:38:00 -08:00
Michael Ball
1bcf1b8f06 dumb...fix order of link_to args 2020-01-07 02:47:33 -08:00
Michael Ball
bea9f79544 ARRRGHHH, another typo...same line... 2020-01-07 02:31:38 -08:00
Michael Ball
d9155da176 fix typo 2020-01-07 02:26:32 -08:00
Michael Ball
4ba182b1fb
Merge pull request #6 from snap-cloud/remove-travel-schedule 
Remove travel schedule from registration
 2020-01-07 01:10:27 -08:00
Michael Ball
be657c45a4 Merge branch 'remove-travel-schedule' into remove-schedule 
* remove-travel-schedule:
  Remove travel schedule from registration
  Correct variable error
  fixes redirect loop
  add if condition to send booth rejection mail
 2020-01-07 00:58:53 -08:00
Michael Ball
e59d69a038 HACK: allow the registration page to work 2020-01-07 00:42:20 -08:00
Michael Ball
dbeebe50c1 make lodiging name a link, too 2020-01-07 00:23:42 -08:00
Michael Ball
2fc88b3555 Order lodgings by created_at. A temporary hack 2020-01-07 00:19:50 -08:00
Michael Ball
5f1f93d221 Add a snap logo to the navbar 2020-01-07 00:08:05 -08:00
James Mason
5a88299f76
Remove travel schedule from registration 
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
 2020-01-06 15:04:59 -08:00