Commit graph

1601 commits

Author SHA1 Message Date
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
Henne Vogelsang
10ef898a0d Merge pull request #872 from sonalkr132/proposal-after-cfp
Allow submission of proposal only if program has cfp
2016-03-23 16:34:12 +01:00
Henne Vogelsang
dae847bdca Merge pull request #901 from sonalkr132/show-destory-registration-test
Add test for conference registration controller show and destroy action
2016-03-23 16:27:50 +01:00
Christian Bruckmayer
f66321a744 Merge pull request #891 from differentreality/translation_readme
Add a readme file for translation
2016-03-23 08:12:39 -06:00
Aditya Prakash
19157ac81d Add test for conference registration controller show and destroy action
After failed delete, user should be redirected to registration show and not
root.
2016-03-23 11:42:40 +05:30
Henne Vogelsang
80a06b99b4 Merge pull request #894 from differentreality/comments
rewrite comments form, use strong parameters with comments
2016-03-22 18:26:38 +01:00
Henne Vogelsang
70d27b6a26 Merge pull request #898 from sonalkr132/edit-update-registration-test
Add test for conference registration controller edit and update action
2016-03-22 18:25:31 +01:00
Henne Vogelsang
5a4c6075ae Merge pull request #899 from sonalkr132/sponser-test
Add sponsership levels test
2016-03-22 18:24:39 +01:00
Aditya Prakash
53f732ce9c Add model test for sponsership_level 2016-03-22 18:38:42 +05:30
Aditya Prakash
6a6824cef1 Add sponsership levels controller tests 2016-03-22 18:17:14 +05:30
Stella Rouzi
971018882a Add a readme file for translation 2016-03-22 14:44:14 +02:00
Stella Rouzi
3a167ef428 Merge pull request #897 from 4bic/4bic-patch-1
Update routes.rb
2016-03-22 14:10:57 +02:00
Aditya Prakash
b41d2bd5c1 Add test for conference registration controller edit and update action 2016-03-22 17:13:15 +05:30
robin kiplangat
72c068203b Update routes.rb
removed index get '/stats' => 'stats#index' as it references to a non-existent statscontroller
2016-03-22 12:40:26 +03:00
Henne Vogelsang
2f15309f0c Merge pull request #895 from 4bic/patch-1
Update INSTALL.md
2016-03-21 12:12:43 +01:00
robin kiplangat
e3e2312311 Update INSTALL.md 2016-03-21 10:43:12 +03:00
Stella Rouzi
3f882957cf rewrite comments form, use strong parameters with comments 2016-03-20 19:06:12 +02:00
Christian Bruckmayer
a9fb07cadb Merge pull request #889 from rishabhs95/admin-tickets-view
correcting ticket's details view for admin.
2016-03-18 14:34:24 -06:00
Rishabh Saxena
99afc456cd correcting ticket's details view and its related models. 2016-03-19 01:52:38 +05:30
Christian Bruckmayer
3ad009658d Merge pull request #836 from davidsf/fix_email_send
Fix send emails because missing event program relation.
2016-03-18 11:18:59 -06:00
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Henne Vogelsang
835236ed7f Merge pull request #885 from sonalkr132/registration-model-tests
Add model test for registration
2016-03-17 13:32:01 +01:00
Aditya Prakash
07d674ee2b Add model test for registration 2016-03-17 14:37:30 +05:30
Christian Bruckmayer
9e67a1bcd5 Merge pull request #876 from rishabhs95/delete-tickets-unregistered
Destroying tickets belonging to a user after user unregisters from a conference
2016-03-16 12:54:21 -06:00
Rishabh Saxena
8334619029 callback for destroying registration and writing tests for it
writing tests for deleting tickets after unregistering

