Commit Graph

4089 Commits

Author SHA1 Message Date
Felix Schäfer 9ca203beae Update to latest version of acts_as_journalized. 2011-04-21 11:44:16 +02:00
Felix Schäfer 43ee27715a JournalDetails don't exist anymore. 2011-04-21 00:01:26 +02:00
Felix Schäfer ff431e8ed4 Force changeset journal creation. 2011-04-20 23:49:21 +02:00
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00
Eric Davis 78cee48c2d Merge branch 'release-v1.2.0' into stable 2011-03-27 11:06:28 -07:00
Eric Davis 25b0180546 Bump version to 1.2.0 2011-03-27 11:05:08 -07:00
Eric Davis eedf576b63 Update changelog for 1.2.0 2011-03-27 10:51:38 -07:00
Eric Davis 39c19958d7 [#308] Remove Redmine::VERSION::BRANCH 2011-03-27 10:48:20 -07:00
Jean-Baptiste Barth 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
Eric Davis 86faa88e55 Merge branch 'ticket/master/225-upstream-scm' 2011-03-27 10:19:26 -07:00
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Jean-Baptiste Barth 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Toshi MARUYAMA 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
Felix Schäfer 8d6133f6db Merge branch 'finnlabs-305_jstoolbar_fix_for_ie8' 2011-03-25 17:28:08 +01:00
Felix Schäfer 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
Eric Davis 1aa20b17b4 [#302] Protect ApplicationController methods so they are not considered actions 2011-03-24 14:22:21 -07:00
Stephan Eckardt 2c67f6103b replaced auth_source_id.nil? with change_password_allowed? in users controller 2011-03-24 13:55:50 -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 f1878f4a79 Merge remote branch 'thegcat/273-autologin_cookie_name' 2011-03-24 13:06:13 -07:00
Stephan Eckardt 9e04bf83c0 Fix jstoolbar to make buttons for h1, h2, <pre> etc. work in IE8 2011-03-24 19:35:49 +01:00
Stephan Eckardt 0ace77081d Backported changes to encloseSelection from latest DotClear release, less bugs in IE8 2011-03-24 16:14:10 +01:00
Felix Schäfer 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
Felix Schäfer 10dffcf3b9 Get the autologin cookie name from the config #273 2011-03-20 10:18:17 +01: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
Eric Davis 9c2089c585 Merge remote branch 'schmidt/f/282-enhance-safe_attributes' into upstream-master 2011-03-19 13:00:01 -07:00
Jens Ulferts 61be2ea669 [#270] bugfix: considering underscore a valid match in project identifier 2011-03-19 12:43:49 -07:00
Felix Schäfer a80515fb20 Merge branch 'evtuhovich_209-i18n-in-repository-helper' 2011-03-19 10:58:06 +01: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
Gregor Schmidt 0320517d2c [#282] Make safe_attributes work with symbol keys 2011-03-14 17:50:12 +01:00
Gregor Schmidt b5b3684473 [#282] Make safe_attributes work with sub classes 2011-03-14 17:49:19 +01:00
Felix Schäfer 40dbfd7744 Merge branch 'edavis10_280-issue-autocomplete-match-issue-ids' 2011-03-14 09:30:33 +01:00
Felix Schäfer 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
Eric Davis cdb80f697f [#281] Show the project on cross-project issues 2011-03-13 19:34:20 -07:00
Eric Davis 430fc228b5 [#219] Add plugin hooks to the mailer layout 2011-03-13 17:31:01 -07:00
Eric Davis 0db26f8337 [#199] Add view_issues_show_identifier hook
Contributed by Yuki Sonoda
2011-03-13 17:27:20 -07:00
Eric Davis 1e66dd9043 [#276] Add a link to log time to Project > Overview 2011-03-13 17:23:33 -07:00
Eric Davis ae0851ddb4 [#280] Include matching issue ids in the auto_completer.
Using SQL CAST() to convert the issue ids to strings so LIKE will work
properly.
2011-03-13 17:11:04 -07:00
Eric Davis 6ad92b659f [#278] Start issue autocompletes with one character 2011-03-13 16:48:34 -07:00