Eric Davis 216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized ...

Conflicts:
	test/unit/journal_test.rb
	vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb

2011-05-13 10:35:23 -07:00

..

environments

[#290] using bundler

2011-05-10 08:40:42 +02:00

initializers

Create the ChiliProject namespace

2011-05-11 15:48:36 -07:00

locales

Removig english strings from RepositoriesHelper

2011-05-05 22:05:41 +02:00

additional_environment.rb.example

Allow a config/additional_environment.rb file to customize the Rails::Initializer.

2009-11-08 02:16:42 +00:00

boot.rb

[#290] using bundler

2011-05-10 08:40:42 +02:00

configuration.yml.example

Adds support for SCM/LDAP passwords encryption in the database (#7411).

2011-04-16 15:16:03 -07:00

database.yml.example

[#174] Change Redmine to ChiliProject in the user configuration files

2011-02-24 15:24:20 -08:00

environment.rb

Merge branch 'unstable' into ticket/unstable/123-journalized

2011-05-13 10:35:23 -07:00

preinitializer.rb

[#290] using bundler

2011-05-10 08:40:42 +02:00

routes.rb

Changed timelogs filters to use non-AJAX requests (#1965).

2011-04-16 16:13:20 -07:00

settings.yml

[#129] Replace public strings using Redmine with ChiliProject

2011-02-19 20:38:50 -08:00