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

296 commits

Author SHA1 Message Date
Michael Ball
eaf13b1b69
Merge branch 'master' into master 2021-04-15 20:29:54 -07:00
Jimmy
3c7cc6cfdb [feat]Use Ajax for paginating happening_now 2021-04-09 17:16:16 +08:00
Michael Ball
386577cd21 Update submission text when it matches any default type of text 2021-04-01 14:43:52 -07:00
Michael Ball
e810fd442f Cleanup the submission form, fix reset button 2021-03-23 23:06:34 -07:00
Michael Ball
ed20ff3b51 Refactor the new/edit submission forms 2021-03-23 22:43:11 -07:00
Michael Ball
df5a767494 Improve the look of the conf dashboard 2021-03-23 17:37:04 -07:00
Michael Ball
75b60c2578 Use 'Description' on the submissions page. Fill template from submission_instructions 2021-03-22 02:59:35 -07:00
Michael Ball
f22ad296af resolve conflicts with master 2021-03-21 12:59:43 -07:00
Jimmy
11d4255c67 merge 2021-03-11 21:28:17 -08:00
Michael Ball
e48dfb8880 update snapcon logo 2021-03-10 23:36:48 -08:00
CactusPuppy
c1fad244ef
Update comment in osem.js to be accurate 2021-03-10 13:26:45 -08:00
CactusPuppy
07348cb08f
Create JS hook for template reset 2021-03-10 13:25:59 -08:00
CactusPuppy
a48e78da22
Fill submission text if the field is currently empty 2021-03-10 13:25:59 -08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Stella Rouzi
780d37eb41
Enable datepicker for readonly fields 
Remove minDate definition, so that value appears in readonly input
 2021-03-06 12:48:50 +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
rajavi-mishra
e8013d8345 stylesheet, layout and rendering for email_template (test) 2021-03-05 03:35:29 -08:00
Michael Ball
c18531ca21
Merge branch 'master' into master 2021-03-02 21:59:34 -08:00
Michael Ball
06b05b8177 Fixup the last trapeziod on social media section 2021-03-02 18:55:41 -08:00
CactusPuppy
d46e1e7397
Add JavaScript to make placeholder text update along with word count 2021-02-24 23:41:19 -08:00
Michael Ball
f85a11f5d5 Merge branch 'master' of https://git.heroku.com/snapcon 
* 'master' of https://git.heroku.com/snapcon:
  snapshot logo
  snapshot logo
 2020-12-04 01:17:59 -08:00
Michael Ball
2892a56a1c merge master 2020-12-04 01:17:39 -08:00
Michael Ball
7f827c844a snapshot logo 2020-10-28 02:28:36 -07:00
Michael Ball
92efee7916 snapshot logo 2020-10-28 01:39:58 -07:00
Thomas Schmidt
588884bace
update jquery-ui-rails 2020-09-29 00:41:18 +02:00
Michael Ball
02f0d4a254 Fix navbar profile pics 2020-07-16 11:15:17 -07:00
Michael Ball
10d58ef050 Support selecting various sizes of profile pics 2020-07-15 23:27:22 -07:00
Michael Ball
a1775674ce ugh datatables.... 2020-07-13 04:52:48 -07:00
Michael Ball
70e5cc8e96 maybe case matters here 2020-07-13 04:45:04 -07:00
Michael Ball
382e1719e9 Ugh assets. 2020-07-13 04:43:09 -07:00
Michael Ball
cd88882714 upgrade datatables gem 2020-07-13 02:58:15 -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
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
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
843ec586ed Cleanup CSS add Snap! style block attachments 2020-01-08 23:18: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
350371f79d Tweak CSS, fix loding order 2020-01-07 23:58:25 -08:00
Michael Ball
7553c15e5e CSS tweaks... 2020-01-07 16:06:51 -08:00
Michael Ball
16d2d8c4f0 Cleanup CSS ordering, fix coloring for navdropdowns 2020-01-07 15:38:00 -08:00
Michael Ball
5f1f93d221 Add a snap logo to the navbar 2020-01-07 00:08:05 -08: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
904ca19878 More CSS-y things 2019-12-19 02:32:18 -08:00
Michael Ball
767b0bcd19 BJC-ify a bunch of styles 2019-12-19 02:21:09 -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
Ana María Martínez Gómez
b2e6c1b701
Merge pull request #2462 from Ana06/carrousel 
Fix overlay of carousel controls
 2019-04-06 10:06:37 +02:00
cyrille
e669b37dfa Fixes datetime pickers 
- some read only attributes that deny pick a date/date-time
- typos in haml and in JS
- undefined methods in JS

Fixes https://github.com/openSUSE/osem/issues/2455
 2019-03-27 23:04:42 +01:00
Ana María Martínez Gómez
6926990fea
Fix overlay of carousel controls 
Events on the last column where not clickable because the carousel
controls where render on top. Make them narrower to solve it.

This bug was a side effect of using a carousel for rendering the
schedule. There are strong arguments to think this is not the best
design and a better solution is being discussed:

https://github.com/openSUSE/osem/issues/2421

Fixes https://github.com/openSUSE/osem/issues/2434

Co-authored-by: @sncarnera
 2019-03-26 13:40:38 +01:00