Commit graph

1673 commits

Author SHA1 Message Date
Henne Vogelsang
20be0f58ba Merge pull request #1005 from ChrisBr/ichain
Hide Submit proposal if iChain is enabled and user is not logged in
2016-05-19 12:00:10 +02:00
Christian Bruckmayer
aa925f9f75 Hide Submit proposal if iChain is enabled and user is not logged in
because it's not possible to create a user while submitting a proposal when iChain is enabled. User would get
not authorized error message.
2016-05-19 11:49:20 +02:00
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Christian Bruckmayer
acf5b6e8f2 Make proposal show view more robust
Partially fixes #718. Some objects have an foreign_key set on track, difficulty level or room but the
referenced object does not exists. This is caused by introducing dependent: nullify after deleting
some of the objects. This commit will make the show page more robust, however, we need to
fix the corrupt objects in an additional commit.
2016-05-19 10:40:27 +02:00
Nishanth Vijayan
d152b5eddc Update paper_trail gem to latest 2016-05-18 23:27:18 +05:30
Nishanth Vijayan
13f0f9703d Replace usage of deprecated member_label option in forms with Array of label/value pairs 2016-05-18 23:26:47 +05:30
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
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
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
084ee7ef43 Give a bit more demo info in the conference description 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
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
12c5e3d512 Merge pull request #982 from hennevogel/feature_demo_data
Demo Data
2016-05-02 16:19:16 +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
77e0340387 Make use of fake data in factories 2016-05-02 16:06:27 +02:00
Stella Rouzi
2b1aeafcd8 javascript load for user_biography 2016-05-01 19:16:19 +03: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
86896cc46b And finally make use of Cloudinary if it's configured 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
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +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
5c044a801d Word limit on user biography 2016-04-27 00:27:44 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03: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
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
Christian Bruckmayer
647a40be63 Prettify sponsors section 2016-04-21 19:51:24 +05:30
Henne Vogelsang
82e356dde0 Use ActiveJob to send schedule update mails 2016-04-21 16:16:47 +02:00
Henne Vogelsang
2ea7bda639 Use ActiveJob to send venue update mails 2016-04-21 16:03:51 +02:00