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

1418 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Bruckmayer
fb7ebab5a0 Merge pull request #757 from differentreality/fix_tests_756 
Fix failed tests of #756
 2016-01-21 17:32:36 +01:00
Stella Rouzi
152b59aade Fix failed tests of #756 2016-01-21 13:05:27 +02:00
Christian Bruckmayer
d7d851cb56 Merge pull request #752 from davidsf/titlepage_in_conference_show 
Conference title in conference show view. fix #751
 2016-01-21 11:25:07 +01:00
Christian Bruckmayer
1feba36d61 Merge pull request #756 from chinmaydd/date_fix 
Fixes Start date being greater than End date
 2016-01-21 09:08:35 +01:00
chinmaydd
4eafa43f7e Fixes Start date being greater than End date 2016-01-21 00:26:37 +05:30
David Sedeño
3095787aa7 Add title in conference show view. fix #751 2016-01-17 20:49:30 +01: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
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