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

1645 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Nishanth Vijayan
53555d5efa Remove leftover from event_attachment in routes 2016-03-26 15:49:23 +05:30
Nishanth Vijayan
88a1197b12 Mark Events without room as unscheduled events 2016-03-26 00:40:44 +05:30
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
Henne Vogelsang
dae847bdca Merge pull request #901 from sonalkr132/show-destory-registration-test 
Add test for conference registration controller show and destroy action
 2016-03-23 16:27:50 +01:00
Christian Bruckmayer
f66321a744 Merge pull request #891 from differentreality/translation_readme 
Add a readme file for translation
 2016-03-23 08:12:39 -06: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