Christian Bruckmayer
dcb27ae999
Merge pull request #1009 from hennevogel/routing
...
Fix program routing outside of Admin
2016-05-23 17:20:14 +02:00
Henne Vogelsang
30e10a4e40
Fix program routing outside of Admin
...
We don't have ProgramsController so we can't have routes
for it
2016-05-23 15:18:25 +02:00
Henne Vogelsang
d6a8680d5d
Merge pull request #1008 from nishanthvijayan/remove-unused-helpers
...
Remove unused helper methods
2016-05-23 11:52:22 +02:00
Henne Vogelsang
0fd48f103b
Merge pull request #1006 from nishanthvijayan/restrict-sponsor-access
...
Display sponsor pages only if sponsorship levels are defined
2016-05-23 11:51:54 +02:00
Nishanth Vijayan
6eda97e10c
Remove unused helper methods
2016-05-21 01:00:46 +05:30
Christian Bruckmayer
139df75ab6
Merge pull request #1007 from hennevogel/master
...
Adapt the logo data migration task to carrierwave
2016-05-20 15:23:22 +02:00
Henne Vogelsang
6575bc10db
Adapt the logo data migration task to carrierwave
2016-05-19 15:48:27 +02:00
Nishanth Vijayan
e83b2c3a90
Display sponsor pages only if sponsorship levels are defined
2016-05-19 19:11:38 +05:30
Henne Vogelsang
02487be6fb
Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings
...
Fix deprecation warnings
2016-05-19 14:37:39 +02:00
Henne Vogelsang
81ddb76c24
Merge pull request #994 from differentreality/allow_nil_max_attendees
...
allow max_attendees to be nil
2016-05-19 12:03:43 +02:00
Henne Vogelsang
6a127a29a3
Merge pull request #1001 from ChrisBr/ability
...
Fixes ability
2016-05-19 12:01:31 +02:00
Henne Vogelsang
afbffbf2b1
Merge pull request #1004 from ChrisBr/proposal_show
...
Make proposal show view more robust
2016-05-19 12:00:23 +02:00
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
Christian Bruckmayer
5c4fba8b44
Merge pull request #999 from differentreality/user_bio_count
...
Fix bio length when nil in user#edit
2016-05-19 10:19:29 +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
Nishanth Vijayan
c00b04e9e8
Update htmlentities gem to remove duplicated key warning
2016-05-17 20:15:49 +05:30
Christian Bruckmayer
7135c0249d
Merge pull request #1000 from nishanthvijayan/fix-ability-spec
...
Fix ability model spec
2016-05-17 13:24:14 +02:00
Nishanth Vijayan
09b6e06a8c
Fix ability model spec
...
Cancancan does not support testing multiple permissions in one be_able_to clause
Replace all occurrences of such examples with separate examples for each permission
2016-05-15 21:18:19 +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
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
