Commit Graph

3884 Commits

Author SHA1 Message Date
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
Holger Just 85e1333e0c Merge remote-tracking branch 'schmidt/b/266-fix-monkey-patching-of-rubytree' 2011-03-07 22:04:12 +01:00
Felix Schäfer c8e584e894 Add the custom_fields helper to JournalsController #267 2011-03-07 19:44:11 +01:00
Gregor Schmidt 61e20cb29d Fixing monkey patching of rubytree to be more robust 2011-03-07 16:32:16 +01:00
Holger Just 0caf4b3d5e Merge remote-tracking branch 'schmidt/b/251-make-chili-work-with-rubyges-1.6' 2011-03-02 15:08:41 +01: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
Holger Just 5592794d75 Merge branch 'meineerde/issues/250-allow-empty-groups-in-queries' into chiliproject/master 2011-03-02 11:18:50 +01:00
Holger Just ca9ff0e471 [#250] Add tests for empty sets of users in queries 2011-03-02 11:12:57 +01:00
Holger Just 21b8e8b5e5 [#250] Allow empty sets in query value lists 2011-03-02 11:11:53 +01:00
Eric Davis f2285fa914 Merge branch 'release-v1.1.0' 2011-02-27 15:15:05 -08:00
Eric Davis deaf11e0a2 Version 'bump' for the v1.1.0 release 2011-02-27 14:22:57 -08:00
Eric Davis a20950f6e1 Update changelog for v1.1.0 2011-02-27 14:18:04 -08:00
Eric Davis d9c25d09f3 Merge branch 'ticket/master/211-app-docs' into upstream-master 2011-02-27 10:58:59 -08:00
Eric Davis d0591d46e8 [#211] Added a GPL based Copyright file 2011-02-27 10:57:10 -08:00
Eric Davis fa64a39203 [#211] Updating rdoc documentation 2011-02-26 13:41:32 -08:00
Eric Davis d8ca508566 [#211] Rewrite the Readme with an overview of the project 2011-02-26 13:31:17 -08:00
Eric Davis 376260e968 [#211] Override the Rails doc:app task to include our doc layout 2011-02-26 13:29:37 -08:00
Eric Davis 03a1d926be [211] Rename doc files to rdoc 2011-02-26 13:28:33 -08:00
Eric Davis 00c1337244 [#211] We have setup our own git process 2011-02-26 13:25:51 -08:00
Eric Davis 2506056777 Merge branch 'ticket/master/163-rails-mail_to-encoding' into upstream-master 2011-02-26 12:53:11 -08:00
Eric Davis 151b4cd404 [#163] Add extra escape in mail_to's javascript. Rails CVE-2011-0446 2011-02-26 12:51:22 -08:00
Eric Davis 2b6a982801 Add the test environment to configuration.yml.example 2011-02-24 16:00:55 -08:00
Eric Davis 0dadde5141 Merge branch 'feature/master/174-configuration-docs' into upstream-master 2011-02-24 15:59:40 -08:00
Eric Davis fc80da5992 [#174] Change Redmine to ChiliProject in the user configuration files 2011-02-24 15:24:20 -08:00