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
1658 commits 15 branches 2 tags 50 MiB
Commit graph

1658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
7b40f3ceb6 Update poltergeist 2016-04-05 13:43:52 +02:00
Henne Vogelsang
a79193f7af Switch to ruby 2.2.3 2016-04-05 13:43:52 +02:00
Henne Vogelsang
779004e7e3 Switch travis to trusty builds 
https://docs.travis-ci.com/user/trusty-ci-environment/
 2016-04-05 13:43:52 +02:00
Henne Vogelsang
fa8d0a993c Update phantomjs to latest version 2016-04-05 13:43:52 +02:00
Henne Vogelsang
39746fe847 Merge pull request #940 from nishanthvijayan/api-conference-test 
Add tests for api/v1/conferences_controller
 2016-04-05 11:46:31 +02:00
Henne Vogelsang
ad77bea1db Merge pull request #944 from sonalkr132/serializers-test 
Serializers test
 2016-04-05 11:40:26 +02:00
Nishanth Vijayan
5587f1dc14 Add tests for api/v1/conferences_controller 2016-04-03 16:02:34 +05:30
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
ca4ca21fdf Add SpeakerSerializer tests 2016-04-03 00:59:30 +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
Aditya Prakash
a786321800 Add room and track serilizer tests 2016-04-02 21:00:29 +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
c8481aef5d Merge pull request #936 from sonalkr132/hakiri-fix 
Update for security warning on hakiri
 2016-04-01 15:15:02 +02:00
Henne Vogelsang
7acd5d66e7 Merge pull request #935 from sonalkr132/update-simplecov 
Update coverall to 0.8.13
 2016-04-01 15:14:36 +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
Aditya Prakash
6f0bdebed4 Update uglifier to 3.0.0 
The upstream library for the Ruby uglifier gem, UglifyJS, is
affected by a vulnerability that allows a specially crafted
Javascript file to have altered functionality after minification.
See on Hakiri: https://hakiri.io/github/openSUSE/osem/master/e0ec57b0dcf080bdb9e9b254f2362c52c7657b07/warnings?name=Code+Injection

Uglifier 3 dropped support of ruby 1.8
 2016-04-01 09:22:01 +05:30
Aditya Prakash
e0ec57b0dc Update coverall to 0.8.13 2016-04-01 08:27:33 +05:30
Nishanth Vijayan
11b96412a0 Remove unused call_for_paper model and controller files 2016-04-01 01:43:06 +05:30
Nishanth Vijayan
ead39ebacf Add tests to check commercials #create,#update fails on invaid data 2016-04-01 00:34:39 +05:30
CamilleM
2c7eec1cd4 Adding details to handle strings with dynamic inline contents 2016-03-31 16:51:44 +02:00
Nishanth Vijayan
f8822b8745 Add tests for api/v1/events_controller and api/v1/speakers_controller 2016-03-31 17:22: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
Henne Vogelsang
12026b1a66 Merge pull request #929 from sonalkr132/rubocop-first 
Running rubocop first would give faster CI response for style offense
 2016-03-31 11:07:23 +02:00
Aditya Prakash
99c47a08ef Running rubocop first would give faster CI response for style offense 
Chekout:
https://travis-ci.org/openSUSE/osem/builds/118816901
https://travis-ci.org/openSUSE/osem/builds/117943633
https://travis-ci.org/openSUSE/osem/builds/116962415
https://travis-ci.org/openSUSE/osem/builds/116489044
 2016-03-30 23:07:12 +05:30
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
c349700e72 Merge pull request #917 from sonalkr132/email-setting-tests 
Add test for email_settings model
 2016-03-29 15:40:42 -06:00
Aditya Prakash
4129955835 Move hash merge in before block and add test for missing name 2016-03-29 23:10:19 +05:30
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