Christian Bruckmayer
ae917abbc6
Merge pull request #913 from nishanthvijayan/fix-schedule-rooms
...
Mark Events without a room as unscheduled events
2016-03-29 11:18:19 -06:00
Justin Harrison
96cf00fda6
Remove registrations view test
...
View tests don't provide much security, and add too much overhead for what they do secure
2016-03-29 13:14:42 -04:00
Christian Bruckmayer
4b5fce4203
Merge pull request #925 from davidsf/fix_conf_registration_show
...
Fix route link in conference_registration.show
2016-03-29 10:42:35 -06:00
Justin Harrison
18b1ad2b70
More efficient listing of roles
...
Reduces number of loops from 2 to 1.
2016-03-29 12:04:48 -04:00
David Sedeño
adf7e0149a
Fix conference program proposal link in conference_registration.show. fix #924
2016-03-28 23:18:35 +02:00
Stella Rouzi
11bae37cc4
Merge pull request #866 from nishanthvijayan/fix-roles-autodeletion
...
Add before_destroy callback to cancel role destroy.solves #864
2016-03-28 22:57:38 +03:00
Aditya Prakash
459a281230
Add test for email_settings model
2016-03-28 20:29:19 +05:30
Nishanth Vijayan
77649d73a6
Add model test to verify role is not deleted on removing all of its users
2016-03-28 19:51:20 +05:30
Nishanth Vijayan
3129c196fa
Add rake task to re-add deleted roles from all conferences
2016-03-28 19:49:59 +05:30
Nishanth Vijayan
48b48e88ac
Add before_destroy :cancel to precent role destroy.Change Conference-Role association to have dependent: :destroy_all
2016-03-28 19:49:59 +05:30
Stella Rouzi
2df6d1039f
Merge pull request #916 from nishanthvijayan/eventattach-routes-cleanup
...
Remove leftover from event_attachment in routes
2016-03-28 16:10:56 +03:00
Shriyansh
70b8fca197
Made use of Rails I18n data format in EventSerializer #598
2016-03-27 20:03:33 +05:30
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
Justin Harrison
7c38622e8f
Display roles in registration list
2016-03-26 13:25:54 -04:00
Nishanth Vijayan
53555d5efa
Remove leftover from event_attachment in routes
2016-03-26 15:49:23 +05:30
Nishanth Vijayan
88a1197b12
Mark Events without room as unscheduled events
2016-03-26 00:40:44 +05:30
Aditya Prakash
e851c0b4ff
Add authorization rule for create user by unsigned user
...
Add authorization to failed user save path cause it was complaining
that no authorization was performed in that path.
2016-03-24 17:42:00 +05:30
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
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
