Commit graph

140 commits

Author SHA1 Message Date
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00
Ana
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
2016-08-11 15:11:27 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color
Different colors for new tracks, types and levels
2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Rishabh Saxena
c802bd95b9 change datepicker id to place correct constraints 2016-06-15 20:48:55 +05:30
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Henne Vogelsang
45bd31fad0 Escape HTML some factory strings 2016-05-03 16:25:07 +02:00
Henne Vogelsang
73ce49de25 Use dynamic fake data in the spec 2016-05-02 16:06:32 +02:00
Henne Vogelsang
8fc57e34c9 Adapt the spec 2016-04-27 17:55:24 +02:00
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Nishanth Vijayan
ab339fadb0 Fix typos: volunteer_coordinator to volunteers_coordinator 2016-04-09 03:50:27 +05:30
Henne Vogelsang
be42215003 phantomjs doesn't like color pickers... 2016-04-05 14:45:47 +02:00
Nishanth Vijayan
ead39ebacf Add tests to check commercials #create,#update fails on invaid data 2016-04-01 00:34:39 +05:30
Aditya Prakash
eae6d90e9f Fix authorization of new and create in ConferenceRegistrationsController
Before authorization we need to set conference relation.
Change in proposal spec cause conference has to have valid registration
period for successful redirect to registration after confirm proposal.
2016-03-23 21:30:05 +05:30
Aditya Prakash
d2b392e119 Remove assumption from test that first user is admin 2016-03-14 17:29:35 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57:45 +02:00
Henne Vogelsang
919c69f7ae Fix new rubocop offense 2016-02-08 14:57:23 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 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
Christian Bruckmayer
9e9c536946 Update rails to version 4.2
Furthermore it was necessary to add the following gems:
- responders
- web-console

And additional it was necessary to update these gems manually:
- devise
- turbolinks
- delayed_job_active_record
- money-rails

And the corresponding dependencies.
http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-4-1-to-rails-4-2
2016-01-26 10:04:08 +01:00
Christian Bruckmayer
28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new
Simplify adding commercials to conference and event
2016-01-21 20:29:03 +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
17a1c0e87c fix hakiri issue 2016-01-21 20:19:37 +02:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
9eb47bd3f0 merged from upstream 2015-10-14 16:02:40 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Henne Vogelsang
9e0c871494 Fix rubocop warnings and User index bug 2015-04-15 10:23:24 +02:00
Henne Vogelsang
6a5cccbaad Last stage of refactoring of the ability model and spec 2015-04-14 17:33:59 +02:00
chrisbr
ac1d9fd329 First stage of refactoring of the ability model and spec 2015-04-14 08:31:52 +02:00
Henne Vogelsang
0ce4aa0a49 Fix the ability spec
* Get rid of the volunteer coordinator role, we don't use it currently
* Test the ability with users that exclusively have a single role
2015-03-13 00:43:09 +01:00
Gopesh Tulsyan
dc05cc83ac Merge pull request #580 from openSUSE/refactor_email_settings
Refactor Admin Email Settings Form
2015-01-22 00:49:19 +05:30
Stella
80fbc144ac remove user deletion until further notice 2015-01-18 22:01:05 +02:00
Gopesh Tulsyan
6afb1ee4a9 Fixing tests for email settings template
Refactor

Refactor
2015-01-17 21:17:39 +05:30
Henne Vogelsang
b65a33f047 Merge pull request #560 from hennevogel/feature-user-view
Various small UI fixes
2014-12-09 15:52:44 +01:00
Henne Vogelsang
e9456be31a Merge pull request #554 from differentreality/cfp_dates
cfp validations
2014-12-05 16:25:10 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Stella
99d50ea91e campaign spec 2014-11-30 18:34:39 +02:00
Stella
5fb7e5cbef an error spec 2014-11-30 17:11:55 +02:00
Stella
6e026746a9 validate cfp start_date before end_date and end_date before conference.end_date 2014-11-29 20:00:26 +02: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
Christian Bruckmayer
97bf86454e Merge pull request #518 from ChrisBr/lodgings
Refactoring admin lodging menu
2014-11-12 12:47:30 +01:00