Commit Graph

4789 Commits

Author SHA1 Message Date
Holger Just 63d8264320 Make links in exported wiki HTML files absolute 2011-07-08 21:18:47 +02:00
Holger Just 9e35b24bcd [#512] Fix Copyright 2011-07-08 21:17:34 +02:00
Eric Davis 729697e33f Merge branch 'stable' 2011-07-01 22:16:30 -07:00
Eric Davis effcd726a3 Merge branch 'release-v2.0.0' into stable 2011-07-01 22:13:36 -07:00
Eric Davis 6a2772d75c Bump version to 2.0.0 (final) 2011-07-01 21:54:52 -07:00
Eric Davis cf789d4fa8 Update CHANGELOG for 2.0.0 2011-07-01 21:54:40 -07:00
Eric Davis 30bcd6c66b Merge branch 'master' into release-v2.0.0
Conflicts:
	doc/CHANGELOG.rdoc
	lib/redmine/version.rb
2011-07-01 21:46:38 -07:00
Eric Davis 2fab2de517 Workaround a test timing bug in CI for the release 2011-07-01 16:28:13 -07:00
Gary Verhaegen 0d81314664 Solves #503: parsing translations with psych in ruby 1.9 2011-07-01 16:01:59 -07: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 32f92a5058 [#501] Ugly patch to stop creating journals when only line endings change 2011-07-01 12:25:07 -07:00
Eric Davis 39be3ac130 Merge branch 'release-v1.5.0' 2011-06-27 15:45:46 -07:00
Eric Davis c8a6f8043e Merge branch 'release-v1.5.0' into stable 2011-06-27 15:44:22 -07:00
Eric Davis 967d0e6baa Bump version to 1.5.0 2011-06-27 15:42:55 -07:00
Eric Davis 86c2ee6f5d Update CHANGELOG for v1.5.0 release 2011-06-27 15:41:57 -07:00
Eric Davis 66c4db8669 [#490] Escape AuthSources in the list.
Contributed by MAEDA, Go
2011-06-27 15:38:45 -07:00
Eric Davis a75eab1adb [#490] Escape AuthSources in the list.
Contributed by MAEDA, Go
2011-06-27 15:20:15 -07:00
Felix Schäfer 308852e21c Merge pull request #78 from tomkersten/488_wiki_show_format_hook
Added view hook for additional wiki formats [refs #488]
2011-06-22 13:51:10 -07:00
Tom Kersten ffc1db8a54 Added hook for additional wiki formats [refs #488]
* Allows plugins to add to the list of supported export formats at the
  bottom of the Wiki#show view template
2011-06-20 22:32:47 -05:00
Eric Davis 3e924ce6be Bump version to 2.0.0RC3 2011-06-17 15:25:11 -07:00
Eric Davis cd121fe7af Update CHANGELOG for release 2011-06-17 15:24:33 -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 c034d5e548 [#398] Remove helpers from IssuesController 2011-06-17 14:46:09 -07:00
Enderson Maia 713d0aea8c Better translation to keep a pattern in translations. 2011-06-17 14:43:55 -07:00
Eric Davis 8698b40974 Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0 2011-06-17 14:42:26 -07:00
Eric Davis 9f2c412fa6 [#383] Fix for undefined_method 'to_utf8'
Contributed by Artem Naluzhnyy
2011-06-17 14:36:46 -07:00
Eric Davis 7c751b350d Merge branch 'ticket/release-v2.0.0/474-changeset-journals' into release-v2.0.0 2011-06-17 13:06:30 -07:00
Eric Davis 2f3657502f [#474] aaj should use the Model's activity options for timestamp and author_key
Some models (Changeset) require custom options passed to
acts_as_activity_provider but acts_as_journalized wasn't accepting these
for :timestamp or :author_key
2011-06-17 12:39:07 -07:00
Eric Davis 1cf08ee300 [#474] Changesets should use the author method for events
This will let them pick up the committer string if user is nil
2011-06-17 12:29:04 -07:00
Eric Davis 3d164f1da0 [#480] Fix replying to IssueJournals through email 2011-06-17 12:10:23 -07:00
Eric Davis 0daa081d19 [#475] Set the activity_type on the initial journals 2011-06-17 10:50:11 -07:00
Eric Davis 67dbd0160d Document#category should be displayed as a required field 2011-06-17 10:25:56 -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 498d3909cc Merge branch 'ticket/release-v2.0.0/467-journal-migration-sti-callback-bug' into release-v2.0.0 2011-06-17 09:42:03 -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 0c03142832 Fix an apache perl module error. #466
Contributed by Artem Naluzhnyy.
2011-06-16 21:12:36 +02: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
Felix Schäfer 85c3d38d24 Fix the wiki links in the activity view. #469
Contributed by Artem Naluzhnyy.
2011-06-16 20:56:48 +02:00
Felix Schäfer 9ce7fd4230 Merge pull request #76 from schmidt/b/477-rake-rdoctask
Getting rid of "rake/rdoctask is deprecated." warning. #477
2011-06-16 10:08:16 -07:00
Gregor Schmidt 2630a84e10 [#477] Not using deprecated rake/rdoctask but rdoc/task instead
works with all rdoc versions since 2.4.2
see https://github.com/rdoc/rdoc/blob/master/History.txt
2011-06-16 11:29:25 +02:00
Eric Davis 9ccb172c81 Bump version to 2.0.0RC2 2011-06-10 13:35:12 -07:00
Eric Davis 3112062bde Update CHANGELOG for 2.0.0RC2 2011-06-10 13:20:46 -07:00
Eric Davis 3c53d1a63c Added rake release[version] task based on the release process
https://www.chiliproject.org/projects/chiliproject/wiki/HowTo_Release
2011-06-10 13:15:52 -07:00
Rodrigo Rosenfeld Rosas 80c9df5e6b Update pt-BR translations 2011-06-10 13:03:54 -07:00
Eric Davis a99ccc5d7c Merge remote-tracking branch 'schmidt/f/419-update-js-libs/unstable' into release-v2.0.0 2011-06-10 12:58:25 -07:00
Eric Davis f47821db0c [#350] Remove freeze from Settings so the values can be modified later 2011-06-10 11:44:44 -07:00