Commit graph

1798 commits

Author SHA1 Message Date
Stella Rouzi
50ab392c0f Fix bio length when nil in user#edit 2016-05-15 13:17:53 +03:00
Christian Bruckmayer
65ee166570 Merge pull request #977 from differentreality/fix_admin_registrations
fix admin/registrations#update
2016-05-12 15:57:10 +02:00
Christian Bruckmayer
3d2e1f3219 Merge pull request #985 from hennevogel/feature_factories
Some fixes for review apps
2016-05-12 12:49:47 +02:00
Christian Bruckmayer
67a878839c Merge pull request #997 from Ana06/travel_schedule
travel schedule problem fixed
2016-05-12 12:47:18 +02:00
Ana
590790732d travel schedule problem fixed 2016-05-11 16:40:04 +02:00
Henne Vogelsang
5149379424 Fix ichain sign in form 2016-05-09 15:24:57 +02:00
Henne Vogelsang
be2221c57a Include .env.production in deploy 2016-05-09 14:47:29 +02:00
Stella Rouzi
e5928e4240 Merge pull request #990 from Ana06/patch-1
Update TRANSLATION.md
2016-05-07 22:32:57 +03:00
Ana María Martínez Gómez
d53c87fac3 Update TRANSLATION.md
Project's page doesn't work
2016-05-06 23:59:54 +02:00
Henne Vogelsang
084ee7ef43 Give a bit more demo info in the conference description 2016-05-03 16:25:39 +02:00
Henne Vogelsang
5b20c992ae Let activerecord handle the picture upload in factories 2016-05-03 16:25:39 +02:00
Henne Vogelsang
c876a2d1cf Assign a public id based on the picture name 2016-05-03 16:25:39 +02:00
Henne Vogelsang
4c4918a7a7 Somehow the :venues factory creates a dangling Conference
disabling for now
2016-05-03 16:25:39 +02:00
Henne Vogelsang
45bd31fad0 Escape HTML some factory strings 2016-05-03 16:25:07 +02:00
Henne Vogelsang
ad0a8eecf2 Merge pull request #983 from hennevogel/blah
Move factory_girl outside of groups
2016-05-02 17:32:09 +02:00
Henne Vogelsang
d468c3d88b Drop the postdeploy script from app.json 2016-05-02 17:28:07 +02:00
Henne Vogelsang
22461449b4 Update app.json to include more variables and buildpacks 2016-05-02 17:27:18 +02:00
Henne Vogelsang
436aebfec0 Move factory_girl_rails out of groups too 2016-05-02 17:08:20 +02:00
Stella Rouzi
9fe7d0ca7c Use strong parameters for user in admin/registrations#update 2016-05-02 18:02:57 +03:00
Stella Rouzi
6bcecbd219 fix admin/registrations#update 2016-05-02 17:38:55 +03:00
Henne Vogelsang
a1ac27fa58 Add Heroku generated app.json 2016-05-02 16:24:08 +02:00
Henne Vogelsang
12c5e3d512 Merge pull request #982 from hennevogel/feature_demo_data
Demo Data
2016-05-02 16:19:16 +02:00
Henne Vogelsang
8fa92b72d1 HTML escape Faker::Hipster.paragraph 2016-05-02 16:06:32 +02:00
Henne Vogelsang
40562334c7 Make rubocop happy again 2016-05-02 16:06:32 +02:00
Henne Vogelsang
73ce49de25 Use dynamic fake data in the spec 2016-05-02 16:06:32 +02:00
Henne Vogelsang
4d38305110 Program<->cfp is already a one to one relation 2016-05-02 16:06:32 +02:00
Henne Vogelsang
1c7becb69a use :full_conference factory in the conference view specs 2016-05-02 16:06:32 +02:00
Henne Vogelsang
dd5796bd34 Fix saving feature failures to tmp/capybara 2016-05-02 16:06:32 +02:00
Henne Vogelsang
5e656e7d9f Add a rake task to create demo data
Useful for development, review apps and our demo instance
2016-05-02 16:06:32 +02:00
Henne Vogelsang
77e0340387 Make use of fake data in factories 2016-05-02 16:06:27 +02:00
Christian Bruckmayer
d1dbf67606 Merge pull request #979 from differentreality/javascript_load
javascript load for user_biography
2016-05-02 13:03:49 +02:00
Stella Rouzi
2b1aeafcd8 javascript load for user_biography 2016-05-01 19:16:19 +03:00
Henne Vogelsang
9011ff6cb0 Merge pull request #975 from hennevogel/master
Mention the data:migrate:config2dotenv during boot
2016-04-30 17:58:16 +02:00
Henne Vogelsang
737a9d4808 Add faker gem, don't require rubocop 2016-04-29 17:21:20 +02:00
Henne Vogelsang
1fd029cb66 Mention the data:migrate:config2dotenv during boot 2016-04-29 17:07:50 +02:00
Henne Vogelsang
ac0659d9c6 Merge pull request #900 from openSUSE/demo
Make it possible to run OSEM on heroku
2016-04-29 16:51:26 +02:00
Henne Vogelsang
332b309dd5 Document CLOUDINARY_URL 2016-04-29 16:40:15 +02:00
Henne Vogelsang
78501b17ca Rake task to migrate config.yml to a dotenv file 2016-04-29 16:37:48 +02:00
Henne Vogelsang
14a9d701f7 If operating on a env variable make sure its there
Fix booting the app without OSEM_SMTP_AUTHENTICATION set
2016-04-29 16:37:48 +02:00
Henne Vogelsang
f97e271566 Fix some typos 2016-04-29 16:37:48 +02:00
Henne Vogelsang
5b0202c052 Expand and document SMTP configuration 2016-04-29 16:37:48 +02:00
Henne Vogelsang
beac27405e Use the environment for ActionMailer configuration 2016-04-29 16:37:48 +02:00
Henne Vogelsang
d79a9b6fc1 Make use of dotenv 2016-04-29 16:37:48 +02:00
Henne Vogelsang
fee8adba4b Also set a default secret_key_base in test env 2016-04-29 16:36:47 +02:00
Henne Vogelsang
64830e9cff Don't read config.yml anymore
add some heroku support gems and document all the new variables
2016-04-29 16:36:47 +02:00
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables
Instead of reading a yaml file we get configuration from the
environment.
2016-04-29 16:36:47 +02:00
Henne Vogelsang
45c31f210f Drop config/config.yml.example. Not needed anymore
Also make config/secrets.yml.example read a bit nicer
2016-04-29 16:36:47 +02:00
Henne Vogelsang
d532016312 Get config.yml/secrets.yml out of travis/vagrant 2016-04-29 16:36:47 +02:00
Henne Vogelsang
bd36ce0fb2 Switch logic for linting factories
Only if you set the environment variable OSEM_FACTORY_LINT
to 'false' it won't lint.
2016-04-29 16:36:47 +02:00
Henne Vogelsang
3ce62979bd Merge pull request #970 from hennevogel/feature_cloudinary
Switch to carrierwave for for upload management
2016-04-29 16:36:01 +02:00