9e1b6c14c8
[ #345 ] Remove BigDecimal patch since Rails 2.3.11 includes a mitigation
2011-05-27 14:37:10 -07:00
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
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
6c9c7dc5aa
Merge remote-tracking branch 'schmidt/f/290-bundler' into unstable
2011-05-13 08:55:08 -07:00
f273b7b18c
Create the ChiliProject namespace
2011-05-11 15:48:36 -07:00
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
d29315341d
[ #196 #216 #216 ] Complete the upgrade to Rails 2.3.11
2011-05-06 15:44:38 -07:00
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +02:00
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
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
90987ca34e
[ #346 ] Fixing polish and swedish translations to work with psych
2011-04-21 13:24:49 +02:00
31d292ce95
[ #346 ] Fixing hebrew translations to work with psyc
2011-04-21 13:21:13 +02:00
50faef3712
[ #346 ] also fixing errornous string starting with %
2011-04-21 12:04:04 +02:00
3b7ea67a99
[ #346 ] changing i18n files to use valid yaml syntax that may be parsed by psych
2011-04-21 11:47:32 +02:00
f06f846fce
Locales update post-merge
2011-04-16 16:19:31 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
f95706c962
pt-BR updates
2011-04-09 18:09:50 -03:00
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
b96115bf7b
[ #310 LSS#5727] Add checkbox option to determine if issue emails should be sent
2011-03-30 11:48:59 -07:00
8cfe498bd6
[ #230 ] Make loadpath of themes configurable
...
Based on a987b74ed14 by meineerde
2011-03-24 13:46:50 -07:00
904897ac90
[ #283 ] Fix tpyo
2011-03-19 13:33:15 -07:00
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
3377e5b5b7
Add new translation strings to all locales. #209
2011-03-19 10:57:22 +01:00
5fc8ff47f8
Move repositories_helper labels to translation, refs #209
2011-03-18 11:08:38 +03:00
2ffea883a6
[ #279 ] Add an optional Start Date to Versions
2011-03-13 19:14:08 -07:00
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
2b6a982801
Add the test environment to configuration.yml.example
2011-02-24 16:00:55 -08:00
fc80da5992
[ #174 ] Change Redmine to ChiliProject in the user configuration files
2011-02-24 15:24:20 -08:00
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
9ed2d8ed77
Allow underscores in project identifiers. #146
2011-02-22 21:50:50 +01:00
Eric Davis
Gregor Schmidt
Simon COURTOIS
Felix Schäfer
Jean-Philippe Lang
Toshi MARUYAMA
Enderson Maia
Holger Just
Ivan Evtuhovich