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

2067 commits

Author SHA1 Message Date
Michael Ball
1964522f49 Add warnings when a user needs to register or complete a purchase 2020-07-11 01:50:17 -07:00
Michael Ball
5bef4b7004 Assert that a user has a paid ticket before registering for a conference. 2020-07-11 00:57:08 -07:00
Michael Ball
69b18a97e1 Merge branch 'master' of github.com:snap-cloud/snapcon 
* 'master' of github.com:snap-cloud/snapcon:
  Fix registrations csv
  Tweak Materials to allow anything
  A bit of a hack to accept any webpage...
  Add the ability for Rooms to have a URL.
  Add import rake task
  config that works without docker
  Add some links to navbar
  More login info
  Custom login help info
  Run migration; add apple pay verification
  fix tickets bug with no description
 2020-07-10 23:59:29 -07:00
Michael Ball
9325c3938b All events first on the schedule page 2020-07-10 23:52:25 -07:00
Michael Ball
bf189af6e2 Fix registrations csv 2020-07-10 22:30:01 -07:00
Michael Ball
b553e0fed7 Tweak Materials to allow anything 2020-07-10 22:03:51 -07:00
Michael Ball
74b77e132d A bit of a hack to accept any webpage... 2020-07-10 21:22:10 -07:00
Michael Ball
7d2135f851 Add the ability for Rooms to have a URL. 
The URL is shown on the schedule and the event/proposal page.
The URL is only when a user is logged in and registered.
 2020-07-10 20:18:10 -07:00
Michael Ball
20f1afd4e6 Add some links to navbar 2020-07-10 18:29:20 -07:00
Michael Ball
2e24ae5d2c More login info 2020-07-08 20:51:50 -07:00
Michael Ball
b31e1a825d Custom login help info 2020-07-08 20:48:45 -07:00
Michael Ball
d5f0063de6 Run migration; add apple pay verification 2020-07-08 02:14:11 -07:00
Michael Ball
0e9d6b491b fix tickets bug with no description 2020-07-07 22:24:28 -07:00
Michael Ball
8d322f56ef WOW fix a bad bug!! 2020-07-06 00:58:59 -07:00
Michael Ball
59bf4f09dc Ugh, move constant 2020-07-01 02:04:27 -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
Michael Ball
a56a0e7547 Merge master 2020-06-29 13:18:19 -07:00
Andrew Kvalheim
04a77a6043 Merge #​2657 "Remove superfluous click to display Markdown editor" 2020-06-26 20:19:35 -07:00
Andrew Kvalheim
e4251d7b67 Merge #​2654 "Fix access to the version history of organization-level roles" 2020-06-26 20:19:34 -07:00
Michael Ball
46955e4ed9 Up max speakers to 100 2020-06-24 02:55:20 -07:00
James Mason
754c47e41b
Merge pull request #2656 from AndrewKvalheim/ajax-datatables-rails-293-postgresql 
Fix bug in UserDatatable query affecting PostgreSQL
 2020-06-19 19:07:18 -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
f9a3bd73a2 Add fallback oembeds 2020-06-18 11:01:39 -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
a5c10dc161 ugh typo 2020-06-15 10:55:26 -07:00
Michael Ball
77571b940b HACK!!! Return 0 so the method works. 2020-06-15 04:34:11 -07:00
Michael Ball
e8ab2e1b29 attempt to fix a bad bug?? 2020-06-15 04:32:53 -07:00
Michael Ball
985d2ca248 Update logo again 2020-06-09 18:59:41 -07:00
Michael Ball
9cc2c103bc update snapcon logo 2020-06-09 18:20:21 -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
Michael Ball
8d5c300639
Merge branch 'master' into michael/rm-start-restriction 2020-06-02 02:08:33 -07:00
Michael Ball
152f200f93 DatePickers: Remove enforcing start date min. 
You might want to edit conference metadata after the start date has past, so it is
logical to allow the start date to be earlier than "today". As there are no backend
validations, this change is safe and removes a UI bug.
 2020-06-02 02:04:38 -07:00
Michael Ball
0b9b100bf3 Merge master 2020-06-02 01:59:54 -07:00
Tymm Schmitke
aa99f909a6 Add uniqueness tests for Event scope on Vote model with User association 2020-05-19 22:24:37 -04: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
4182b6fb8f Fix bug in UserDatatable query affecting PostgreSQL 
Resolves:

    $ docker-compose run --rm osem bundle exec rspec ./spec/datatables/user_datatable_spec.rb:97
    …
    ActiveRecord::StatementInvalid:
    PG::GroupingError: ERROR:  column "users.id" must appear in the GROUP BY clause or be used in an aggregate function
 2020-04-04 10:35:56 -07:00
Andrew Kvalheim
d3e73b103f Document workaround for jbox-web/ajax-datatables-rails#293 2020-04-04 10:35:44 -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