Commit graph

43 commits

Author SHA1 Message Date
AEtherC0r3
efaf07178f Upgrade to Rails 5
Update config with rails app:update
Update schema.rb rails db:migrate
Add puma
Make jobs and models inherit from ApplicationJob and ApplicationRecord
Update acts_as_list to 0.9.7 in order to fix
"undefined method `sanitize_sql_hash_for_conditions'" error
Update web-console to 2.3.0 to fix a 500 internal server error
Replace before_filter with before_action
Add rails-controller-testing gem
Add prepend: :true to protect_from_forgery in ApplicationController to
avoid ActionController::InvalidAuthenticityToken exceptions
Remove activeuuid
Update formtastic to 3.1.5 to fix deprecation warnings and issues
with the Input class
Update ahoy_matey to 1.6.0
Update cancancan to 2.0.0 to fix issues with malformed sql queries
Fix program spec
Fix issue with the picture being nil in admin/Organizations#new and #edit
and Organizations#show
Fix ActiveRecord::Base.raise_in_transactional_callbacks= deprecation
warning by removing an unnecessary line in application.rb
Fix failing versions specs
2017-12-11 20:58:04 +02:00
Eugene Dubinin
b7bdb29cbe use flash.now instead of flash where page is rendered in the same controller methods 2017-04-03 20:15:51 +03:00
Ana
1d7f3207a6 Registrations dashbox eliminated from registrations 2016-06-25 15:36:33 +02:00
Ana
62c3ee1631 Statistics on top of Registrations#index 2016-06-25 14:39:45 +02:00
Stella Rouzi
9fe7d0ca7c Use strong parameters for user in admin/registrations#update 2016-05-02 18:02:57 +03:00
Stella Rouzi
6bcecbd219 fix admin/registrations#update 2016-05-02 17:38:55 +03:00
Nishanth Vijayan
19c54bd935 Change all redirect_to(path) to redirect path for uniformity 2016-03-16 09:17:41 +05:30
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
3df77c84f6 Issue#690: fixed Attendance Button 2015-07-15 12:44:08 +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
Stella
d44e1f7c24 flash alert to flash error 2014-11-30 15:41:47 +02:00
Stella
65c0cd7a73 an error 2014-11-30 15:19:19 +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
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
Stella Rouzi
17ebad413e base controller
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Artem Chernikov
056fe5ec3f Fix others additional lints 2014-07-21 15:05:58 +02:00
Stella Rouzi
fc753282d3 hound fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
9292b79c78 houndci fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Stella Rouzi
e921e4da22 new Ruby 1.9 hash syntax 2014-05-15 21:04:08 +03:00
Stella Rouzi
544146e7a9 houndci fixes 2014-05-15 20:55:27 +03:00
Stella Rouzi
7490316a5b resources :registrations 2014-05-15 20:30:01 +03:00
Chrisbr
fbda757e70 Replaced find_all_by through find_by
Find_by_all is removed in Rails 4.1
2014-04-27 16:27:29 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00
Ancor Gonzalez Sosa
bae0be338a Use render instead of redirect if registration/create fails 2013-07-16 16:03:36 +02:00
Ancor Gonzalez Sosa
243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended
Conflicts:
	app/controllers/admin/registrations_controller.rb
	app/models/registration.rb
2013-07-16 15:59:00 +02:00
Ancor Gonzalez Sosa
9af4393928 xlsx export for registrations list 2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
b9cd54a256 Fixing a bug introduced in f53af55a74 2013-07-15 16:07:23 +02:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00
differentreality
8f34baecf6 add nickname and affiliation in registrations list 2013-07-15 06:45:32 +03:00
differentreality
e4cc6f158f fix new registration, add check if user/person exists but is not registered 2013-07-14 14:39:40 +03:00
differentreality
6a951f1f21 wording in message 2013-07-12 20:37:57 +03:00
differentreality
c7f326765c move attended field left before edit 2013-07-12 19:30:51 +03:00
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
differentreality
19b11a79ff Edit registration for admin 2013-07-12 13:37:30 +03:00
differentreality
463430b3e8 Allow delete of registration only to admins (not organizers) 2013-07-12 13:37:30 +03:00
differentreality
6879ca28e5 add option to delete registration 2013-07-12 13:37:29 +03:00
differentreality
f53af55a74 add pagination, re-arrange view 2013-07-12 13:37:29 +03:00
Henne Vogelsang
252e1fe544 Completely rework the navigation
Get rid of the admin layout
Get rid of the navbar custom style, use bootstrap-sass variables instead
Get rid of all the scaffold files
2013-06-27 16:58:20 +02:00
Matt Barringer
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00