Rob Smith
8384f7a00e
Merge b9a2a80a75 into 24f0625be1
2016-01-13 11:13:04 +00:00
Christian Bruckmayer
24f0625be1
Merge pull request #738 from ChrisBr/update_rails
...
Update several gems
2016-01-13 10:56:01 +01:00
Christian Bruckmayer
64396c9786
Update rails gem to 4.1.14
...
Fix CVE-2015-3227
Fix CVE-2015-3226
2016-01-13 10:35:16 +01:00
Christian Bruckmayer
66d4e6e833
Update jquery-rails
...
To fix CVE-2015-1840 reported by Hakiri.io
2016-01-13 10:35:16 +01:00
Christian Bruckmayer
81a43cc2b6
Raise exception on XSRF fail
...
Reported by hakiri.io
2016-01-13 10:35:16 +01:00
Christian Bruckmayer
c5c3a903fc
Update paperclip to 4.3.2
...
To fix CVE-2015-2963
2016-01-13 10:35:16 +01:00
Stella Rouzi
056df982b8
Merge pull request #719 from differentreality/strong_parameters
...
Introduce strong parameters
2016-01-13 11:21:42 +02:00
Stella Rouzi
355ecc0ac6
Introduce strong parameters
2015-12-23 11:36:50 +02:00
Henne Vogelsang
38bc2e3c3a
Merge pull request #736 from ChrisBr/vagrant
...
Setup vagrant file for development
2015-12-08 15:13:53 +01:00
Christian Bruckmayer
f3549a21d9
Setup vagrant file for development
2015-12-07 15:06:04 +01:00
Henne Vogelsang
6e9a8bbd59
Merge pull request #717 from AndrewKvalheim/shoulda-spring
...
Use recommended method for installing Shoulda Matchers with Spring.
2015-10-27 09:09:10 +01:00
Henne Vogelsang
61b3383129
Merge pull request #715 from raluka/emailsettings_datatable
...
Issue #603 : Refactor EmailSettings attributes
2015-10-27 09:05:01 +01:00
Andrew Kvalheim
e593c1d1fb
Apply recommendation from thoughtbot/shoulda-matchers@a5623e7 .
2015-10-14 09:26:36 -07:00
raluka
9eb47bd3f0
merged from upstream
2015-10-14 16:02:40 +02:00
raluka
3d57203727
added more consistency for email_settings
2015-10-14 15:34:23 +02:00
Stella Rouzi
2e692f7ea5
Merge pull request #705 from altsalt/master
...
added Voted? column to admin/events view
2015-10-14 14:31:30 +03:00
Henne Vogelsang
5da91c0498
Merge pull request #713 from raluka/postalcode
...
Postalcode requires number - not anymore!
2015-10-14 13:20:27 +02:00
raluka
3d91029afc
now reverting migration will raise AR error
2015-10-14 11:53:48 +02:00
Stella Rouzi
ce6495b7ac
Merge pull request #711 from differentreality/grooming
...
Syntax style + code groomming
2015-10-14 12:50:29 +03:00
raluka
002f8b1bcd
rolled back for postalcode pull request
2015-10-14 11:34:14 +02:00
raluka
e3fa414a5c
made migration irreversible
2015-10-12 11:58:16 +02:00
Rob Smith
b9a2a80a75
Support JSONP exports of conference schedules for embedding
...
Currently, it's rather difficult to use OSEM and embed a schedule into another website. We currently use OSEM for the backend, but still use a different system for our main site. This change allows us to dynamically embed the schedule in our main website as well as allow us a simple way to get data for the use in mobile applications or similar.
This limits the JSONP support to only GETS on json formatted requests. This prevents any XSS even though we don't require a authenticity token.
2015-10-09 22:28:45 -07:00
Stella Rouzi
759aa54689
Syntax style + code groomming
2015-10-06 14:15:38 +03:00
raluka
0c4b0b4ac1
Refactored EmailSetting incosistency. Fixes #603
2015-10-06 11:32:40 +02:00
raluka
f9c41cf670
Merged from upstream
2015-10-05 16:56:11 +02:00
Henne Vogelsang
eface6a91b
Merge pull request #699 from raluka/view_comment_notification
...
comment notification
2015-10-05 14:14:31 +02:00
raluka
1cf877bf76
grooming style
2015-10-05 13:28:35 +02:00
raluka
fd709ed4c0
Issue #686 : Postalcode requires number
2015-10-05 13:08:02 +02:00
raluka
f7c70ba55c
updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper
2015-09-21 15:56:57 +02:00
raluka
5790d99fac
Merge branch 'view_comment_notification' of https://github.com/raluka/osem into view_comment_notification
2015-09-17 12:26:19 +02:00
raluka
1b63728440
Grooming conference.rb to fix rubocop offenses
2015-09-17 12:23:01 +02:00
raluka
f294316cba
added comments to explain comments_controller
2015-09-17 12:13:22 +02:00
raluka
1fb1071feb
moved comment instance into before block
2015-09-17 12:13:22 +02:00
raluka
f3996a9bff
added extra condition for view Create Conference link
2015-09-17 12:13:22 +02:00
raluka
37339dccc1
refactored comments_controller tests; fixed access to Administration link into user_menu view
2015-09-17 12:13:22 +02:00
raluka
a9a43d726f
WIP created tests for comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
208478ff2d
added pretty view for comments
2015-09-17 12:13:22 +02:00
raluka
21c10166ec
added test file for comments_controller WIP
2015-09-17 12:13:22 +02:00
raluka
945bac1fe8
WIP modified CommentsController#index
2015-09-17 12:13:22 +02:00
raluka
bc67cac873
sorting comments after event title and created at in index
2015-09-17 12:13:22 +02:00
raluka
8dd0ac7c1d
rewrite CommentsController#index to have everything in one call
2015-09-17 12:13:22 +02:00
raluka
1addae9cd9
WIP changed CommentsController#index; temporary view for all_comments
2015-09-17 12:13:22 +02:00
raluka
7ba3cfd473
event title and conference title in 2 different lines now in view
2015-09-17 12:13:22 +02:00
raluka
cd2a52023b
changed comments helper to proper return unread comments available for current_user
2015-09-17 12:13:22 +02:00
raluka
0c39590f2e
fixed Administration link in user_menu dropdown
2015-09-17 12:13:22 +02:00
raluka
800a41b3f9
added logic for available conferences based on roles in comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
52a503afd2
changed #signed_in_with_roles(user) in ability.rb model
2015-09-17 12:13:21 +02:00
raluka
df29484317
changed wrong test for ability
2015-09-17 12:13:21 +02:00
raluka
74dcd75a8c
created can_manage_comments helper for rendering button
2015-09-17 12:13:21 +02:00
raluka
e10a2491d3
created tests for user ability
2015-09-17 12:13:21 +02:00
