Commit Graph

194 Commits

Author SHA1 Message Date
Holger Just 0c87f611e9 Merge branch 'master' into unstable
Conflicts:
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fa.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
Holger Just 7ef1c41aa0 Force source encoding to UTF-8 2012-01-03 20:43:42 +01:00
Holger Just e95b4992e4 Update copyright for 2012
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
Holger Just 745f889e92 Enforce UTF-8 source encoding 2011-12-18 21:40:14 +01:00
Holger Just e1ac469cfb Fix trailing whitespace 2011-12-18 21:40:01 +01:00
Holger Just d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Eric Davis 2f0d13149d Copyright header update 2011-12-17 15:50:52 -08:00
Eric Davis 1318ac204e [#3619] Allow defining a custom ldap filter for AuthSourceLdap.
Conflicts:

	app/models/auth_source_ldap.rb
	config/locales/en.yml
	test/unit/auth_source_ldap_test.rb
2011-12-12 13:43:21 +01:00
Eric Davis 8fc2b72740 [#720] Add acts-as-taggable-on gem and migration for tag support
As per the gem docs, 2.1.0 is the last Rails 2.x compatable version
2011-11-25 11:23:34 -08:00
Felix Schäfer b1671e46f0 Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Eric Davis 2b7a221dee [#672] Allow each Query to control if subprojects are included or not 2011-10-25 18:13:32 -07:00
Greg Mefford b44dd085ac Prevent large production databases from consuming all the RAM on the server and causing the migration to take forever. On a database with a large SVN repo, the Changesets ran for over two days before I gave up and cancelled it. After this change, the migration ran in under 10 minutes. 2011-10-20 23:43:48 -03:00
Holger Just e7f69d4236 [#633] Fix mock of WikiContent::Version for Ruby 1.9 2011-10-04 11:12:33 +02:00
Gregor Schmidt 3fd809f059 [#633] WikiPages may have no author - but should have
Chili 1.x did not enforce the presence of an author for wiki pages, but Chili 2.x does. This migrations fails, if there are WikiPages or Versions without author. By updating the migration, we may ensure, that the erroneous pages are correctly updated.

Signed-off-by: Holger Just <h.just@finn.de>
2011-10-04 10:27:12 +02:00
Holger Just 139dedfd5f Add copyright header 2011-08-27 18:28:54 +02:00
Holger Just c57c598204 Fix trailing whitespace 2011-08-27 18:26:12 +02:00
Felix Schäfer 4bc5bc9fa6 Avoid touching journaled objects on backdated journal creation. 2011-07-29 18:21:04 +02:00
Felix Schäfer ff6d75ca74 Only build initial journals for core classes. #542 2011-07-29 18:00:19 +02:00
Felix Schäfer 55f9ecbe23 Remove double initial WikiContentJournals. #542 2011-07-29 15:00:31 +02:00
Eric Davis c0d26da34e Refactor: move method to recreate the initial journals out of migration 2011-07-22 11:42:40 -07:00
Holger Just 9e35b24bcd [#512] Fix Copyright 2011-07-08 21:17:34 +02:00
Eric Davis 2bb42e90a1 [#493] Force loading the classes of activity provider
This will cause the class to run acts_as_journal which will create the
Journal sub-classes and prevent uninitialized constants since the sub-classes
are created on the fly.
2011-07-01 15:27:12 -07:00
Eric Davis 6017e2712e Add rescues to the aaj migrations for unsaved records.
If the Journal or the Journaled object don't save successfully,
put out the reasons why instead of aborting the migrations. Journaled
objects might failure from the :touch update, which are safe to ignore.
2011-07-01 15:16:07 -07:00
Eric Davis 9de3fcbc3f [#397] Remove FIXME, there is only one activity per Model 2011-06-17 14:48:13 -07:00
Eric Davis 0daa081d19 [#475] Set the activity_type on the initial journals 2011-06-17 10:50:11 -07:00
Eric Davis 2ff9711fc7 Migrate existing journals so version 1 is open for the initial journal 2011-06-17 10:18:56 -07:00
Eric Davis 8b13992c0a Print any errors when saving the initial journal instead of aborting 2011-06-17 10:09:10 -07:00
Eric Davis 52b83da8dd [#479] Split GeneralizeJournals into separate, incremental migrations 2011-06-17 09:49:24 -07:00
Eric Davis 47c7e0774a [#467] Fix bug with Journal subclasses having caches columns 2011-06-17 09:41:14 -07:00
Eric Davis b52d2b2238 [#467] Fix uninitialized constant Journal::Journaled error
Was due to Journals touching the parent record but the Journal
not having it's STI class correct during the type update.
2011-06-17 09:13:05 -07:00
Felix Schäfer 2ceffca3e3 Don't loose the time of the wiki_edits. #468
Contributed by Artem Naluzhnyy.
2011-06-16 21:01:38 +02:00
Eric Davis 33e3a71341 [#445] Track initial object attributes on the initial journal
So the initial journal would have the changes from an Object#new
to the created version of the Object. Also includes a change to the
database migration in order to create these initial journals for
all journaled Objects.
2011-06-03 13:01:56 -07:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis a85b6780d2 [#262] Convert line endings to UNIX 2011-05-29 12:00:18 -07:00
Felix Schäfer cf0804259d Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable 2011-05-20 15:45:54 +02:00
Felix Schäfer dbc10d2730 Save the comments to wiki page updates correctly. #415 2011-05-20 15:44:47 +02:00
Holger Just d90102420d [#112] Adapt database switches to use ChiliProject::Database 2011-05-15 23:15:52 +02:00
Eric Davis adf57a64f1 [#123] Move aaj migrations to core 2011-05-13 11:11:41 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang ed867c4a7f Adds an index on users.type for faster retrieval of groups.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5288 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Toshi MARUYAMA 231fcf6fd8 scm: copy global log encoding setting to repository (#1735).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:17:59 -07:00
Toshi MARUYAMA ab8bdf282b scm: add log_encoding column to repositories table (#1735).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4980 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:17:59 -07:00
Jean-Philippe Lang c9497f39b8 Keep track of issue description changes (#746).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
Jean-Philippe Lang d88fa6ccce Adds support for SCM/LDAP passwords encryption in the database (#7411).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
Toshi MARUYAMA 2195984e35 scm: add "path_encoding" column in repositories table (#2664, #2274).
Contributed by Yuya Nishihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4940 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:03:52 -07:00
Jean-Philippe Lang 9964c43b3b Adds random salt to user passwords (#7410).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:03:52 -07:00
Jean-Philippe Lang cc2d6f3605 Allow additional workflow transitions for issue author and assignee (#2732).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -07:00
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00