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
84998d22a6
Sync to v1.2.0's latest code. Merge branch 'master' into unstable.
2011-03-27 11:24:39 -07:00
7f47401a03
Merge branch 'release-v1.2.0'
2011-03-27 11:09:25 -07:00
25b0180546
Bump version to 1.2.0
2011-03-27 11:05:08 -07:00
eedf576b63
Update changelog for 1.2.0
2011-03-27 10:51:38 -07:00
39c19958d7
[ #308 ] Remove Redmine::VERSION::BRANCH
2011-03-27 10:48:20 -07:00
04361864a7
Added 'retro' style for gravatars. #7608
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:31:45 -07:00
86faa88e55
Merge branch 'ticket/master/225-upstream-scm'
2011-03-27 10:19:26 -07:00
6d0fcf556d
scm: use shell quote for scm command at adapter level ( #7517 , #4273 ).
...
"C:\Program Files\TortoiseHg\hg.exe" can be used in config/configuration.yml.
In Ruby 1.9 IO.popen, if cmd is an Array of String,
it will be used as the subprocess‘s argv bypassing a shell.
See http://www.ruby-doc.org/core/classes/IO.html
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
6cd9bc5ca5
scm: space and tab cleanup of app/controllers/repositories_controller.rb.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
3d11a22624
scm: fix non ASCII filename downloaded from repo is broken on Internet Explorer ( #7288 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
52822ad58e
scm: cvs: fix most binary files become corrupted on Windows ( #6090 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
5356140f5f
Ignore .project and .loadpath files for hg/git mirrors. #7497
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:54 -07:00
2b97992015
scm: bazaar: fix typo and mistakes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:26:02 -07:00
3110e97038
scm: git: fix typo of unit lib test.
...
This file includes UTF-8 "literal".
We need to consider Ruby 1.9 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4809 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:25:25 -07:00
64835367ab
scm: cvs: fix unit lib test fails on Windows.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4808 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:25:14 -07:00
6b6a44c831
scm: bazaar: prepare version string unit lib test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:24:55 -07:00
911fbefb45
scm: change gunzip to tar -z option for scm repository setup in lib/tasks/testing.rake.
...
Pipe does not work on Mingw Ruby.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:24:34 -07:00
dd798edd04
scm: git: prepare version string unit lib test and git log encoding ( #3396 ).
...
This file includes UTF-8 literal.
We need to consider Ruby 1.9 compatibity.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:24:15 -07:00
09e0aa32b8
scm: cvs: code clean up.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:23:10 -07:00
3edbab734b
scm: subversion: prepare version string unit lib test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 09:22:15 -07:00
8d6133f6db
Merge branch 'finnlabs-305_jstoolbar_fix_for_ie8'
2011-03-25 17:28:08 +01:00
c7bd3788a9
Merge branch 'feature/jstoolbar_fix_for_ie8' of https://github.com/finnlabs/chiliproject into finnlabs-305_jstoolbar_fix_for_ie8
2011-03-25 17:06:06 +01:00
1aa20b17b4
[ #302 ] Protect ApplicationController methods so they are not considered actions
2011-03-24 14:22:21 -07:00
2c67f6103b
replaced auth_source_id.nil? with change_password_allowed? in users controller
2011-03-24 13:55:50 -07:00
8cfe498bd6
[ #230 ] Make loadpath of themes configurable
...
Based on a987b74ed14 by meineerde
2011-03-24 13:46:50 -07:00
f1878f4a79
Merge remote branch 'thegcat/273-autologin_cookie_name'
2011-03-24 13:06:13 -07:00
9e04bf83c0
Fix jstoolbar to make buttons for h1, h2, <pre> etc. work in IE8
2011-03-24 19:35:49 +01:00
0ace77081d
Backported changes to encloseSelection from latest DotClear release, less bugs in IE8
2011-03-24 16:14:10 +01:00
9fe45cfe1f
Add git-smart-http support to apache perl module #245
...
Latest patch from http://www.redmine.org/issues/4905 and other changes improvements, compare also with https://orga.fachschaften.org/projects/redmine-fsenorg/repository/revisions/fsenorg/changes/extra/svn/Redmine.pm .
2011-03-20 18:45:15 +01:00
10dffcf3b9
Get the autologin cookie name from the config #273
2011-03-20 10:18:17 +01:00
904897ac90
[ #283 ] Fix tpyo
2011-03-19 13:33:15 -07:00
f16c5bcb5f
[ #283 ] Fix tpyo
2011-03-19 13:33:02 -07:00
85d52978c3
[ #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:23:20 -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
9c2089c585
Merge remote branch 'schmidt/f/282-enhance-safe_attributes' into upstream-master
2011-03-19 13:00:01 -07:00
2e7f46c3ae
[ #270 ] bugfix: considering underscore a valid match in project identifier
2011-03-19 12:44:30 -07:00
61be2ea669
[ #270 ] bugfix: considering underscore a valid match in project identifier
2011-03-19 12:43:49 -07:00
1071f3eec9
Merge remote branch 'schmidt/f/269-refactor-menu_manager-to-increase-extensibility' into unstable
2011-03-19 12:36:25 -07:00
a80515fb20
Merge branch 'evtuhovich_209-i18n-in-repository-helper'
2011-03-19 10:58:06 +01: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
0320517d2c
[ #282 ] Make safe_attributes work with symbol keys
2011-03-14 17:50:12 +01:00
b5b3684473
[ #282 ] Make safe_attributes work with sub classes
2011-03-14 17:49:19 +01:00
40dbfd7744
Merge branch 'edavis10_280-issue-autocomplete-match-issue-ids'
2011-03-14 09:30:33 +01:00
7415dcb620
Merge branch 'ticket/master/280-issue-autocomplete-match-issue-ids' of https://github.com/edavis10/chiliproject into edavis10_280-issue-autocomplete-match-issue-ids
2011-03-14 09:30:10 +01:00
cdb80f697f
[ #281 ] Show the project on cross-project issues
2011-03-13 19:34:20 -07:00
2ffea883a6
[ #279 ] Add an optional Start Date to Versions
2011-03-13 19:14:08 -07:00
430fc228b5
[ #219 ] Add plugin hooks to the mailer layout
2011-03-13 17:31:01 -07:00
0db26f8337
[ #199 ] Add view_issues_show_identifier hook
...
Contributed by Yuki Sonoda
2011-03-13 17:27:20 -07:00
Holger Just
Eric Davis
Jean-Baptiste Barth
Toshi MARUYAMA
Felix Schäfer
Stephan Eckardt
Jens Ulferts
Ivan Evtuhovich
Gregor Schmidt