gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1580 commits 2 branches 2 tags 50 MiB
Commit graph

1580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aditya Prakash
19855d9cba Merge 7822a8d4e3 into 6cde2a5f4a 2016-03-16 15:54:10 +00:00
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
Aditya Prakash
7822a8d4e3 Do not allow signed in users to registor unless registration is open 2016-03-14 23:38:55 +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
Aditya Prakash
7e4d91adaf Improvements in registration specs 
Check for true and not truthy in registration model spec.
Cover general cases in conf registration controller.
Add test for flash in new action when ichain is set and user is not signed in.
 2016-03-12 17:58:14 +05:30
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
Aditya Prakash
5bff60ec7d Tests for ConferenceRegistrations controller 
Authorization needs to be done first or else it will give
CanCan::AuthorizationNotPerformed error for some of branches.
Removed if condition is dead code.
Small fix in flash message of destroy and its feature test.
 2016-03-11 03:06:00 +05:30
Aditya Prakash
13a6586f81 Tests for registration model 
Before registration we need to make sure that conference has registration_period
 2016-03-11 03:06:00 +05:30
Aditya Prakash
c71d15565e 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-11 03:06:00 +05:30
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
Henne Vogelsang
15ba6449ea Merge pull request #863 from ChrisBr/config 
Remove duplicate delivery_method config option
 2016-03-10 15:24:03 +01:00
Christian Bruckmayer
2f23ba2fd3 Remove duplicate delivery_method config option 2016-03-10 15:06:59 +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
Henne Vogelsang
18645081ac Merge pull request #861 from sonalkr132/admin-proposal-overflow 
Fix overflow of proposal edit in admin area
 2016-03-10 14:48:56 +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
36f3730846 Adopt the schema to latest migration 2016-03-09 15:12:53 +01:00
Henne Vogelsang
9c2ef19741 Don't require support/external_request from rake tasks 
If we require this we're requiring everything that
support/external_request requires for production.
 2016-03-09 13:34:54 +01:00
Henne Vogelsang
fd8dbfe7a7 Fix autloading of webmock/rspec in production 
Autoload apparently also load spec/ which requires
webmock/rspec which was not installed in production
 2016-03-09 12:03:27 +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
1990d3a1ad Merge pull request #837 from sonalkr132/room-ticket-tests 
Tests for room model and controller
 2016-03-09 12:04:12 +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
Henne Vogelsang
877402e837 Merge pull request #849 from nishanthvijayan/fix-markdown-editor-assetgem 
Fix markdown editors bug #811 using asset gem.
 2016-03-08 18:06:35 +01:00
Nishanth Vijayan
f713d1eac5 Check installed Bundler version 2016-03-08 21:14:44 +05:30
Nishanth Vijayan
34e8dade05 Enforce min bundler version required by rails-assets 2016-03-08 19:20:35 +05:30