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
Henne Vogelsang
6a41243536
Merge pull request #971 from sonalkr132/doc-fix
...
Fix recurring spelling [ci skip]
2016-04-29 14:03:22 +02:00
sonalkr132
2710f32792
Fix recurring spelling [ci skip]
2016-04-28 19:22:00 +05:30
Henne Vogelsang
8fc57e34c9
Adapt the spec
2016-04-27 17:55:24 +02:00
Henne Vogelsang
86896cc46b
And finally make use of Cloudinary if it's configured
2016-04-27 17:55:24 +02:00
Henne Vogelsang
de486dc621
Oh My God. Close your eyes!
...
Someone used a paperclip method in a migration. I'm too scared to
look who, maybe it was me?
2016-04-27 17:55:24 +02:00
Henne Vogelsang
a852a3b4a5
Protect us from too large images
2016-04-27 17:55:24 +02:00
Henne Vogelsang
2a4de3e869
Use PictureUploader on Venue
2016-04-27 17:55:17 +02:00
Henne Vogelsang
f1f5fc1cd4
Use PictureUploader on Sponsor
2016-04-27 17:40:23 +02:00
Henne Vogelsang
0ad3ff01c3
Use PictureUploader on Lodging
2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af
Use PictureUploader on Conference
2016-04-27 17:40:23 +02:00
Henne Vogelsang
cea9081347
A paperclip compatible carrierwave uploader
2016-04-27 17:40:23 +02:00
Henne Vogelsang
e3c457267c
Also require mini_magick for image manipulation
2016-04-27 17:40:23 +02:00
Henne Vogelsang
d55d206b93
Switch to carrierwave for upload management
2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f
Remove danging :photos table and other photo cruft
2016-04-27 17:40:18 +02:00
Henne Vogelsang
1ce834391a
Add cloudinary gem, fix some Gemfile comments
2016-04-27 11:48:12 +02:00
Henne Vogelsang
5b9da3ef22
Merge pull request #968 from Ana06/biography
...
Word limit on user biography
2016-04-27 10:02:28 +02:00
Ana
a30893fae3
test I removed accidentally while rebasing restored
2016-04-27 00:41:40 +02:00
Ana
22916971c7
Word limit on user biography changes
2016-04-27 00:28:31 +02:00
Ana
e082e7599d
biography test fixed
2016-04-27 00:27:44 +02:00
Ana
5c044a801d
Word limit on user biography
2016-04-27 00:27:44 +02:00
Henne Vogelsang
5770920270
Move the not interesting parts down...
2016-04-26 16:25:05 +02:00
Henne Vogelsang
88d101b359
Link to GitHub OAuth application
2016-04-26 16:17:09 +02:00
Henne Vogelsang
fc9d716985
Link to a sane google search
2016-04-26 16:13:47 +02:00
Henne Vogelsang
c75d9942b9
Cleanup INSTALL.md/CONTRIBUTE.md
2016-04-26 16:10:05 +02:00
Henne Vogelsang
b11acac559
Cleanup INSTALL.md/CONTRIBUTE.md
2016-04-26 16:09:54 +02:00
Stella Rouzi
2d9e19b195
Merge pull request #923 from differentreality/event_registration
...
Enable event registration for proposals
2016-04-26 15:39:29 +02:00
Stella Rouzi
01ec43e53a
Registration for Events
2016-04-26 16:11:40 +03:00
Henne Vogelsang
f188fd5575
Update README.md
2016-04-26 14:58:39 +02:00
Henne Vogelsang
1da40b22cf
Update CONTRIBUTING.md
2016-04-26 14:57:17 +02:00
Henne Vogelsang
aabbd35063
Merge pull request #932 from hennevogel/bugfix_email_settings
...
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
1fdc2f8efe
Merge pull request #946 from Shriyanshagro/venue_commercial
...
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Henne Vogelsang
9e07212cb5
Merge pull request #967 from sonalkr132/sponsers
...
Splash page sponsers section style improvement
2016-04-26 14:31:48 +02:00
Stella Rouzi
0a5ba7a204
Merge pull request #942 from nishanthvijayan/fix-roles-authorization
...
Fix authorization issues with Roles
2016-04-25 17:18:24 +02:00
Aditya Prakash
d47e9c317d
Add rake task to reprocess sponsor logos
...
rake logo:reprocess
2016-04-25 17:24:14 +05:30
Henne Vogelsang
20d908e085
Adapt the mailbot spec to the last changes
2016-04-22 14:53:10 +02:00
Henne Vogelsang
3391d09549
Use ActiveJob to send comment mails
2016-04-22 11:31:19 +02:00
Henne Vogelsang
8392fca0dc
Default from in Mailbot was never used
2016-04-22 11:31:15 +02:00
Aditya Prakash
d662ebd252
Remove sponsorship level from view and test
2016-04-21 21:22:14 +05:30
Shriyansh
f6b5cb03e8
redesigned view of splashpage
2016-04-21 20:21:23 +05:30
Henne Vogelsang
37e0b5f5b8
Get rid of build_email
...
It's always easy to add another layer of indirection...
2016-04-21 16:36:53 +02:00
Henne Vogelsang
a698ce44fe
Use ActiveJob to send cfp update mails
2016-04-21 16:26:37 +02:00
Aditya Prakash
8da80f28e2
Add pop up modal for sponsor
2016-04-21 19:51:24 +05:30
Aditya Prakash
af08d843a8
Maintain size of sponsor logos
...
Places logo on a white background if image is smaller than the given
constrains.
Resizes the logo if image is larger than constrains.
Validation of presence of logo was moved cause file field wasn't getting
marked as required field ('*' thingy) in form.
`- if logo presence` was removed cause logo is mandatory field.
2016-04-21 19:51:24 +05:30