Commit Graph

1068 Commits

Author SHA1 Message Date
Gregor Schmidt 92b6d43150 [#780] using a changing cache key to avoid the need for explicit cache invalidation
This should work on all cache stores, since only the basic cache operations fetch and delete are used. The methods clear_cache and check_cache can no longer be supported. To sweep the whole cache Rails.cache.clear may be used. To invalidate the Settings only, you may use Setting.first.try(:touch).
2011-12-19 17:30:08 +01:00
Holger Just 745f889e92 Enforce UTF-8 source encoding 2011-12-18 21:40:14 +01:00
Holger Just e1ac469cfb Fix trailing whitespace 2011-12-18 21:40:01 +01:00
Holger Just d24e8186b4 Merge remote-tracking branch 'chiliproject/master' into unstable 2011-12-18 21:33:05 +01:00
Eric Davis 2f0d13149d Copyright header update 2011-12-17 15:50:52 -08:00
Eric Davis 3a16f3f5b1 Merge remote-tracking branch 'upstream/master' into unstable 2011-12-17 15:20:58 -08:00
Eric Davis 0f8a040d28 [#3619] Validate the AuthSourceLdap#custom_filter
Conflicts:

	app/models/auth_source_ldap.rb
	test/unit/auth_source_ldap_test.rb
2011-12-13 20:56:31 +01:00
Eric Davis 1318ac204e [#3619] Allow defining a custom ldap filter for AuthSourceLdap.
Conflicts:

	app/models/auth_source_ldap.rb
	config/locales/en.yml
	test/unit/auth_source_ldap_test.rb
2011-12-12 13:43:21 +01:00
Eric Davis b2998c3972 Merge pull request #132 from mbreit/feature/733-issue-due-today
[#733] Add Issue#due_today? and add due-today css class
2011-12-10 13:29:27 -08:00
Felix Schäfer 6a616a5f13 [#740] Fix faulty assignment 2011-12-03 16:32:29 +01:00
Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
Felix Schäfer 42363c32f7 Better checks for previous commit. 2011-11-30 18:08:36 +01:00
Felix Schäfer f333f43a57 [#736] force recipients/cc to arrays in the Mailer
String#delete might break on 1.9 with dashes in the author's email address. Furthermore, String#delete doesn't do what the original author thought it does.
2011-11-30 18:04:09 +01:00
Moritz Breit ed0e92b1f6 [#733] Add Issue#due_today? and add due-today css class 2011-11-25 21:06:29 +01:00
Felix Schäfer 8b7ee93f90 Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19
[#707] Fix encoding error on wiki diffs on Ruby 1.9
2011-11-25 09:48:52 -08:00
Felix Schäfer 03d956c360 Merge pull request #90 from meineerde/issues/master/124-delete-registered-users
[124] delete registered users
2011-11-25 09:47:12 -08:00
Eric Davis e6fe1fc776 Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable 2011-11-25 01:44:19 -08:00
Eric Davis 7906afe6b9 [#604] Add an IssueDrop with custom field support 2011-11-20 02:49:12 +01:00
Eric Davis 6f8d8c4105 [#604] Add basic WikiPageDrop 2011-11-19 23:34:52 +01:00
Eric Davis 91914cb877 [#604] Add simple Liquid drops for Projects and Principals 2011-11-19 23:33:36 +01:00
Moritz Breit 60db868470 [#707] Fix encoding error on wiki diffs on Ruby 1.9
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
2011-11-16 17:39:26 +01:00
Eric Davis 1e41ec912b Guard against a LocalJumpError in Project#project_tree 2011-11-14 19:23:49 -08:00
Felix Schäfer b1671e46f0 Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
Felix Schäfer af50984023 Better decide if journal implements the method itself. #554 2011-11-06 13:25:31 +01:00
Holger Just 9c8380667c Merge branch 'master' into unstable 2011-10-31 18:18:44 +01:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Eric Davis 2b7a221dee [#672] Allow each Query to control if subprojects are included or not 2011-10-25 18:13:32 -07:00
Gregor Schmidt c1ecadbff7 Moving query related models into separate files
This should enable easier overwriting/reloading in plugins, since now the autoloader is able to find the models.
2011-10-12 11:35:26 +02:00
Felix Schäfer b47a90b424 Allow to filter watchers by more than just "me". #566 2011-10-03 09:52:00 +02:00
Holger Just c57c598204 Fix trailing whitespace 2011-08-27 18:26:12 +02:00
Gregor Schmidt 962b35e11a [#573] Being more explicit about search fields to make sure, that AR joins all tables properly 2011-08-11 10:05:34 +02:00
Holger Just 54b4fdf1aa [#124] Allow to delete users with STATE_REGISTERED 2011-08-02 02:27:37 +02:00
Holger Just fc84783de1 [#124] Validate user status changes 2011-08-02 02:26:55 +02:00
Felix Schäfer 531653596d Touch journaled objects on journal creation only. #543 2011-07-29 15:12:06 +02:00
Felix Schäfer 894911f5dc Correct deflation of gzipped wiki text. #523 2011-07-29 10:19:43 +02:00
Gregor Schmidt bf14f35223 [#537] version of new WikiContents should be 0 2011-07-25 19:07:05 +02:00
Eric Davis bbb4f63ae4 Brute force fix for Change#path #from_path on Ruby 1.9.2
Some database adapters are returning strings unencoded correctly (sqlite3-ruby)
2011-07-22 10:41:34 -07:00
Eric Davis d2724ef89c Brute force fix for Changeset#committer encoding on 1.9.2 2011-07-22 10:10:23 -07:00
Eric Davis 4a3e32b0f4 [#514] Fix forum notifications, only one email per created Message 2011-07-08 14:49:39 -07:00
Felix Schäfer 1bfe6715c6 Put empty start_dates in the future too. #499 2011-07-08 23:20:17 +02:00
Felix Schäfer 7222345ba8 Put issues with an empty due date in the future. #499 2011-07-08 23:09:11 +02:00
Eric Davis 1fae552c8f [#467] Fix Journal#journaled to prevent uninitialized constant Journal::Journaled 2011-07-08 12:43:03 -07:00
Felix Schäfer 7c4abeb8d3 Correct filters for int,float custom fields. #498 2011-07-08 21:39:36 +02:00
Eric Davis 32f92a5058 [#501] Ugly patch to stop creating journals when only line endings change 2011-07-01 12:25:07 -07:00
Eric Davis 8698b40974 Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0 2011-06-17 14:42:26 -07:00
Eric Davis 1cf08ee300 [#474] Changesets should use the author method for events
This will let them pick up the committer string if user is nil
2011-06-17 12:29:04 -07:00
Eric Davis 3d164f1da0 [#480] Fix replying to IssueJournals through email 2011-06-17 12:10:23 -07:00
Felix Schäfer 85c3d38d24 Fix the wiki links in the activity view. #469
Contributed by Artem Naluzhnyy.
2011-06-16 20:56:48 +02:00
Eric Davis f47821db0c [#350] Remove freeze from Settings so the values can be modified later 2011-06-10 11:44:44 -07:00
Eric Davis bfba5e2151 [#441] Journals should touch their journaled to update updated_on/at fields 2011-06-05 11:49:40 -07:00
Eric Davis ba3ddee99d [#444] Remove extra variable 2011-06-03 10:50:16 -07:00
Eric Davis f518251d5f [#444] Fix Changeset#to_utf8 coding standards 2011-06-03 10:46:46 -07:00
Jean-Philippe Lang 0f7ae9b658 Fixed: Update of Subversion changesets broken by r3466 under Solaris (#5255).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:15:13 -07:00
Toshi MARUYAMA 6efba7b05d scm: use upcase to compare encoding name "UTF-8" in log converting.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:14:05 -07:00
Toshi MARUYAMA e19c56d61a scm: replace invalid utf-8 sequences in comments instead of stripping on Ruby 1.8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:13:48 -07:00
Toshi MARUYAMA 0adf1a87b1 scm: code clean up app/models/changeset.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:38 -07:00
Toshi MARUYAMA 5511155674 scm: fix log converting error in Ruby 1.9 and add more tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5370 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:23 -07:00
Toshi MARUYAMA 60b34ea29b scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5368 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:09 -07:00
Toshi MARUYAMA 81bdbd77f7 scm: not use Iconv for log converting in Ruby 1.9 and fix tests fails in Ruby 1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:11:49 -07:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis 5a9ffe9627 Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable 2011-05-27 15:00:08 -07:00
Eric Davis e4fac8d40f [#350] Refactor: extract method 2011-05-27 14:59:42 -07:00
Eric Davis b95c526151 Fix failing test: RepositoryMercurialTest#test_activities 2011-05-27 14:08:18 -07:00
Felix Schäfer c51a32ac23 Use Rails.cache to cache application settings. #350 2011-05-25 17:11:16 +02:00
Felix Schäfer 5c8e04db55 Fix SearchController tests.
The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).
2011-05-25 16:40:34 +02:00
Eric Davis a4f7629f1f [#400] Fix some tests broken by 6656103 2011-05-20 14:22:55 -07:00
Felix Schäfer 66561031eb [#400] Fix the event types (icons on activity and search views). 2011-05-20 13:51:51 -07:00
Felix Schäfer cf0804259d Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable 2011-05-20 15:45:54 +02:00
Felix Schäfer dbc10d2730 Save the comments to wiki page updates correctly. #415 2011-05-20 15:44:47 +02:00
Holger Just d90102420d [#112] Adapt database switches to use ChiliProject::Database 2011-05-15 23:15:52 +02:00
Eric Davis 193b2c7a38 [#404] Move vendor/plugins/acts_as_journalized/app/ to the core app/ 2011-05-13 12:34:24 -07:00
Eric Davis 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
Gregor Schmidt c2d058a53b [#390] check to handle mysql2's early type casting 2011-05-11 00:19:11 +02:00
Eric Davis 1f8828838e [#123] Attachment changes need to be prefixed 2011-05-06 14:08:39 -07:00
Eric Davis 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
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang 1d0b4dcdcc Do not load projects association in #rolled_up_trackers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5293 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 3374130e60 Skip a few count(*) SQL queries on the issue list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5292 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 61d4a623a8 Fixed: list of users for adding to a group may be empty if 100 first users have been added (#8029).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 8fae4e2ee5 Fixes #possible_values_options when given an object with nil project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang d8fbdca760 Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096).
These new field formats are available for project, issue, version and time entry custom fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 5f3d184880 Modules selection lost on project form after validation failure (#8012).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
Jean-Philippe Lang 9fa13cf4b8 Save queries.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5245 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
Jean-Philippe Lang d022da5dd5 Save 1 query + 1 cache hit in #shared_versions for root projects.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5243 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
Jean-Philippe Lang dafbb8b283 Fixed links in new file notification broken by r4051 (#6590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang b1c4f0fc4f Do not send reminders to locked users (#5773).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5225 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang f6d059485d Adds css classes to parent/child issues (#7986).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5221 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
Jean-Philippe Lang da721facfe Fixes sort parameter in reminder email links (#7963).
Contributed by Beat Jörg.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5215 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
Jean-Philippe Lang 1d93b0e9f6 Fixed: news comments not deleted when deleting a project (#7904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
Jean-Philippe Lang 94d3595e31 Fixed: children projects are deleted instead of being destroyed when destroying parent project (#7904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5171 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:44:44 -07:00
Jean-Philippe Lang f34a566c75 Prevent error when referencing an issue without project (#7890).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5157 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Jean-Philippe Lang 4f8e8df6e0 Adds a Group filter on the admin users list (#7893).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
Jean-Philippe Lang 3c19cacf97 Replaces TimeEntry.visible_by with a visible scope.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:40:03 -07:00
Toshi MARUYAMA 232729d93f scm: mercurial: increase limit of branch directory latest changesets.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5146 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Toshi MARUYAMA e311b26c41 scm: set supporting directory revisions or not at scm level.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5144 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Toshi MARUYAMA 8412b4f104 scm: set supporting all revisions or not at scm level.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Jean-Philippe Lang 27177defdd Adds a visible scope to the Journal model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Jean-Philippe Lang 7c2a3dc57d Adds Issue#visible_condition to build issue visibility statement.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00