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
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
3df729e47d
Replace puts and !!! messages with pending tests when the test SCMs are missing
2011-12-27 18:23:14 -08:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
9baa310486
Fixed test by replacing assert_tag with assert_select
2011-05-27 14:16:38 -07:00
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
1d5d73afe3
Fix RepositoriesFilesystemControllerTest for jRuby
...
Iconv on jRuby does not accept an empty string as "from" encoding.
Use the default behavior from the controller instead to leave it
unspecified and thuse use UTF-8.
2011-05-21 01:17:17 +02:00
be2046b189
scm: set mime type in downloading file.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
3ee44b363c
scm: filesystem: add test for no extension file mime type in functional test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
fd400df10e
scm: filesystem: fix todo comment of MIME_TYPES of big-file.txt in functional test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
05825c38a2
scm: filesystem: add test for displaying file over max size limit ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
314bb3fb6e
scm: filesystem: add test for UTF-16 file displaying ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
af85236fe7
scm: filesystem: add test for non ascii text file displaying ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
5a10fb4f31
scm: filesystem: add test of no extension file whose content is only ASCII can be showing ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5198 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
71ea12fcfc
scm: filesystem: add functional test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5196 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Holger Just
Eric Davis
Felix Schäfer
Toshi MARUYAMA