kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,630 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

2650 Commits

Author SHA1 Message Date
Eric Davis 8994a0b58d [#406] Added missing and removed unused code for Journals 
acts_as_journalized changed the interfaces and didn't include all of
the recent changes to the Journals system.

* removed Journal diffs, acts_as_journalized handles them differently
* fixed the Journal atom feed
* added the journal preview back in
* added missing tests
 2011-05-20 15:37:53 -07: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
Gregor Schmidt 76c72d8f11 [#414] remove returning which will be removed in future versions of Rails 2011-05-14 00:19:53 +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
Eric Davis bf90848ae8 Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable 2011-05-13 09:29:48 -07:00
Eric Davis 90df645cae Use link_to_user instead of a manual link 2011-05-11 15:40:55 -07:00
Eric Davis 315ec5f65c HTML escape some user values 2011-05-11 15:39:07 -07:00
Eric Davis e9c542d7da Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable 2011-05-11 15:29:49 -07:00
Adam Soltys f27614b576 make username a link to their profile page 2011-05-11 16:18:04 -06:00
Gregor Schmidt c2d058a53b [#390] check to handle mysql2's early type casting 2011-05-11 00:19:11 +02:00
Eric Davis 13de4cc4b0 [#383] Fixed failing tests due to a helper method name conflict (to_utf8) 
Introduced in 1eee7312f6
 2011-05-06 16:38:13 -07:00
Eric Davis 1f8828838e [#123] Attachment changes need to be prefixed 2011-05-06 14:08:39 -07:00
Simon COURTOIS bfacd827a8 Removig english strings from RepositoriesHelper 2011-05-05 22:05:41 +02:00
Eric Davis bdc7325a82 Merge branch 'master' into unstable 
Conflicts:
	doc/CHANGELOG.rdoc
 2011-05-01 13:58:02 -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
Eric Davis d2973a641e [#347] Fix potential Execution After Redirect bugs 
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.

Contributed by Adam Doupé
 2011-04-28 14:39:19 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Felix Schäfer ef8141a2c1 Remove deprecated journals tests and controller. 2011-04-21 11:45:31 +02:00
Felix Schäfer d4adcae569 Update the Issue#show.api to new journals type 2011-04-21 11:44:55 +02:00
Eric Davis ed252f7246 [#309] Set the back_url after sending a lost password so HTTP_REFERER isn't used 
Contributed by Robert Chady
 2011-04-20 16:24:54 -07:00
Eric Davis 1eee7312f6 [#289] Remove single helpers in favor of :all in ApplicationController 2011-04-20 16:08:00 -07:00
Jean-Philippe Lang 42653cef32 Shorten query[column_names] param name. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:54 -07:00
Jean-Philippe Lang e78149f85c Keep issue filter params on sort headers. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:54 -07:00
Jean-Philippe Lang 1335548949 Changes pagination links to non-AJAX requests (#5138). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:53 -07:00
Jean-Philippe Lang 07cf681d61 Makes all pagination-like links use #link_to_content_update (#5138). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:50 -07:00
Jean-Philippe Lang 844c0d97aa Removed the changeset-changes class to the commit logs on the issue view (#8038). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 0c0763ad4b Disable unused fields when switching the period type. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 82b638f727 Removed hidden project_id and issue_id parameters. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 789ccec246 Changed timelogs filters to use non-AJAX requests (#1965). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 1cab1bd51e Skip a count(*) SQL query. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07: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 2431d830b1 No PUT request to get previous/next month. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5287 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 bb4a10fc85 Fixed: bulk destroying parent and child issues raises a stale object error (#7920). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5283 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 62a4170531 Shortens filter param names. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 4e6962e7c9 Keep filter params in 'Per page' links. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 561fc8b0f2 Disable unused filter fields so they don't get submitted. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5277 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 35a848dac7 Initialize TimeEntry with issue and project for the issue edit form. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5274 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -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 c8682120db Possible values label not hidden on custom field form. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5266 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -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 33c28af67a Removed hard coded french strings (#8020). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Jean-Philippe Lang e06b581595 Adds support for preview when editing an issue note (#5520). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:50 -07:00