Commit graph

  • 9e8621fb4d Update Bundle Henne Vogelsang 2016-05-20 13:27:43 +02:00
  • 6575bc10db Adapt the logo data migration task to carrierwave Henne Vogelsang 2016-05-19 15:48:27 +02:00
  • e83b2c3a90 Display sponsor pages only if sponsorship levels are defined Nishanth Vijayan 2016-05-16 01:08:06 +05:30
  • 02487be6fb Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings v1.0-beta Henne Vogelsang 2016-05-19 14:37:39 +02:00
  • ab91ec30b6 Merge b9db2ed1d4 into 81ddb76c24 Stella Rouzi 2016-05-19 10:04:21 +00:00
  • 81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees Henne Vogelsang 2016-05-19 12:03:43 +02:00
  • 6a127a29a3 Merge pull request #1001 from ChrisBr/ability Henne Vogelsang 2016-05-19 12:01:31 +02:00
  • afbffbf2b1 Merge pull request #1004 from ChrisBr/proposal_show Henne Vogelsang 2016-05-19 12:00:23 +02:00
  • 20be0f58ba Merge pull request #1005 from ChrisBr/ichain Henne Vogelsang 2016-05-19 12:00:10 +02:00
  • aa925f9f75 Hide Submit proposal if iChain is enabled and user is not logged in Christian Bruckmayer 2016-04-01 16:08:04 -06:00
  • 406e37a1d8 Adapt ability to allow proposal creation if cfp is open Christian Bruckmayer 2016-05-19 11:47:41 +02:00
  • 3540e35ff6 Merge 08624c5b53 into 5c4fba8b44 Christian Bruckmayer 2016-05-19 09:44:11 +00:00
  • acf5b6e8f2 Make proposal show view more robust Christian Bruckmayer 2016-05-19 10:40:27 +02:00
  • 5c4fba8b44 Merge pull request #999 from differentreality/user_bio_count Christian Bruckmayer 2016-05-19 10:19:29 +02:00
  • d152b5eddc Update paper_trail gem to latest Nishanth Vijayan 2016-05-18 20:17:35 +05:30
  • 13f0f9703d Replace usage of deprecated member_label option in forms with Array of label/value pairs Nishanth Vijayan 2016-05-17 18:17:04 +05:30
  • c00b04e9e8 Update htmlentities gem to remove duplicated key warning Nishanth Vijayan 2016-05-16 01:20:53 +05:30
  • 7135c0249d Merge pull request #1000 from nishanthvijayan/fix-ability-spec Christian Bruckmayer 2016-05-17 13:24:14 +02:00
  • 09b6e06a8c Fix ability model spec Nishanth Vijayan 2016-05-15 21:18:19 +05:30
  • 528243c8b9 Allow max_attendees to be nil Stella Rouzi 2016-05-15 14:01:30 +03:00
  • 50ab392c0f Fix bio length when nil in user#edit Stella Rouzi 2016-05-15 13:17:53 +03:00
  • b9db2ed1d4 Fix proposal#update so that it shows errors when trying to create user Stella Rouzi 2016-05-02 19:24:45 +03:00
  • 65ee166570 Merge pull request #977 from differentreality/fix_admin_registrations Christian Bruckmayer 2016-05-12 15:57:10 +02:00
  • 08624c5b53 Adapt ability to allow create a proposal if cfp is open Christian Bruckmayer 2016-04-01 15:37:28 -06:00
  • f4d41bd610 Hide Submit proposal if iChain is enabled and user is not logged in Christian Bruckmayer 2016-04-01 16:08:04 -06:00
  • 3d2e1f3219 Merge pull request #985 from hennevogel/feature_factories Christian Bruckmayer 2016-05-12 12:49:47 +02:00
  • 67a878839c Merge pull request #997 from Ana06/travel_schedule Christian Bruckmayer 2016-05-12 12:47:18 +02:00
  • 590790732d travel schedule problem fixed Ana 2016-05-11 16:40:04 +02:00
  • 738860374e Task for max_attendees to have a value when require_registration is set Stella Rouzi 2016-05-09 17:19:50 +03:00
  • 5149379424 Fix ichain sign in form Henne Vogelsang 2016-05-09 15:24:57 +02:00
  • be2221c57a Include .env.production in deploy Henne Vogelsang 2016-05-09 14:47:29 +02:00
  • e5928e4240 Merge pull request #990 from Ana06/patch-1 Stella Rouzi 2016-05-07 22:32:57 +03:00
  • d53c87fac3 Update TRANSLATION.md Ana María Martínez Gómez 2016-05-06 23:59:54 +02:00
  • 084ee7ef43 Give a bit more demo info in the conference description Henne Vogelsang 2016-05-03 14:13:45 +02:00
  • 5b20c992ae Let activerecord handle the picture upload in factories Henne Vogelsang 2016-05-03 12:13:23 +02:00
  • c876a2d1cf Assign a public id based on the picture name Henne Vogelsang 2016-05-02 18:06:24 +02:00
  • 4c4918a7a7 Somehow the :venues factory creates a dangling Conference Henne Vogelsang 2016-05-02 17:57:35 +02:00
  • 45bd31fad0 Escape HTML some factory strings Henne Vogelsang 2016-05-02 17:39:06 +02:00
  • c4e0a5312e More html escaping in factories Henne Vogelsang 2016-05-02 17:39:06 +02:00
  • ad0a8eecf2 Merge pull request #983 from hennevogel/blah Henne Vogelsang 2016-05-02 17:32:09 +02:00
  • d468c3d88b Drop the postdeploy script from app.json Henne Vogelsang 2016-05-02 17:28:07 +02:00
  • 22461449b4 Update app.json to include more variables and buildpacks Henne Vogelsang 2016-05-02 17:27:18 +02:00
  • 436aebfec0 Move factory_girl_rails out of groups too Henne Vogelsang 2016-05-02 17:07:45 +02:00
  • 9fe7d0ca7c Use strong parameters for user in admin/registrations#update Stella Rouzi 2016-05-02 18:02:57 +03:00
  • 6bcecbd219 fix admin/registrations#update Stella Rouzi 2016-05-01 18:50:07 +03:00
  • a1ac27fa58 Add Heroku generated app.json Henne Vogelsang 2016-05-02 16:24:08 +02:00
  • 12c5e3d512 Merge pull request #982 from hennevogel/feature_demo_data Henne Vogelsang 2016-05-02 16:19:16 +02:00
  • 8fa92b72d1 HTML escape Faker::Hipster.paragraph Henne Vogelsang 2016-05-02 15:56:40 +02:00
  • 40562334c7 Make rubocop happy again Henne Vogelsang 2016-05-02 15:30:22 +02:00
  • 73ce49de25 Use dynamic fake data in the spec Henne Vogelsang 2016-05-02 15:25:18 +02:00
  • 4d38305110 Program<->cfp is already a one to one relation Henne Vogelsang 2016-05-02 15:24:20 +02:00
  • 1c7becb69a use :full_conference factory in the conference view specs Henne Vogelsang 2016-05-02 15:21:45 +02:00
  • dd5796bd34 Fix saving feature failures to tmp/capybara Henne Vogelsang 2016-05-02 12:05:58 +02:00
  • 5e656e7d9f Add a rake task to create demo data Henne Vogelsang 2016-04-30 17:56:42 +02:00
  • 77e0340387 Make use of fake data in factories Henne Vogelsang 2016-04-30 17:56:23 +02:00
  • d1dbf67606 Merge pull request #979 from differentreality/javascript_load Christian Bruckmayer 2016-05-02 13:03:49 +02:00
  • 2b1aeafcd8 javascript load for user_biography Stella Rouzi 2016-05-01 19:16:19 +03:00
  • 9011ff6cb0 Merge pull request #975 from hennevogel/master Henne Vogelsang 2016-04-30 17:58:16 +02:00
  • 737a9d4808 Add faker gem, don't require rubocop Henne Vogelsang 2016-04-29 17:19:23 +02:00
  • 1fd029cb66 Mention the data:migrate:config2dotenv during boot Henne Vogelsang 2016-04-29 17:07:50 +02:00
  • ac0659d9c6 Merge pull request #900 from openSUSE/demo Henne Vogelsang 2016-04-29 16:51:26 +02:00
  • 332b309dd5 Document CLOUDINARY_URL Henne Vogelsang 2016-04-29 16:40:15 +02:00
  • 78501b17ca Rake task to migrate config.yml to a dotenv file Henne Vogelsang 2016-04-29 16:34:30 +02:00
  • 14a9d701f7 If operating on a env variable make sure its there Henne Vogelsang 2016-04-29 16:32:05 +02:00
  • f97e271566 Fix some typos Henne Vogelsang 2016-04-29 14:36:40 +02:00
  • 5b0202c052 Expand and document SMTP configuration Henne Vogelsang 2016-04-22 17:11:18 +02:00
  • beac27405e Use the environment for ActionMailer configuration Henne Vogelsang 2016-04-22 16:30:01 +02:00
  • d79a9b6fc1 Make use of dotenv Henne Vogelsang 2016-04-22 16:14:41 +02:00
  • fee8adba4b Also set a default secret_key_base in test env Henne Vogelsang 2016-03-23 11:49:30 +01:00
  • 64830e9cff Don't read config.yml anymore Henne Vogelsang 2016-03-22 18:16:51 +01:00
  • ebcb2780cd Configure OSEM via environment variables Henne Vogelsang 2016-03-22 18:14:40 +01:00
  • 45c31f210f Drop config/config.yml.example. Not needed anymore Henne Vogelsang 2016-03-22 18:09:18 +01:00
  • d532016312 Get config.yml/secrets.yml out of travis/vagrant Henne Vogelsang 2016-03-22 18:08:17 +01:00
  • bd36ce0fb2 Switch logic for linting factories Henne Vogelsang 2016-03-22 17:53:49 +01:00
  • 3ce62979bd Merge pull request #970 from hennevogel/feature_cloudinary Henne Vogelsang 2016-04-29 16:36:01 +02:00
  • 6a41243536 Merge pull request #971 from sonalkr132/doc-fix Henne Vogelsang 2016-04-29 14:03:22 +02:00
  • 2710f32792 Fix recurring spelling [ci skip] sonalkr132 2016-04-28 19:21:54 +05:30
  • 8fc57e34c9 Adapt the spec Henne Vogelsang 2016-04-27 17:34:17 +02:00
  • 86896cc46b And finally make use of Cloudinary if it's configured Henne Vogelsang 2016-04-27 16:40:23 +02:00
  • de486dc621 Oh My God. Close your eyes! Henne Vogelsang 2016-04-27 16:12:56 +02:00
  • a852a3b4a5 Protect us from too large images Henne Vogelsang 2016-04-27 16:03:29 +02:00
  • 2a4de3e869 Use PictureUploader on Venue Henne Vogelsang 2016-04-27 15:59:34 +02:00
  • f1f5fc1cd4 Use PictureUploader on Sponsor Henne Vogelsang 2016-04-27 15:55:39 +02:00
  • 0ad3ff01c3 Use PictureUploader on Lodging Henne Vogelsang 2016-04-27 15:27:33 +02:00
  • 40023044af Use PictureUploader on Conference Henne Vogelsang 2016-04-27 15:17:12 +02:00
  • cea9081347 A paperclip compatible carrierwave uploader Henne Vogelsang 2016-04-27 15:09:31 +02:00
  • e3c457267c Also require mini_magick for image manipulation Henne Vogelsang 2016-04-27 15:04:15 +02:00
  • d55d206b93 Switch to carrierwave for upload management Henne Vogelsang 2016-04-27 12:38:37 +02:00
  • ae55c2772f Remove danging :photos table and other photo cruft Henne Vogelsang 2016-04-27 12:36:38 +02:00
  • 1ce834391a Add cloudinary gem, fix some Gemfile comments Henne Vogelsang 2016-04-27 11:48:12 +02:00
  • 5b9da3ef22 Merge pull request #968 from Ana06/biography Henne Vogelsang 2016-04-27 10:02:28 +02:00
  • a30893fae3 test I removed accidentally while rebasing restored Ana 2016-04-27 00:41:40 +02:00
  • 22916971c7 Word limit on user biography changes Ana 2016-04-27 00:21:39 +02:00
  • e082e7599d biography test fixed Ana 2016-04-26 00:21:05 +02:00
  • 5c044a801d Word limit on user biography Ana 2016-04-25 01:44:48 +02:00
  • 5770920270 Move the not interesting parts down... Henne Vogelsang 2016-04-26 16:25:05 +02:00
  • 88d101b359 Link to GitHub OAuth application Henne Vogelsang 2016-04-26 16:17:09 +02:00
  • fc9d716985 Link to a sane google search Henne Vogelsang 2016-04-26 16:13:47 +02:00
  • c75d9942b9 Cleanup INSTALL.md/CONTRIBUTE.md Henne Vogelsang 2016-04-26 16:10:05 +02:00
  • b11acac559 Cleanup INSTALL.md/CONTRIBUTE.md Henne Vogelsang 2016-04-26 16:09:54 +02:00