Commit graph

  • 46237a936a Merge pull request #787 from davidsf/fix_schedule_in_firefox Henne Vogelsang 2016-03-03 16:41:55 +01:00
  • fc609844d6 Better description to avoid sign up failures Chashmeet Singh 2016-03-03 19:46:16 +05:30
  • 492297770b Feature test for users#show Stella Rouzi 2016-03-03 14:28:14 +02:00
  • 6301072484 Add webmock for external requests in tests Aditya Prakash 2016-02-20 20:08:28 +05:30
  • 640be7497f Add config to allow running FactoryGirl lint before suit Aditya Prakash 2016-02-20 13:36:40 +05:30
  • f84150362b Move FactoryGirl.lint to rake task Aditya Prakash 2016-02-19 10:59:50 +05:30
  • a1ebaddb9e Merge 3931bec2e2 into eda5c2bc07 Chashmeet Singh 2016-03-01 18:38:57 +00:00
  • 3931bec2e2 identation fix Chashmeet Singh 2016-03-02 00:08:42 +05:30
  • ab26f48da5 Merge 96ee50bf9b into eda5c2bc07 Stella Rouzi 2016-03-01 17:05:07 +00:00
  • a23c376299 added flash type messages Chashmeet Singh 2016-03-01 22:14:11 +05:30
  • ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. Stella 2015-01-12 23:13:10 +02:00
  • 1b7c61e435 Merge 598606547e into eda5c2bc07 Aditya Chatterjee 2016-03-01 13:36:01 +00:00
  • 598606547e Flash uniformity done in a bunch of files Aditya Chatterjee 2016-03-01 18:58:41 +05:30
  • 1e9f4b514c update Aditya Chatterjee 2016-03-01 18:56:12 +05:30
  • 0ff08ba2bf Merge e0b1fec14d into eda5c2bc07 Chashmeet Singh 2016-03-01 12:29:32 +00:00
  • e0b1fec14d Redirect to root if conference over Chashmeet Singh 2016-03-01 17:59:25 +05:30
  • eda5c2bc07 Merge pull request #800 from sonalkr132/allow_future_date Christian Bruckmayer 2016-03-01 12:17:53 +01:00
  • 783365c59e Better description to avoid sign up failures Chashmeet Singh 2016-03-01 16:38:58 +05:30
  • a8b270f6e1 Merge pull request #803 from sonalkr132/update-rails Christian Bruckmayer 2016-03-01 10:28:20 +01:00
  • 3e146e159b Update rails to 4.2.5.2 Aditya Prakash 2016-03-01 14:40:47 +05:30
  • 0c6075dcc7 DRY datepicker function call Aditya Prakash 2016-02-29 16:54:51 +05:30
  • 04d5216c38 Allow selection of future dates on registration period page Aditya Prakash 2016-02-29 16:28:09 +05:30
  • dace1037bd Merge pull request #776 from sonalkr132/deprecation Christian Bruckmayer 2016-02-29 11:40:05 +01:00
  • 00b95333c8 Merge pull request #797 from AdiChat/AdiChat-Remove-d3 Christian Bruckmayer 2016-02-29 10:30:30 +01:00
  • b0bc54700b Ran bundle install AdiChat 2016-02-27 22:08:16 +05:30
  • f57edd1e35 Deleted d3_rails gem Aditya Chatterjee 2016-02-27 18:01:38 +05:30
  • a5a2db4077 update Aditya Chatterjee 2016-02-27 17:03:43 +05:30
  • 96ee50bf9b Add users#show view spec Stella Rouzi 2016-02-27 02:00:19 +02:00
  • 1313ac0a91 Update mina Henne Vogelsang 2016-02-25 15:40:51 +01:00
  • e6da13ed12 Merge ccc28cdc90 into 3b0eb1c407 Aditya Prakash 2016-02-25 14:20:26 +00:00
  • 3b0eb1c407 Merge pull request #788 from differentreality/registration_period_before_conference_end Henne Vogelsang 2016-02-25 15:20:17 +01:00
  • ccc28cdc90 Add test for QuestionsController Aditya Prakash 2016-02-25 12:36:35 +05:30
  • f567187d45 Add validations for registration_period Stella Rouzi 2016-02-21 23:38:17 +02:00
  • 68cc4a73d9 Merge pull request #790 from davidsf/fix_user_show Christian Bruckmayer 2016-02-22 22:51:31 +01:00
  • cdaf77d8b8 Add program to event relation in user/show. fix #789 David Sedeño 2016-02-22 22:20:19 +01:00
  • 1efdcdc4cf Fix gradient in schedule page in Firefox. fix #748 David Sedeño 2016-02-20 23:10:27 +01:00
  • 6460456202 Update Formtastic and formtastic-bootstrap Aditya Prakash 2016-02-12 23:38:43 +05:30
  • 5f035a7b38 Change in schema due to update of activerecord and activeuuid Aditya Prakash 2016-02-12 17:24:39 +05:30
  • cac3f817ef Remove deprecation warnings due to update of rails Aditya Prakash 2016-02-12 15:35:33 +05:30
  • ed0f55c45f Fix remaining rubocop problems Henne Vogelsang 2016-02-18 14:40:24 +01:00
  • 5565d8fb68 Don't limit travis to master Henne Vogelsang 2016-02-18 14:35:14 +01:00
  • e2fb83146a Merge pull request #768 from hennevogel/rubocop Henne Vogelsang 2016-02-18 14:08:04 +01:00
  • 8f42f79423 Merge pull request #769 from hennevogel/gems Henne Vogelsang 2016-02-18 14:03:35 +01:00
  • 405b614c43 Merge pull request #783 from davidsf/fix_proposal_confirmation Stella Rouzi 2016-02-18 14:00:02 +02:00
  • 73422735c0 Merge pull request #762 from davidsf/registration_limit Stella Rouzi 2016-02-18 13:55:16 +02:00
  • c654350423 Merge pull request #781 from davidsf/fix_repeated_day_in_splashpage Henne Vogelsang 2016-02-18 11:42:24 +01:00
  • fafdd6b9e2 Merge 622651c97b into 743dd6ef4d Aditya Prakash 2016-02-18 06:39:41 +00:00
  • 622651c97b Send notif only for build on canonical repo and enable build on all branches Aditya Prakash 2016-02-18 11:56:41 +05:30
  • 4783bc99b5 Fix error 500 in user proposal confirmation. fix #782 David Sedeño 2016-02-17 18:19:32 +01:00
  • a88bb4ea97 If the conference has only one day, not put the day twice in splashpage info. fix #780 David Sedeño 2016-02-16 23:00:11 +01:00
  • 743dd6ef4d Merge pull request #779 from sonalkr132/spring Henne Vogelsang 2016-02-17 11:55:59 +01:00
  • 67ac6f0d65 Update spring-commands-rspec and springify bin/rspec Aditya Prakash 2016-02-16 21:46:33 +05:30
  • 8d548eab62 Merge 7c0cd30dda into ed083be58b David Sedeño 2016-02-14 18:13:51 +00:00
  • ed083be58b Merge pull request #775 from sonalkr132/cache-bundler Christian Bruckmayer 2016-02-14 19:13:49 +01:00
  • cfea3af5ca Merge pull request #774 from davidsf/fix_title_in_layout Christian Bruckmayer 2016-02-14 19:13:38 +01:00
  • 7c0cd30dda Add venue_photos model and venue_photos admin controller in order to add more images to Venues and allow to delete it. David Sedeño 2016-02-13 17:12:03 +01:00
  • ba9a3e8afa Enable Bundler caching on travis Aditya Prakash 2016-02-12 14:30:00 +05:30
  • f3f40822b0 Put the config name as title in layouts. fix #773 David Sedeño 2016-02-11 21:56:15 +01:00
  • 28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 David Sedeño 2016-02-02 00:16:43 +01:00
  • 2034c0f965 Merge pull request #772 from davidsf/fix_schedule_event Henne Vogelsang 2016-02-09 13:43:35 +01:00
  • 00acf0c255 Fix room_params in scheduler update. fix #771 David Sedeño 2016-02-08 22:52:58 +01:00
  • bcacc7fd17 Merge pull request #765 from hennevogel/travis Henne Vogelsang 2016-02-08 15:55:07 +01:00
  • 27e8016cf2 Travis: Enable IRC notification, disable addons Henne Vogelsang 2016-02-08 13:07:47 +01:00
  • 919c69f7ae Fix new rubocop offense Henne Vogelsang 2016-02-08 14:56:37 +01:00
  • 046f726414 rubocop: Update todo file, enable rails cops Henne Vogelsang 2016-02-08 14:56:00 +01:00
  • 9135da3607 Update rubocop Henne Vogelsang 2016-02-08 14:57:01 +01:00
  • 09ec76a130 Switch javascript assets to rails-assets.org Henne Vogelsang 2016-02-06 19:19:53 +01:00
  • 3f7ccd7674 Update mysql2 gem Henne Vogelsang 2016-02-06 18:14:43 +01:00
  • 4e51e93ee3 Merge pull request #767 from hennevogel/fix_depreciation_warnings Henne Vogelsang 2016-02-08 13:50:36 +01:00
  • 75b4143bc4 Update factory_girl, silence deprecation warnings Henne Vogelsang 2016-02-08 12:43:52 +01:00
  • e28e1bf963 Merge pull request #766 from hennevogel/differentreality-fixes Henne Vogelsang 2016-02-08 13:34:55 +01:00
  • 6fa3864771 Fix CFP ability Henne Vogelsang 2016-02-08 12:50:58 +01:00
  • 8e324ac1af Fix showing a schedule without venue/rooms Henne Vogelsang 2016-02-06 18:15:11 +01:00
  • b0974af9d3 Merge ea17c0eacc into 813658fb19 Stella Rouzi 2016-02-06 16:47:55 +00:00
  • 813658fb19 rebase fixes for commercials path Stella Rouzi 2016-01-22 11:00:01 +02:00
  • a0d045e156 Remove attr_accessible from Program and Cfp, final fixes after introducing strong params Stella Rouzi 2016-01-13 14:15:12 +02:00
  • 62a7e724a2 Fix sqlite behavior with not null constraint, so that it works both for sqlite and mysql Stella Rouzi 2015-11-07 15:05:31 +02:00
  • f840f2b3f0 Rooms belong to venue Stella Rouzi 2015-11-07 11:43:36 +02:00
  • feabbfbc99 rebase against email settings changes Stella Rouzi 2015-10-29 14:03:34 +02:00
  • 444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels Stella Rouzi 2015-10-25 13:29:02 +02:00
  • 028b82fda8 Merge pull request #729 from differentreality/api Henne Vogelsang 2016-02-06 17:37:35 +01:00
  • 2607e1ecde Merge pull request #759 from ChrisBr/update_rails4.2 Christian Bruckmayer 2016-02-05 14:03:42 +01:00
  • 610d83d215 Merge pull request #763 from davidsf/hide_free_of_charge_msg Christian Bruckmayer 2016-02-02 22:20:10 +01:00
  • 302d45f91a If there are tickets for the conference, not show the msg about the free of charge. fix #745 David Sedeño 2016-02-02 21:19:14 +01:00
  • 09c5cec3da Enable travis artifacts Henne Vogelsang 2016-02-01 17:51:42 +01:00
  • 9e9c536946 Update rails to version 4.2 Christian Bruckmayer 2016-01-25 19:00:56 +01:00
  • 1da0647a58 Merge 04a437bdb0 into 57610eb39e raluca 2016-01-25 16:46:35 +00:00
  • 57610eb39e Merge pull request #716 from differentreality/abilities Christian Bruckmayer 2016-01-25 17:20:24 +01:00
  • 04a437bdb0 Rebased from upstream raluka 2016-01-22 16:24:53 +01:00
  • 48db99389e upgraded rails to 4.2 and dependencies. except rubocop raluka 2015-11-05 16:07:14 +01:00
  • ea17c0eacc rebase fixes for commercials path Stella Rouzi 2016-01-22 11:00:01 +02:00
  • c5a1ce0f30 Remove attr_accessible from Program and Cfp, final fixes after introducing strong params Stella Rouzi 2016-01-13 14:15:12 +02:00
  • 225ab2c91e Fix sqlite behavior with not null constraint, so that it works both for sqlite and mysql Stella Rouzi 2015-11-07 15:05:31 +02:00
  • 3c6ddb2f52 Rooms belong to venue Stella Rouzi 2015-11-07 11:43:36 +02:00
  • 1fcefafe64 rebase against email settings changes Stella Rouzi 2015-10-29 14:03:34 +02:00
  • 1e27b5f593 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels Stella Rouzi 2015-10-25 13:29:02 +02:00
  • 6be8d383b7 Remove unnecessary code Stella Rouzi 2015-11-07 22:55:09 +02:00
  • ecef151f91 API with more options, includes #712 Stella Rouzi 2015-10-25 00:36:23 +03:00
  • 28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new Christian Bruckmayer 2016-01-21 20:29:03 +01:00
  • 7f2728e619 Merge pull request #758 from ChrisBr/update_devise Christian Bruckmayer 2016-01-21 20:15:18 +01:00