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

124 commits

Author SHA1 Message Date
Rob Smith
8384f7a00e Merge b9a2a80a75 into 24f0625be1 2016-01-13 11:13:04 +00:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
Rob Smith
b9a2a80a75 Support JSONP exports of conference schedules for embedding 
Currently, it's rather difficult to use OSEM and embed a schedule into another website. We currently use OSEM for the backend, but still use a different system for our main site. This change allows us to dynamically embed the schedule in our main website as well as allow us a simple way to get data for the use in mobile applications or similar.

This limits the JSONP support to only GETS on json formatted requests. This prevents any XSS even though we don't require a authenticity token.
 2015-10-09 22:28:45 -07:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
raluka
1b63728440 Grooming conference.rb to fix rubocop offenses 2015-09-17 12:23:01 +02:00
raluka
11bf53442c Grooming code to fix rubocop offenses 2015-09-17 12:12:51 +02:00
Stella Rouzi
fb607050fe undo deletion of function, so that api works (/api/v1/conferences/) 2015-09-16 10:25:52 +03:00
Henne Vogelsang
68efa06696 Merge pull request #660 from bgeuken/conference_model 
Conference model
 2015-07-02 16:28:06 +02:00
milovanderlinden
5683974151 Fix for #684 2015-06-16 23:09:47 +02:00
Björn Geuken
c972731e20 Small refactoring of get_status & self.get_event_state_line_colors 2015-05-28 10:38:38 +02:00
Björn Geuken
12fa985fff conference: refactor some conditions 2015-05-27 16:06:17 +02:00
Björn Geuken
5a5745947d Simplify cfp_open? method 2015-05-27 16:06:17 +02:00
Björn Geuken
c58585d445 cleanup: if !object.nil? -> if object 2015-05-27 16:06:17 +02:00
Björn Geuken
a1d022d0be Refactor user_registered? method 2015-05-27 16:06:14 +02:00
Björn Geuken
3e77241f8a user_registered: Return false if user is nil 
The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
 2015-05-27 16:02:01 +02:00
Björn Geuken
f180ce0d27 Refactor registration_open? method, part II 2015-05-21 19:16:02 +02:00
Björn Geuken
0d8a77c9ef Refactor registration_open? method 
The registration_period is already checked in registration_dates_given?
method. No need to check it twice
 2015-05-21 19:16:02 +02:00
Björn Geuken
bc966259fb Refactor registration_dates_given? 2015-05-21 19:16:01 +02:00
Björn Geuken
7638b33926 Fix registration_dates_given? 
When the registration period is nil registration_dates_given? should return
false.
 2015-05-21 19:16:01 +02:00
Henne Vogelsang
6cc8c1e5c2 Merge pull request #635 from bgeuken/refactor_calculate_progress 
Refactor calculate progress
 2015-04-20 17:21:15 +02:00
Björn Geuken
650a49d87b Update method documentation (returns a string not an fixnum) 2015-04-17 14:46:25 +02:00
Björn Geuken
ac0abce6e1 Small refactoring of calculate_setup_progress, part II 2015-04-17 14:46:21 +02:00
Björn Geuken
d910a0f532 Small refactoring of calculate_setup_progress 2015-04-17 12:21:52 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Christian Bruckmayer
ff124632ef Merge pull request #611 from shayonj/dashboard-status-minutes-fix 
Fixing functions for minutes to hours conversion for dashboard
 2015-03-16 12:20:51 +01:00
chrisbr
232cc249d4 Implements program section for unscheduled events 
close #610
 2015-03-09 15:31:06 +01:00
Shayon Mukherjee
37164e3694 Fixing functions for minutes to hours conversion for dashboard 2015-03-02 11:36:42 -06:00
Stella Rouzi
2dd326c8b9 show only confirmed events as highlights 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
chrisbr
799fd0c3a4 Adds dependent restricted association to some models 
fix #348
 2014-12-18 13:38:40 +01:00
Henne Vogelsang
9c968ad3e2 Create some DifficultyLevels by default 2014-11-27 15:05: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
cb227a0afc Another round of splash design 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
 2014-11-20 15:39:26 +01:00
Henne Vogelsang
30e8ab856c Get rid of the splashpage banner photo and "descriptions" 2014-11-20 15:39:26 +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
Henne Vogelsang
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00
Stella
953a7b2384 fix relation for conferences-questions 2014-11-13 21:23:15 +02:00
Chrisbr
9376fe57e3 Moves sponsor email attribute from conference to contact 2014-11-12 11:16:22 +01:00
Gopesh Tulsyan
67ea900dc3 Keynote Speakers implemented 2014-09-15 19:02:02 +05:30
James Mason
a3e4ab5ca0 there's no such thing as Array#to_h 
(cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)
 2014-09-09 17:57:30 -07:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +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
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Christian Bruckmayer
1ab7fe3051 Merge pull request #449 from ChrisBr/introduce_speakers_relation 
Introduces speakers relation to conference #416
 2014-08-15 13:00:59 +02:00
Christian Bruckmayer
70e3d0af35 Merge pull request #448 from ChrisBr/introduce_participants_relation 
Introduces participants relation to conference #416
 2014-08-15 12:58:10 +02:00
Chrisbr
47f524259c Introduces speakers relation to conference #416 2014-08-14 11:25:11 +02:00
Chrisbr
c7d47ce6df Introduces participants relation to conference #416 2014-08-14 10:46:02 +02:00