gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1587 commits 15 branches 2 tags 50 MiB
Commit graph

1587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
3a167ef428 Merge pull request #897 from 4bic/4bic-patch-1 
Update routes.rb
 2016-03-22 14:10:57 +02:00
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
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
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
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