Commit graph

1016 commits

Author SHA1 Message Date
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
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
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
Aditya Prakash
dd159c5555 Fix edit and schedule buttons on proposal show page 2016-03-13 18:51:08 +05:30
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
Christian Bruckmayer
a6c89351c5 Make Comment find_since_last_login scope robust against nil value
to fix production ArgumentError: bad value for range. Fixes #807.
2016-03-10 15:04:14 +01:00
Christian Bruckmayer
55ab8a8e8f Set sign_in attributes on iChain login
Set last_sign_in_at and current_sign_in_at attributes when iChain login is enabled. #807
2016-03-10 15:04:02 +01:00
Aditya Prakash
afc58d3d85 Fix overflow of proposal edit in admin area 2016-03-10 17:42:09 +05:30
Stella Rouzi
fb4e8958e0 Fix variable @program typo in programs#show 2016-03-09 20:11:59 +02:00
Henne Vogelsang
976616b47b Protect root_path from forgery with null_session
Some proxies query OPTIONS for / to see if the page
is alive.
2016-03-09 15:12:58 +01:00
Henne Vogelsang
97ca07d142 Merge pull request #841 from chocoelho/unset_footer_fixed_height
Unset footer fixed height
2016-03-09 11:47:26 +01:00
Henne Vogelsang
0df693ffbf Merge pull request #820 from differentreality/update_rolify
update rolify
2016-03-09 11:32:52 +01:00
Stella Rouzi
782a1f071f Merge pull request #801 from sonalkr132/targets_test
Model and controller tests for Target
2016-03-09 12:13:53 +02:00
Stella Rouzi
e560d263c9 Merge pull request #838 from sonalkr132/ticket-tests
Tests for ticket model
2016-03-09 12:03:52 +02:00
Nishanth Vijayan
64b825cebe Fix markdown editors bug #811 using asset gem. 2016-03-08 16:50:30 +05:30
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02:00
Christian Bruckmayer
9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track
Feature: Add/change Track for Event
2016-03-07 17:12:33 +01:00
Christian Bruckmayer
feeac2a816 Merge pull request #846 from chocoelho/add_conference_email
Add conference email to splashscreen
2016-03-07 14:19:05 +01:00
Carlos Coelho
fda08ecdb5 Added email to social media section
related to #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-07 09:47:21 -03:00
Carlos Coelho
483d9a234e Verified contact has email or not
issue #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-07 09:43:55 -03:00
Rishabh Saxena
2c1db3bd2a Making datatable responsive in admin's users view. 2016-03-07 15:15:29 +05:30
Carlos Coelho
0336171e4a Unset footer fixed height
If footer is set to a fixed height, it makes some white block
between footer and bottom of page.

Its height should be resized according to footer content.

Related to #840

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-06 22:20:13 -03:00
Aditya Prakash
ebd01f064a Tests for ticket model
Change in error message of validation cause previously it was:
"Price currency Currency is different.."
`paid?` method returned true even when `ticket_purchases` is empty for
a given user.
2016-03-06 17:37:06 +05:30
Aditya Prakash
c219ffc9a3 Tests for Admin::Targets controller
Authorization in index action is not needed.
Fix failed delete flash error message.
2016-03-06 10:46:04 +05:30
Aditya Prakash
680d23a64a Tests for target model
created_at and due_date are preset cause we don't want it to depend
on system time.
2016-03-06 10:46:03 +05:30
David Sedeño
dd08b702b9 Add program relation in generate_event_mail. fix #835 2016-03-06 00:19:55 +01:00
David Sedeño
c9951b451a Fix send emails because missing event program relation. fix #835 2016-03-05 23:48:43 +01:00
Christian Bruckmayer
c5c392d4c7 Merge pull request #794 from differentreality/user_model_tests
Add tests for Event. Remove redundant function 'def week' from Event.
2016-03-05 13:45:39 +01:00
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02:00