Commit graph

19 commits

Author SHA1 Message Date
Michael Ball
676d10ce36 HACK! Show confirmed status in the all users export 2021-03-08 19:24:34 -08:00
Michael Ball
2b2745ade9 run rubocp --fix 2021-02-24 09:47:56 -08:00
Michael Ball
61c107c244 Add username to admin users index 2020-07-27 18:51:41 -07:00
Michael Ball
35ef0dbae9 Add username to admin users index 2020-07-27 18:40:23 -07:00
Michael Ball
a56a0e7547 Merge master 2020-06-29 13:18:19 -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
Michael Ball
b49bddafb6 Merge branch 'misc-release-tweaks' into remove-schedule
* misc-release-tweaks: (38 commits)
  Improve markdown support and tweak sponsorship langage
  Use Ruby 2.5.5 since that is in the docker dev container
  Do not need to specify callback url
  attempt to fix the discourse callback URL
  use a div with padding.
  Help button is weird.
  Dropdown menu style tweaks
  fix logic for snap sso link
  tweak form display in dropdown
  Tweak devise modules list
  Work on omniauth setup
  Minor HTML cleanup
  More CSS-y things
  BJC-ify a bunch of styles
  More wording tweaks
  Tweak some wording, html and descriptions for Snap!Con
  Enable a bunch more markdown options.
  Delete some unnecessary files
  attempt one more fix
  readd back the group by
  ...
2020-01-05 15:44:35 -08:00
Michael Ball
624ee6cf6e attempt one more fix 2019-12-19 01:29:17 -08:00
Michael Ball
20129e2e77 readd back the group by 2019-12-19 01:23:54 -08:00
Michael Ball
cdcf550ee0 more attempts to make datatables work 2019-12-19 01:13:58 -08:00
Michael Ball
29f6a41c98 Not ruby-ish but this should work 2019-12-17 12:56:51 -08:00
Michael Ball
dbe0b1c09c try again with the query 2019-12-17 12:45:41 -08:00
Michael Ball
2c1b11d2c7 Fix a comma 2019-12-17 12:25:13 -08:00
Michael Ball
34e3258086 attempt to fix groupby issue 2019-12-17 11:28:40 -08:00
James Mason
3a94aeb073
Remove travel schedule from registration
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
2019-12-02 14:19:12 -08:00
James Mason
d7a0936dd7 Convert admin/registrations datatable to AJAX-backed
Supercedes https://github.com/openSUSE/osem/pull/2031 .

Note:

* "Questions" modals have been dropped from this view; questions are no
  longer asked on registration, since Surveys(PR#1100)  were added.
2018-10-10 21:57:22 +02:00
James Mason
c32c9962d1 Change quotes style for better DB compatibility
Postgres 10 doesn't like the double-quoted values.
2018-08-30 19:52:20 -07:00
James Mason
64ceaf50f4 Update Admin user datatables to use AJAX 2018-08-30 16:50:42 +02:00