Christian Bruckmayer
86449eea67
Merge pull request #926 from sonalkr132/mailer-tests
...
Mailer fixes and tests
2016-04-08 11:43:03 -06:00
Henne Vogelsang
ad77bea1db
Merge pull request #944 from sonalkr132/serializers-test
...
Serializers test
2016-04-05 11:40:26 +02:00
Stella Rouzi
c7576af0ba
Merge pull request #934 from nishanthvijayan/remove_call_for_paper
...
Remove unused call_for_paper model and controller files
2016-04-03 12:12:54 +03:00
Aditya Prakash
d752cfdf7e
Add conference serializer tests and remove unused functions
2016-04-03 11:21:57 +05:30
Aditya Prakash
0aa36b470e
Add Eventserializer tests and fix undefined method `l' for Eventserializer
...
Solution of no method error pointed by @nishanthvijayan:
http://stackoverflow.com/a/11724935
2016-04-03 00:59:28 +05:30
Henne Vogelsang
80f63c7263
Switch back to leaflet-rails
...
The rails-assets version has too many issues with the asset pipeline
2016-04-01 16:15:52 +02:00
Henne Vogelsang
c4e782a90c
Merge pull request #931 from nishanthvijayan/fix-api-events-speakers
...
Fix api controllers events and speakers
2016-04-01 15:05:26 +02:00
Henne Vogelsang
5352d52157
Merge pull request #927 from nishanthvijayan/wrong-routes-links
...
Fix reference to non-existant route path in commercials_controller
2016-04-01 15:04:18 +02:00
Henne Vogelsang
5cbf105a68
Merge pull request #920 from camillem/master
...
Adding notranslate classes to ease translation of dynamic text
2016-04-01 14:51:50 +02:00
Henne Vogelsang
f56fc0052f
Merge pull request #907 from sonalkr132/proposal-test
...
Proposal controller improvements and test
2016-04-01 14:49:50 +02:00
Nishanth Vijayan
11b96412a0
Remove unused call_for_paper model and controller files
2016-04-01 01:43:06 +05:30
Aditya Prakash
d9db395ec6
Use each to iterate over array in mailer and fix comment link
...
*_url gives complete path with host
2016-03-31 22:59:12 +05:30
Nishanth Vijayan
22714b0f11
Fix api/v1/events and api/v1/speakers controllers
2016-03-31 17:22:12 +05:30
Nishanth Vijayan
bc5c5dd7ca
Fix reference to non-existant route path in commercials_controller
2016-03-31 15:57:20 +05:30
Aditya Prakash
c35270ad31
More sane branching in confirm action of proposal controller
2016-03-31 15:45:47 +05:30
Henne Vogelsang
39a850cc39
Merge pull request #918 from matthin/master
...
Display roles in registration list
2016-03-31 12:05:23 +02:00
Aditya Prakash
f4678e5415
Add proposal controller tests
2016-03-30 22:26:52 +05:30
Henne Vogelsang
6aedf2b03d
Merge pull request #904 from Shriyanshagro/master
...
Made use of Rails I18n data format in EventSerializer #598
2016-03-30 17:31:42 +02:00
Henne Vogelsang
483f1ccd85
Merge pull request #893 from nishanthvijayan/fix-tooltip-track
...
Proposal submitter should be asked to add track only if conf has track
2016-03-30 17:30:36 +02:00
Henne Vogelsang
1979c0d9c1
Merge pull request #886 from sonalkr132/auth-registration
...
Fix authorization of new and create in ConferenceRegistrationsController
2016-03-30 17:29:10 +02: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
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
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
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
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
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
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
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
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
Rishabh Saxena
d06a77ae76
enabling state save feature in datatables
2016-03-15 19:08:57 +05:30