removing code duplication in tests
2016-03-16 23:31:57 +05:30
Christian Bruckmayer
6cde2a5f4a Merge pull request #858 from nishanthvijayan/refactor-redirect-flash
Add flash type error.Rewrite controllers to use common flash style wi…
2016-03-16 08:19:43 -06:00
Henne Vogelsang
9df53016ec Merge pull request #884 from nishanthvijayan/remove-role-datatable
Remove datatable functionality from Roles index table.
2016-03-16 10:25:53 +01:00
Nishanth Vijayan
fd64db575b Remove datatable functionality from Roles index table.
The table in roles#index view has no need of datatable features as the number of roles is just 4.
2016-03-16 12:09:58 +05:30
Nishanth Vijayan
1c1e56ed46 Change update/save failures to use flash type :error instead of :alert 2016-03-16 11:20:56 +05:30
Nishanth Vijayan
19c54bd935 Change all redirect_to(path) to redirect path for uniformity 2016-03-16 09:17:41 +05:30
Nishanth Vijayan
434eb90b76 Add flash type error.Rewrite controllers to use common flash style with redirect_to 2016-03-16 09:17:41 +05:30
Christian Bruckmayer
dcdceb7c6d Merge pull request #882 from rishabhs95/events-datatable
enabling state save feature in datatables
2016-03-15 16:38:54 -06:00
Christian Bruckmayer
52ec94588f Merge pull request #826 from differentreality/users_show_controller_test
Add controller test for users#show
2016-03-15 15:21:00 -06:00
Christian Bruckmayer
6c0d436c54 Merge pull request #873 from sonalkr132/edit-schedule-event
Fix edit and schedule buttons on proposal show page
2016-03-15 15:19:18 -06:00
Christian Bruckmayer
9656fd17c2 Merge pull request #880 from nishanthvijayan/fix-api-serializers
Update active_model_serializers.Fix conference serializer and api tests
2016-03-15 15:17:57 -06:00
Rishabh Saxena
d06a77ae76 enabling state save feature in datatables 2016-03-15 19:08:57 +05:30
Nishanth Vijayan
3da04c0f7c Update active_model_serializers.Fix conference serializer and api tests
The controllers are not using the serializers, because of a bug in active_model_serializer.
Hence the update.API tests are fixed to work with the new API response structure.
Fixes bugs in conference serializer.
2016-03-15 12:38:13 +05:30
Christian Bruckmayer
d2cfb56ea5 Merge pull request #875 from nishanthvijayan/fix-api-rooms
Fix API endpoints conferences/id/rooms/ & tracks/ issue
2016-03-14 13:45:35 -06:00
Nishanth Vijayan
864245fec2 Add specs for api/v1/rooms_controller & api/v1/tracks_controller
and cleanup api/v1/tracks and api/v1/rooms controllers
2016-03-15 00:57:15 +05:30
Nishanth Vijayan
55cfc8ff60 Fix API endpoints conferences/id/rooms/ & tracks/ issue #874 2016-03-14 20:14:54 +05:30
Henne Vogelsang
cb9cf0359b Merge pull request #854 from sonalkr132/test-user-admin
Enforce non-admin attribute of user factory
2016-03-14 15:19:05 +01:00
Aditya Prakash
d2b392e119 Remove assumption from test that first user is admin 2016-03-14 17:29:35 +05:30
Aditya Prakash
0619eb7963 Enforce non-admin attribute of user factory
Change in other specs to match the new factory setup.
2016-03-14 17:29:33 +05:30
Henne Vogelsang
66e17d5ac5 Merge pull request #865 from Ana06/master
Name attribute in registration email not set
2016-03-14 12:14:19 +01:00
Aditya Prakash
dd159c5555 Fix edit and schedule buttons on proposal show page 2016-03-13 18:51:08 +05:30
Ana
8ae7155218 #name test added 2016-03-13 01:37:11 +01:00
Stella Rouzi
21d9e126f2 Add controller test for users#show 2016-03-11 23:13:52 +02:00
Ana
922e94649d overriding the #name attribute 2016-03-10 22:49:54 +01:00
Christian Bruckmayer
b18e302224 Merge pull request #852 from differentreality/programs_typo
Fix variable @program typo in programs#show
2016-03-10 15:51:29 +01:00
Henne Vogelsang
62bc035e53 Merge pull request #862 from ChrisBr/ichain
Fixes for production errors
2016-03-10 15:28:12 +01:00