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

1238 commits

Author SHA1 Message Date
Michael Ball
9325c3938b All events first on the schedule page 2020-07-10 23:52:25 -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
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Michael Ball
46955e4ed9 Up max speakers to 100 2020-06-24 02:55:20 -07:00
Michael Ball
dbfebdcd01 Ooops. Fix indentation 2020-06-18 12:08:15 -07:00
Michael Ball
05fa9e8d3d set @user correctly 2020-06-18 12:02:59 -07:00
Michael Ball
3432b9fd9e ugh, typo 2020-06-18 11:50:34 -07:00
Michael Ball
68e574dd9e Add in registration warning 2020-06-18 11:37:26 -07:00
Michael Ball
38e3cc12fd strip text on homepage tickets 2020-06-18 11:04:11 -07:00
Michael Ball
1d478ba5b9 Fix split by newlines 2020-06-18 11:03:20 -07:00
Michael Ball
26692027a5 Restore registration flow 2020-06-18 04:29:57 -07:00
Michael Ball
545b4b8852 Fix letter opener; tweak ticket display 2020-06-18 04:14:38 -07:00
Michael Ball
a3a7f54847 Fix link_to call in tickets view 2020-06-09 03:31:55 -07:00
Michael Ball
d5cd328536 fix missing @ in @conference tickets view 2020-06-09 03:27:46 -07:00
Michael Ball
19ac2f8ea1 Do not allow registrations without tickets 2020-06-09 03:19:41 -07:00
Michael Ball
907cd182a0 Add purchase date to admin tickets 2020-06-09 02:51:05 -07:00
Michael Ball
ce3f9e422a Tidy up some text around logins and proposals 2020-06-04 02:04:07 -07:00
Andrew Kvalheim
5b3520801f Use correct loading mode of Bootstrap-Markdown 
data-provide="markdown-editable" is intended for inline editing of page
content à la contenteditable. When this is applied to a textarea, the
editor is loaded only after the user clicks on the field. This behavior
breaks focus and is incompatible with keyboard navigation.
 2020-04-04 22:09:48 -07:00
Andrew Kvalheim
fe2e5febe3 Deconflate organization/conference IDs in role versions 
Resolves failing test spec/features/versions_spec.rb:320.
 2020-04-03 16:19:36 -07:00
Michael Ball
be991c53d3 Merge branch 'master' of github.com:snap-cloud/snapcon into admin-ticketing 
* 'master' of github.com:snap-cloud/snapcon: (22 commits)
  Cleanup some Auth specs and weird haml syntax
  add sentry puma hooks
  fix user model spec
  Tweak Tickets Text
  fix missing ]
  Fix specs for omniauth providers?
  Update stripe mock gem
  remove airbrake
  Add sentry logging
  Update stripe gem
  Cleanup stripe stuff
  Fix the docker init script
  Cleanup specs
  Cleanup config file, ensure providers are set if present
  Fix format spec with new markdown options
  Try to update spec file with image in navbar
  Delint
  Delint helpers
  Lint: Sort gems
  Update user model spec
  ...
 2020-02-06 02:02:20 -08:00
Michael Ball
4306fbe636 Merge branch 'master' into admin-ticketing 
* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...
 2020-02-06 01:37:38 -08:00
Michael Ball
7586112f72 Merge master 2020-02-06 01:20:11 -08:00
Michael Ball
a72633e2d9 Cleanup some Auth specs and weird haml syntax 2020-02-06 00:47:40 -08:00
Michael Ball
a6bac93788 Tweak Tickets Text 2020-02-05 23:20:31 -08:00
Michael Ball
9355114960 Cleanup stripe stuff 2020-02-04 20:49:22 -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
7bf57b05f3 Cleanup specs 2020-01-29 16:51:27 -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
843ec586ed Cleanup CSS add Snap! style block attachments 2020-01-08 23:18:03 -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
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
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
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
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