Commit graph

  • e6905afc89 Update devise to 3.5.4 Christian Bruckmayer 2016-01-21 19:50:53 +01:00
  • 9114b275b8 Merge pull request #750 from differentreality/fix_hakiri_issue Christian Bruckmayer 2016-01-21 19:42:57 +01:00
  • 23664119bd Implement simplified commercials workflow chrisbr 2015-04-22 21:30:32 +02:00
  • 17a1c0e87c fix hakiri issue Stella Rouzi 2016-01-13 12:33:37 +02:00
  • fb7ebab5a0 Merge pull request #757 from differentreality/fix_tests_756 Christian Bruckmayer 2016-01-21 17:32:36 +01:00
  • 152b59aade Fix failed tests of #756 Stella Rouzi 2016-01-21 13:05:27 +02:00
  • d7d851cb56 Merge pull request #752 from davidsf/titlepage_in_conference_show Christian Bruckmayer 2016-01-21 11:25:07 +01:00
  • 1feba36d61 Merge pull request #756 from chinmaydd/date_fix Christian Bruckmayer 2016-01-21 09:08:35 +01:00
  • 4eafa43f7e Fixes Start date being greater than End date chinmaydd 2016-01-21 00:26:37 +05:30
  • 3095787aa7 Add title in conference show view. fix #751 David Sedeño 2016-01-17 20:49:30 +01:00
  • 8ffa8b1e86 Venue has show action, not index. Make the ability to schedule an Event more clear. Stella Rouzi 2015-10-15 20:25:34 +03:00
  • 8384f7a00e Merge b9a2a80a75 into 24f0625be1 Rob Smith 2016-01-13 11:13:04 +00:00
  • 24f0625be1 Merge pull request #738 from ChrisBr/update_rails Christian Bruckmayer 2016-01-13 10:56:01 +01:00
  • 64396c9786 Update rails gem to 4.1.14 Christian Bruckmayer 2015-12-22 17:06:37 +01:00
  • 66d4e6e833 Update jquery-rails Christian Bruckmayer 2015-12-08 16:15:08 +01:00
  • 81a43cc2b6 Raise exception on XSRF fail Christian Bruckmayer 2015-12-08 16:05:29 +01:00
  • c5c3a903fc Update paperclip to 4.3.2 Christian Bruckmayer 2015-12-08 15:56:18 +01:00
  • 056df982b8 Merge pull request #719 from differentreality/strong_parameters Stella Rouzi 2016-01-13 11:21:42 +02:00
  • 479eb6853a Merge a04df00bdc into 38bc2e3c3a Stella Rouzi 2016-01-10 17:00:08 +00:00
  • a04df00bdc Adds model and controller tests for Question. Stella Rouzi 2015-09-16 12:20:52 +03:00
  • e25425bd77 Questions: fixes, redesign form, fix edit error Stella Rouzi 2015-09-10 12:39:52 +03:00
  • 355ecc0ac6 Introduce strong parameters Stella Rouzi 2015-10-28 18:05:15 +02:00
  • 2eddbdb614 Merge fafc06dd6e into 38bc2e3c3a Stella Rouzi 2015-12-08 21:20:00 +00:00
  • 38bc2e3c3a Merge pull request #736 from ChrisBr/vagrant Henne Vogelsang 2015-12-08 15:13:53 +01:00
  • f3549a21d9 Setup vagrant file for development Christian Bruckmayer 2015-12-07 11:40:27 +01:00
  • 6e9a8bbd59 Merge pull request #717 from AndrewKvalheim/shoulda-spring Henne Vogelsang 2015-10-27 09:09:10 +01:00
  • 61b3383129 Merge pull request #715 from raluka/emailsettings_datatable Henne Vogelsang 2015-10-27 09:05:01 +01:00
  • fafc06dd6e fix hakiri warning Stella Rouzi 2015-10-25 12:28:50 +02:00
  • 2a077ecde9 Merge 51a012bb21 into 2e692f7ea5 raluca 2015-10-22 15:06:47 +00:00
  • 51a012bb21 rubocop files update and auto correction raluka 2015-10-21 17:33:53 +02:00
  • b1666fdc1e updated rails to 4.2.4 raluka 2015-09-17 12:12:51 +02:00
  • 2a30b076b8 rubocop files update and auto correction raluka 2015-10-21 17:33:53 +02:00
  • 42e8bb11ea updated rails to 4.2.4 raluka 2015-09-17 12:12:51 +02:00
  • f373766544 Merge 1f82fbbdc6 into 2e692f7ea5 raluca 2015-10-22 13:44:08 +00:00
  • 1f82fbbdc6 rubocop files update and auto correction raluka 2015-10-21 17:33:53 +02:00
  • 1a62dc930e updated rails to 4.2.4 raluka 2015-10-21 15:49:06 +02:00
  • 01086813af Style Stella Rouzi 2015-10-17 16:57:48 +03:00
  • e593c1d1fb Apply recommendation from thoughtbot/shoulda-matchers@a5623e7. Andrew Kvalheim 2015-10-11 23:10:01 -07:00
  • 9eb47bd3f0 merged from upstream raluka 2015-10-14 16:02:40 +02:00
  • 3d57203727 added more consistency for email_settings raluka 2015-10-14 15:34:23 +02:00
  • 5bef98b8a3 Merged from upstream raluka 2015-10-14 13:34:11 +02:00
  • 2e692f7ea5 Merge pull request #705 from altsalt/master Stella Rouzi 2015-10-14 14:31:30 +03:00
  • 5da91c0498 Merge pull request #713 from raluka/postalcode Henne Vogelsang 2015-10-14 13:20:27 +02:00
  • 3d91029afc now reverting migration will raise AR error raluka 2015-10-14 11:53:48 +02:00
  • ce6495b7ac Merge pull request #711 from differentreality/grooming Stella Rouzi 2015-10-14 12:50:29 +03:00
  • 002f8b1bcd rolled back for postalcode pull request raluka 2015-10-14 11:34:14 +02:00
  • e3fa414a5c made migration irreversible raluka 2015-10-12 11:58:16 +02:00
  • b9a2a80a75 Support JSONP exports of conference schedules for embedding Rob Smith 2015-10-09 22:28:45 -07:00
  • b1c131c524 Merge 58974d6914 into eface6a91b Christian Bruckmayer 2015-10-09 19:21:47 +00:00
  • 759aa54689 Syntax style + code groomming Stella Rouzi 2015-10-06 14:15:38 +03:00
  • 0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 raluka 2015-10-06 11:32:40 +02:00
  • 4319b559db Merge 40b517d209 into eface6a91b Sarah Julia Kriesch 2015-10-05 15:38:28 +00:00
  • f9c41cf670 Merged from upstream raluka 2015-10-05 16:56:11 +02:00
  • eface6a91b Merge pull request #699 from raluka/view_comment_notification Henne Vogelsang 2015-10-05 14:14:31 +02:00
  • 1cf877bf76 grooming style raluka 2015-10-05 13:28:35 +02:00
  • fd709ed4c0 Issue #686: Postalcode requires number raluka 2015-09-29 16:40:51 +02:00
  • f7c70ba55c updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper raluka 2015-09-21 15:56:57 +02:00
  • 5790d99fac Merge branch 'view_comment_notification' of https://github.com/raluka/osem into view_comment_notification raluka 2015-09-17 12:26:19 +02:00
  • 1b63728440 Grooming conference.rb to fix rubocop offenses raluka 2015-09-17 12:23:01 +02:00
  • f294316cba added comments to explain comments_controller raluka 2015-09-16 14:00:00 +02:00
  • 1fb1071feb moved comment instance into before block raluka 2015-09-16 13:29:52 +02:00
  • f3996a9bff added extra condition for view Create Conference link raluka 2015-09-16 12:23:45 +02:00
  • 37339dccc1 refactored comments_controller tests; fixed access to Administration link into user_menu view raluka 2015-09-15 12:39:36 +02:00
  • a9a43d726f WIP created tests for comments_controller.rb raluka 2015-09-14 18:50:21 +02:00
  • 208478ff2d added pretty view for comments raluka 2015-09-10 11:46:49 +02:00
  • 21c10166ec added test file for comments_controller WIP raluka 2015-09-09 16:50:07 +02:00
  • 945bac1fe8 WIP modified CommentsController#index raluka 2015-09-09 12:15:59 +02:00
  • bc67cac873 sorting comments after event title and created at in index raluka 2015-09-08 14:27:14 +02:00
  • 8dd0ac7c1d rewrite CommentsController#index to have everything in one call raluka 2015-09-08 12:15:22 +02:00
  • 1addae9cd9 WIP changed CommentsController#index; temporary view for all_comments raluka 2015-09-07 18:56:26 +02:00
  • 7ba3cfd473 event title and conference title in 2 different lines now in view raluka 2015-09-03 17:03:05 +02:00
  • cd2a52023b changed comments helper to proper return unread comments available for current_user raluka 2015-09-03 14:20:11 +02:00
  • 0c39590f2e fixed Administration link in user_menu dropdown raluka 2015-09-03 14:04:16 +02:00
  • 800a41b3f9 added logic for available conferences based on roles in comments_controller.rb raluka 2015-09-03 12:17:42 +02:00
  • 52a503afd2 changed #signed_in_with_roles(user) in ability.rb model raluka 2015-09-01 13:01:57 +02:00
  • df29484317 changed wrong test for ability raluka 2015-08-27 12:36:35 +02:00
  • 74dcd75a8c created can_manage_comments helper for rendering button raluka 2015-08-26 22:09:36 +02:00
  • e10a2491d3 created tests for user ability raluka 2015-08-26 13:07:13 +02:00
  • b780996128 created comments with FactoryGirl raluka 2015-08-25 14:41:09 +02:00
  • 6985493e5c unread_notifications has no longer assigned instance variable raluka 2015-08-24 17:44:24 +02:00
  • aa1ff51b58 small changes raluka 2015-08-24 17:17:29 +02:00
  • 35714f350e Issue#15: Added Comment Notifications: notification_emails and comments view raluka 2015-07-17 18:55:47 +02:00
  • 11bf53442c Grooming code to fix rubocop offenses raluka 2015-09-17 12:12:51 +02:00
  • 96e6adc71c added comments to explain comments_controller raluka 2015-09-16 14:00:00 +02:00
  • 4d745fb6e3 moved comment instance into before block raluka 2015-09-16 13:29:52 +02:00
  • e6480d2676 added extra condition for view Create Conference link raluka 2015-09-16 12:23:45 +02:00
  • 37697517df Merge pull request #710 from differentreality/fix_api Stella Rouzi 2015-09-16 10:45:09 +03:00
  • fb607050fe undo deletion of function, so that api works (/api/v1/conferences/) Stella Rouzi 2015-09-16 10:25:52 +03:00
  • 850782abee refactored comments_controller tests; fixed access to Administration link into user_menu view raluka 2015-09-15 12:39:36 +02:00
  • a8815aff5e WIP created tests for comments_controller.rb raluka 2015-09-14 18:50:21 +02:00
  • 81c4d1381c added pretty view for comments raluka 2015-09-10 11:46:49 +02:00
  • d365d5efa1 added test file for comments_controller WIP raluka 2015-09-09 16:50:07 +02:00
  • e5c235ac32 WIP modified CommentsController#index raluka 2015-09-09 12:15:59 +02:00
  • 932cb9984f sorting comments after event title and created at in index raluka 2015-09-08 14:27:14 +02:00
  • b762b82e74 rewrite CommentsController#index to have everything in one call raluka 2015-09-08 12:15:22 +02:00
  • 449d466f7d WIP changed CommentsController#index; temporary view for all_comments raluka 2015-09-07 18:56:26 +02:00
  • be55456c78 event title and conference title in 2 different lines now in view raluka 2015-09-03 17:03:05 +02:00
  • 55eddbfde7 changed comments helper to proper return unread comments available for current_user raluka 2015-09-03 14:20:11 +02:00
  • f3fa68e371 fixed Administration link in user_menu dropdown raluka 2015-09-03 14:04:16 +02:00
  • bcd8e41670 added logic for available conferences based on roles in comments_controller.rb raluka 2015-09-03 12:17:42 +02:00