gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 20:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1942 commits 15 branches 2 tags 50 MiB
Commit graph

101 commits

Author SHA1 Message Date
Ana
c047ffd699 New associations and models: schedule versioning 
For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.

User Interface addapted to make use of the introduced associations and models
 2016-08-11 15:06:52 +02:00
Ana
7e5d20c89d style: if ! changed by unless 
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
 2016-08-06 00:57:07 +02:00
Nishanth Vijayan
a071d4497b Handle cancelation of scheduled events 2016-07-25 17:34:06 +05:30
Ana
feb002de1a Text color of event types and difficulty levels 
Changing the text color of event types and difficulty levels taking the background color into account. Similar to what it is done with tracks. See issue https://github.com/openSUSE/osem/issues/1033

Closes https://github.com/openSUSE/osem/issues/1078
 2016-07-11 15:32:02 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Ana
1846eebea3 Changing the text color of tracks 2016-06-20 17:09:39 +02:00
Henne Vogelsang
dcae196d2b Merge pull request #905 from Ana06/languages 
Languages
 2016-06-15 16:55:12 +02:00
Ana
6c87995050 Configure language of events 2016-06-03 14:09:37 +02:00
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees 
allow max_attendees to be nil
 2016-05-19 12:03:43 +02:00
Christian Bruckmayer
acf5b6e8f2 Make proposal show view more robust 
Partially fixes #718. Some objects have an foreign_key set on track, difficulty level or room but the
referenced object does not exists. This is caused by introducing dependent: nullify after deleting
some of the objects. This commit will make the show page more robust, however, we need to
fix the corrupt objects in an additional commit.
 2016-05-19 10:40:27 +02:00
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables 
Instead of reading a yaml file we get configuration from the
environment.
 2016-04-29 16:36:47 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Alexandros
b7bba4ba44 Groom proposal#show for issue openSUSE/osem#731 
Move speaker's avatar and bio to the sidebar and move proposal's information bellow the commercial.
 2016-04-15 00:24:18 +03:00
Henne Vogelsang
5cbf105a68 Merge pull request #920 from camillem/master 
Adding notranslate classes to ease translation of dynamic text
 2016-04-01 14:51:50 +02:00
Henne Vogelsang
f56fc0052f Merge pull request #907 from sonalkr132/proposal-test 
Proposal controller improvements and test
 2016-04-01 14:49:50 +02:00
CamilleM
c5da563a48 Merge branch 'master' of https://github.com/camillem/osem 2016-03-26 23:37:35 +01:00
CamilleM
d11ea33cf0 Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908 2016-03-26 23:32:43 +01:00
Aditya Prakash
dcb98c49f9 Improvements in proposal controller 
`if..else` is better than unless with return.
On failed update render `edit` template and not render `new` template.
On failed save redirect to index path and not render `new` template.
Change `destory` to `withdraw`, cause `destroy` makes DELETE request when
we are updating the event record.
Check for success for save in withdraw (save can fail for reasons other than validation).
 2016-03-24 11:37:40 +05:30
Nishanth Vijayan
246bf605ea Proposal submitter should be asked to add track only if conf has track 2016-03-23 23:31:00 +05:30
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Aditya Prakash
dd159c5555 Fix edit and schedule buttons on proposal show page 2016-03-13 18:51:08 +05:30
Aditya Prakash
afc58d3d85 Fix overflow of proposal edit in admin area 2016-03-10 17:42:09 +05:30
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
813658fb19 rebase fixes for commercials path 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
chrisbr
23664119bd Implement simplified commercials workflow 
It's now possible to simply enter the url of the third party provider to enter a commercial.
 2016-01-21 19:41:12 +01:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
1de8f979cd Issue #649: Wrong days remaining label when submitting a new proposal 2015-08-27 10:35:43 +02:00
Stella Rouzi
969c24c091 Move common views to partial 2015-06-11 15:20:48 +03:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
chrisbr
232cc249d4 Implements program section for unscheduled events 
close #610
 2015-03-09 15:31:06 +01:00
Stella
8fab09e63b proposal creation: only show is_highlight for organizers or cfp 2015-01-21 17:28:18 +02:00
Stella Rouzi
a845dd5d7d add bootstrap-switch for is_highlight 2015-01-21 17:28:18 +02:00
Stella Rouzi
ecfc348ea8 add highlights and fix cfp in splashpage 2015-01-21 17:28:18 +02:00
Henne Vogelsang
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01:00
Henne Vogelsang
28063129c7 Implement consistent admin interface 
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
 2014-11-25 10:47:18 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout 
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
 2014-11-17 13:58:27 +01:00
Chrisbr
c995f57877 Fixes the proposal abstract word count javascript functions 
fix #510
 2014-10-05 18:58:47 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Stella Rouzi
30c2d66a15 remove attachments 2014-08-21 07:58:26 +03:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes 
Minor fixes
 2014-08-19 14:24:21 -07:00
James Mason
cb68445efa Typo 2014-08-19 08:49:40 -07:00
James Mason
eac40ddfd1 Switch proposal attachment glyphs to FontAwesome 2014-08-18 08:51:16 -07:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object 
close #420
 2014-08-06 14:30:50 +02:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00