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

718 commits

Author SHA1 Message Date
rajavi-mishra
6f91b4de05
fixed the title 2021-05-01 18:03:26 -07:00
Jimmy
47e580904d
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later? 2021-05-01 17:59:08 -07:00
Michael Ball
d01dc9550b Show ticket IDs on the admin ticket page 2021-04-28 10:20:03 -07:00
Michael Ball
f6c7a50bba Add {committee_review} to emails and support HTML 2021-04-16 01:08:28 -07:00
Michael Ball
0e74c2e296 Minor tidying up 2021-04-15 22:31:46 -07:00
Michael Ball
6ce36c0fca Merge branch 'master' into submission-reviewer-comments 
* master: (246 commits)
  merge master
  Skip datatable spec because github actions is weird.
  Add devise view files for email messages
  Make the _mailbot_* files not depend on @conference
  Tweak devise text for confirm emails
  Run database migrations on release
  [fix]Add mailbot.css to assets.rb
  [fix]Fix empty string check
  [fix]Fix program#any_event_for_this_date?
  Add newline at end of show.js.erb file
  [feat]Display happening now only if program is also displayed
  [feat]Add brief version of event partial; fix style
  [feat]Description / happening now takes the entire row if the other is empty
  [feat]Use Ajax for paginating happening_now
  [style]Fix style
  [refactor]Delete unused javascript; Move about-and-happening-now to partial
  [feat]Add bootstrap style to pagination navbar
  [fix]Fix style; Re-enable checking happening now
  items per page
  pagination
  ...
 2021-04-15 22:22:52 -07:00
Jimmy
346f324bef [feat]Display happening now only if program is also displayed 2021-04-10 00:44:42 +08:00
Jimmy
65119149ea [feat]Add include_happening_now checkbox to the admin splashpage 2021-04-01 13:14:31 +08:00
Michael Ball
617a4ad172 Control some lints 2021-03-24 13:54:20 -07:00
Michael Ball
de8b06c4b3 Merge master tidy routes 2021-03-24 13:32:40 -07:00
Michael Ball
2dc6da87e5 Fix indentation on admin show page 2021-03-24 03:02:43 -07:00
Michael Ball
81b963ddc8 Delint some more 2021-03-24 02:50:44 -07:00
Michael Ball
de607fc262 Cleanup conferences show page 2021-03-24 02:37:07 -07:00
Michael Ball
df5a767494 Improve the look of the conf dashboard 2021-03-23 17:37:04 -07:00
Michael Ball
1806a04b69 Conf Admin: Allow for stats to reflow on small screens 2021-03-23 16:30:13 -07:00
Michael Ball
20a80c2c31 tidy up the conference edit page 2021-03-23 16:26:09 -07:00
Michael Ball
f5e099501c Minor updates to the conf edit page 2021-03-23 13:00:22 -07:00
Michael Ball
6e3e1199ef Restore and cleanup the admin conf todo list 2021-03-23 12:54:07 -07:00
Michael Ball
048207cd38 Some re-delinting 2021-03-22 03:18:47 -07:00
Michael Ball
f22ad296af resolve conflicts with master 2021-03-21 12:59:43 -07:00
CactusPuppy
536ec5b68a
Fix linters 2021-03-11 23:25:35 -08:00
Michael Ball
558e5efe35 Hide stuff again on admin conf show 2021-03-11 12:16:48 -08:00
Michael Ball
914de7bf1a Delint by re-enabling everying on the conference admin page 2021-03-10 14:28:14 -08:00
Michael Ball
332bf8f1df Support the ability for admins to delete users 2021-03-08 20:19:57 -08:00
Michael Ball
331e0a1610 better hidden class for admin datatable 2021-03-08 19:28:12 -08:00
Michael Ball
676d10ce36 HACK! Show confirmed status in the all users export 2021-03-08 19:24:34 -08:00
Michael Ball
f3271f5cdc Merge master 2021-03-08 16:48:06 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Stella Rouzi
ee5274b352 Fix JS error when saving survey_question 2021-03-07 07:32:52 +02:00
Michael Ball
bc4177154a Add editing submission instructions 2021-03-06 12:45:00 -08:00
Henne Vogelsang
995db101b3
Merge pull request #2657 from AndrewKvalheim/bootstrap-markdown 
Remove superfluous click to display Markdown editor
 2021-03-06 20:00:50 +01:00
Andrew Kvalheim
ce59c37ff6
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.
 2021-03-06 19:35:23 +01:00
Stella Rouzi
c4da5cc31d
Fix chart legend position 2021-03-06 19:27:28 +01:00
James Mason
7a04f3582f
Remove travel schedule from registration 
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb)
Re: https://github.com/openSUSE/osem/issues/2333
 2021-03-06 04:09:02 +01:00
Michael Ball
cb9455f813 show reviewer comments field in the app 2021-03-04 01:39:12 -08:00
CactusPuppy
207046dc65
Merge pull request #11 from CactusPuppy/176894810/add_summision_text 
Add submission text to event proposals
 2021-03-01 23:38:06 -08:00
madhekare
baf488ad8a
sumbission text views 2021-02-24 23:41:18 -08:00
Jimmy
92d052970a Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176895037-add-link-to-view-event-from-admin-page 2021-02-24 22:07:38 -08:00
Jimmy
a0532b5d9f [feat] Add a button in admin event view that links to user event view 2021-02-24 12:17:05 -08:00
Michael Ball
8745825436 Fixup the commericals dispaly, correct some labels 2021-02-23 20:20:28 -08:00
Michael Ball
2573dbee44 fix the alt text in the conference logo 2021-02-23 18:47:27 -08:00
Michael Ball
2dc3950cb0 Fix commericals feature specs (UI consistency). 2021-02-23 18:43:18 -08:00
Michael Ball
4c97dacf5c fix dynamic class name 2020-12-10 02:26:48 -08:00
Michael Ball
6522f46991 wider columns on the admin schedule page. 2020-12-10 02:14:36 -08:00
Michael Ball
6186eee1d5 fix versions? 2020-08-02 14:26:44 -07:00
Michael Ball
48a8aa37d1 ugh one more place to add the username 2020-07-27 19:14:34 -07: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
1e9027f22a Admin volunteers display 2020-07-27 00:43:29 -07:00
Michael Ball
d1b2ad3528 admins can update volunteers, show names 2020-07-26 23:23:23 -07:00