Jonas Heinrich 27be658cdd Merge branch 'release/4.2' into dev ...

Conflicts:
	Gemfile
	Gemfile.lock
	lib/open_project/version.rb
	spec/lib/open_project/configuration_spec.rb

2015-10-21 11:28:45 +02:00

..

activities

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

admin

Switch cukes to poltergeist (selectively run selenium)

2015-10-12 22:40:28 +02:00

custom_fields

Merge branch 'release/4.2' into dev

2015-10-21 11:28:45 +02:00

enumerations

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

issues

Switch cukes to poltergeist (selectively run selenium)

2015-10-12 22:40:28 +02:00

menu_items

Switch wiki feature test to selenium

2015-10-12 22:40:28 +02:00

messages

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

planning_element_type_colors

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

planning_elements

Adjust specs and cukes to new fullscreen view

2015-09-24 10:53:34 +02:00

project_types

Replace project creation cuke in favour of rspec feature spec

2015-10-12 13:18:52 +02:00

projects

Switch cukes to poltergeist (selectively run selenium)

2015-10-12 22:40:28 +02:00

reportings

fix reportings feature

2015-02-13 17:35:22 +01:00

roles

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

search

Switch cukes to poltergeist (selectively run selenium)

2015-10-12 22:40:28 +02:00

session

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

step_definitions

Adjust cuke to new menu structure

2015-10-05 09:39:34 +02:00

support

Use selenium until we upgraded jenkins CI workers to phantomjs 2.0

2015-10-13 23:44:59 +02:00

timelines

Wip out cukes with undefined / pending steps

2015-10-12 22:40:28 +02:00

types

Fix, improve robustness of Types admin cuke

2015-09-14 21:09:48 +02:00

users

Switch cukes to poltergeist (selectively run selenium)

2015-10-12 22:40:28 +02:00

versions

Allow multiple toolbars to exist, extend toolbar functionality

2015-09-03 11:38:56 +02:00

wiki

fix tests for wiki and permitted params

2015-02-11 09:57:59 +01:00

work_packages

Fix wording in work package deletion cuke

2015-10-16 17:21:31 +02:00

general_administration.feature

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

layout.feature

Update year in copyright header to 2015

2015-01-01 00:02:57 +00:00

menu_items.feature

Remove summary attribute and all traces of it from Project

2015-10-06 17:25:18 +02:00