kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,021 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

617 Commits

Author SHA1 Message Date
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis a85b6780d2 [#262] Convert line endings to UNIX 2011-05-29 12:00:18 -07:00
Eric Davis 9e1b6c14c8 [#345] Remove BigDecimal patch since Rails 2.3.11 includes a mitigation 2011-05-27 14:37:10 -07:00
Eric Davis cd64d11e17 Merge branch 'master' into unstable 
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
 2011-05-27 12:20:04 -07:00
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
Eric Davis 6c9c7dc5aa Merge remote-tracking branch 'schmidt/f/290-bundler' into unstable 2011-05-13 08:55:08 -07:00
Eric Davis f273b7b18c Create the ChiliProject namespace 2011-05-11 15:48:36 -07:00
Gregor Schmidt 87d8634b04 [#290] using bundler 
* following setup instructions from http://gembundler.com/rails23.html
* adding generated files to .gitignore and .hgignore
* removing config.gem calls
* adding Gemfile that should work with all supported dbs and interpreters
* removing work-around for rubygems 1.5 deprecation. this seems to be fixed since now bundler handles the gem loading
 2011-05-10 08:40:42 +02:00
Eric Davis d29315341d [#196 #216 #216] Complete the upgrade to Rails 2.3.11 2011-05-06 15:44:38 -07:00
Simon COURTOIS bfacd827a8 Removig english strings from RepositoriesHelper 2011-05-05 22:05:41 +02:00
Eric Davis 614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable 
Conflicts:
	config/locales/en.yml
	test/unit/journal_test.rb
 2011-04-29 08:46:13 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Gregor Schmidt 90987ca34e [#346] Fixing polish and swedish translations to work with psych 2011-04-21 13:24:49 +02:00
Gregor Schmidt 31d292ce95 [#346] Fixing hebrew translations to work with psyc 2011-04-21 13:21:13 +02:00
Gregor Schmidt 50faef3712 [#346] also fixing errornous string starting with % 2011-04-21 12:04:04 +02:00
Gregor Schmidt 3b7ea67a99 [#346] changing i18n files to use valid yaml syntax that may be parsed by psych 2011-04-21 11:47:32 +02:00
Eric Davis f06f846fce Locales update post-merge 2011-04-16 16:19:31 -07:00
Jean-Philippe Lang 789ccec246 Changed timelogs filters to use non-AJAX requests (#1965). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 33c28af67a Removed hard coded french strings (#8020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 1cf314ee9f Fixes en-GB translation for field_member_of_group and field_assigned_to_role (#7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5263 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 18362e0bfa Set native eol on en-GB.yml (#7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5262 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 10ff56eab1 Translations updates by joergleis (#7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5261 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 0a3819d171 Japanese translation update by Yuki Kita. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5260 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Toshi MARUYAMA 64e7d92c3b i18n: fix typo general_pdf_encoding "UFT-8" in sl.yml (#61). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5233 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:48 -07:00
Jean-Philippe Lang 420a49631d French translation update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5229 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:47 -07:00
Jean-Philippe Lang 397da5033f Changes polish csv separator to ; and decimal to , (#7875). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5181 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:42 -07:00
Jean-Philippe Lang 9b9c7ae91d Adds links on the issue list to collapse/expang all groups (#7236). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5174 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:41 -07:00
Jean-Philippe Lang 706448c601 Translations updates. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5016 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 15:32:38 -07:00
Jean-Philippe Lang 6f5707c2b5 Adds email notifications support for news comments (#2074). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 15:26:39 -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
Jean-Philippe Lang d2886124ee Bulgarian translation update by Ivan Cenov. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4948 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 15:16:02 -07:00
Jean-Philippe Lang 886c3e295b Splits private/public issue queries in the sidebar (#1067). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4908 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 14:57:31 -07:00
Jean-Philippe Lang 0e789c5272 Updgraded Rails to 2.3.11 (#6887). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4904 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 14:52:52 -07:00
Jean-Philippe Lang 3f41152b4f Added Persian translation contributed by Behrang Noroozinia (#7418). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4903 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 14:51:02 -07:00
Jean-Philippe Lang 40c063a158 Updated basque and czech translations. Contributed by Ales Zabala Alava and Michal Gebauer. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4901 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 14:50:51 -07:00
Jean-Philippe Lang bbb57ea4d2 Warning on leaving a page with unsaved content in textarea (#2910). 
The warning can be turned off in the user's preference.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4900 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 14:46:57 -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
Enderson Maia f95706c962 pt-BR updates 2011-04-09 18:09:50 -03:00
Holger Just 6e0717261c Merge branch 'ticket/unstable/279-version-start-date' of git://github.com/edavis10/chiliproject.git into unstable 2011-04-07 23:46:54 +02:00
Eric Davis b96115bf7b [#310 LSS#5727] Add checkbox option to determine if issue emails should be sent 2011-03-30 11:48:59 -07:00
Holger Just 8cfe498bd6 [#230] Make loadpath of themes configurable 
Based on a987b74ed14 by meineerde
 2011-03-24 13:46:50 -07:00
Eric Davis 904897ac90 [#283] Fix tpyo 2011-03-19 13:33:15 -07:00
Eric Davis 0c458be040 [#283] Update the i18n deprecation message 
* Use Rails' Deprecation logger instead of the standard logger
* Update the url to a message in the forum about the change
 2011-03-19 13:21:39 -07:00
Felix Schäfer 3377e5b5b7 Add new translation strings to all locales. #209 2011-03-19 10:57:22 +01:00
Ivan Evtuhovich 5fc8ff47f8 Move repositories_helper labels to translation, refs #209 2011-03-18 11:08:38 +03:00
Eric Davis 2ffea883a6 [#279] Add an optional Start Date to Versions 2011-03-13 19:14:08 -07:00
Gregor Schmidt da45dfcc72 adding require 'thread' since active support needs it but rubygems 1.6 removed it 
fixes #251
 2011-03-02 14:56:21 +01:00
Eric Davis 2b6a982801 Add the test environment to configuration.yml.example 2011-02-24 16:00:55 -08:00
Eric Davis fc80da5992 [#174] Change Redmine to ChiliProject in the user configuration files 2011-02-24 15:24:20 -08:00
Jean-Philippe Lang 87de3cbd42 Moves scm path configuration examples in comments. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4917 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-24 15:19:32 -08:00
Felix Schäfer 9ed2d8ed77 Allow underscores in project identifiers. #146 2011-02-22 21:50:50 +01:00
Thibaut Deloffre 28bbee155c [#133] Provide workaround for rubygems 1.5 compatibility 
Remove the deprecation warnings for version_requirements with rubygems < 1.5
and allow ChiliProject to run with rubygems >= 1.5.
 2011-02-22 14:51:13 +01:00
Eric Davis fb89e7a842 [#129] i18n the 'Powered by' string in the footer 2011-02-21 15:43:02 -08:00
Eric Davis 99a12ecbcf [#129] Replace public strings using Redmine with ChiliProject 2011-02-19 20:38:50 -08:00
Eric Davis c1cced5139 [#190] Remove the default value for the maximum number of gantt items 2011-02-19 19:33:17 -08:00
Simon COURTOIS a5c5047d46 Translating Non member and Anonymous roles when importing defaults 2011-02-15 18:18:32 +01:00
Jean-Baptiste Barth 8b64d5d0f0 Fixed various typos in french locale 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4799 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:51:39 -08:00
Toshi MARUYAMA 3f62da8d82 scm: add scm_cvs_command at config/configuration.yml.example (#7517). 
I forgot to add it.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4798 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:51:39 -08:00
Toshi MARUYAMA d449ac518d scm: change key name of configurable command name (#7517, #6159, #7047). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4797 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:51:39 -08:00
Toshi MARUYAMA 21585064b2 scm: use "e.g." for "for example" at config/configuration.yml.example (#7517). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4796 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:51:04 -08:00
Toshi MARUYAMA 02c30b1a67 scm: add a feature of configurable path of executable for scm adapters (#7517). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4795 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:51:04 -08:00
Jean-Philippe Lang df02ce005d Translations updates. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:50:24 -08:00
Jean-Philippe Lang 4adf3abf83 Makes the autologin cookie configurable (#1763). 
The cookie attributes (name, path, secure) can now be set in config/configuration.yml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4756 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:46:45 -08:00
Jean-Philippe Lang b88143ca3f Makes the folder for attachments storage configurable in config/configuration.yml (#1236). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4755 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 2ea7a78da3 Ignores db/*.sqlite3. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4753 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 9a13b39e26 Adds an application configuration file: config/configuration.yml (#7408). 
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:46:45 -08:00
Jean-Philippe Lang b80b789cc6 Coderay upgraded to 0.9.7 (#5344). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4739 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:41:32 -08:00
Jean-Philippe Lang e5c8513dda Fixes french translation of "Connection" (#7348). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4738 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-02-09 16:41:32 -08:00
Jean-Philippe Lang 46f2f9cff7 Fixed: Label not translated in french in Settings/Email Notification tab (#7313). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4724 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-15 14:25:11 +00:00
Jean-Philippe Lang b2425dbe7f French locale update (#7337). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4720 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-15 14:02:44 +00:00
Jean-Philippe Lang c19e3fbe3a Set csv separator to ; for nl locale (#7274). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4701 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-11 20:35:50 +00:00
Jean-Philippe Lang 88727bf070 Adds fallback to 'en' locale for untranslated strings (#5518). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4679 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-10 18:25:12 +00:00
Jean-Philippe Lang 0617625f48 Italian translation update by Emidio Stani (#7227). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4657 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-08 10:03:34 +00:00
Jean-Philippe Lang d0a076cbfd Bulgarian translation update by Ivan Cenov (#7203). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4656 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-01-08 10:01:09 +00:00
Jean-Philippe Lang 6659c630b2 Fixes wrong Polish translation of "blocks" and "duplicates" (#6895). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4595 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-30 15:49:08 +00:00
Jean-Philippe Lang 4d557dd512 Japanese Translation updated (#7133). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4594 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-30 15:44:02 +00:00
Jean-Philippe Lang 74de89d1dd Traditional Chinese language updated (#7123). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4593 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-30 15:43:02 +00:00
Jean-Philippe Lang 5e725070e0 German translation updated (#7161). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4592 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-30 15:38:41 +00:00
Jean-Philippe Lang 72f58c4c40 Adds missing not_a_date translation in fr locale (#7160). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4556 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-22 20:52:48 +00:00
Jean-Philippe Lang 0661cf6d87 Restores non english field_start_date translations (#6629, #7016). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4554 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-22 20:40:56 +00:00
Jean-Philippe Lang 1c3823cbb0 Adds missing strings in locales. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4519 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 09:14:54 +00:00
Jean-Philippe Lang bc1703d7b6 Converts translations to the new i18n interpolation format (#6495). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4518 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 08:50:13 +00:00
Jean-Philippe Lang 4f4a62c6d0 Locales update before changing interpolation format. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4517 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 08:40:15 +00:00
Jean-Philippe Lang 3c1576e364 Manually require i18n 0.4.2 before Rails tries to load the most recent gem (#7013). 
This workaround makes Redmine work even if i18n 0.5.0 gem is installed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4516 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 08:34:29 +00:00
Jean-Philippe Lang 252dcad3f6 Locales update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4514 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-15 21:18:28 +00:00
Jean-Philippe Lang b48291ec63 Adds an application setting to limit the number of items that can be displayed on the gantt chart (#6276). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-15 21:18:06 +00:00
Jean-Philippe Lang bfa61c1ec4 Updated locales. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4471 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-05 11:45:39 +00:00
Jean-Philippe Lang d7c607fd8b Automatic spent time logging from commit messages (#4155). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4470 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-05 11:45:09 +00:00
Jean-Philippe Lang 80e0e1c544 Changes russian CSV separator to ; (#7035). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4469 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-05 10:15:55 +00:00
Jean-Philippe Lang ea59d93dc8 Dry Users API responders. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4454 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-03 11:45:55 +00:00
Azamat Hackimov 6608cda084 Translation update 
* es (#6973)


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4427 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-25 20:43:22 +00:00
Azamat Hackimov 7087a53f27 Translation update 
* bg (#6948)
* da (#6804)
* ja (#6814)
* ru
* sv (#6783)
* zh-TW (#6782)


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-21 14:55:11 +00:00
Jean-Philippe Lang c4a218358f Replaced SessionStore :session_key with :key (#6887). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4405 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-14 15:14:19 +00:00
Jean-Philippe Lang 7482d2f5f4 Fixed: Trunk not working with i18n gem 0.4.2 (#6784). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4389 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-09 19:44:37 +00:00
Jean-Philippe Lang d9e960873c Updated locales. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4384 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-07 14:18:13 +00:00
Jean-Philippe Lang 475530e59f Adds a "visible" option on User and Project custom fields (#1738). 
If set to false, the custom field won't be display on user profile/project overview.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4382 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-07 14:15:01 +00:00
Jean-Philippe Lang 6f841b7f43 Fixed: 'View difference' broken on wiki page history (#6747). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4372 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 13:22:23 +00:00
Tim Felgentreff 859bfa625d Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized 
Conflicts:
	app/models/wiki_content.rb
	app/views/wiki/history.rhtml
	config/locales/bg.yml
	config/locales/ca.yml
	config/locales/de.yml
	test/integration/api_test/projects_test.rb
 2010-11-03 16:03:39 +01:00
Eric Davis 7e359d3d7e Add a Email Header setting. Useful for adding delimiters to every email. 
#2852 #6628

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-02 19:00:36 +00:00