07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
cd64d11e17
Merge branch 'master' into unstable
...
Conflicts:
app/controllers/watchers_controller.rb
app/views/issues/_action_menu.rhtml
config/locales/pt-BR.yml
doc/CHANGELOG.rdoc
lib/redmine/export/pdf.rb
lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
4fff430846
[ #416 ] removing reference to now unused local variable
2011-05-17 20:03:03 +02:00
508b23cf41
[ #416 ] Watcher links work using of css selectors instead of ids
2011-05-17 20:03:02 +02:00
9cb4feefce
Update the watcher list on click on "watch". #311
...
Based on a patch contributed by Price M.
2011-05-17 20:03:01 +02:00
20d804825d
Update the watcher list on click on "watch". #311
...
Based on a patch contributed by Price M.
2011-05-14 17:54:11 +02:00
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
6408cddc40
[ #374 ] Not escaping URLs since they are used in a safe CDATA section, where no entity encoding is needed.
2011-05-04 19:28:24 +02:00
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
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
d4adcae569
Update the Issue#show.api to new journals type
2011-04-21 11:44:55 +02:00
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
23149957db
Adds wiki toolbar to notes editing form ( #7899 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
e7a3085eba
Allow bulk editing of parent issue ( #5831 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5224 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
9b9c7ae91d
Adds links on the issue list to collapse/expang all groups ( #7236 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
886c3e295b
Splits private/public issue queries in the sidebar ( #1067 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:57:31 -07:00
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
b96115bf7b
[ #310 LSS#5727] Add checkbox option to determine if issue emails should be sent
2011-03-30 11:48:59 -07:00
0db26f8337
[ #199 ] Add view_issues_show_identifier hook
...
Contributed by Yuki Sonoda
2011-03-13 17:27:20 -07:00
887a10ac60
Merge branch 'f/149-hide_file_upload_section'
2011-02-20 18:29:21 +01:00
705bd74378
[ #169 ] Add a ROBOTS meta tag to several forms to hide from web spiders
...
Based on the patch by Yuki Sonoda
2011-02-13 18:17:45 -08:00
c2a530f8c8
Moves relations fetching from views to the controller and skip invalid relations ( #7385 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
8a863a4f1b
Attachment fields in a collapsed fieldset #149
...
Puts the attachment fields in a collapsed fieldset on issue update.
2011-02-09 21:33:14 +01:00
3ad213c29a
Fix associated revisions label on issue page.
...
r4613 shows git long hash value.
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-08 00:19:51 +00:00
86e17ce74f
Sort versions drop down on the bulk edit form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4533 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-18 14:14:04 +00:00
0c24f88ce1
Fixed: issue description Quote button lost by r3941 ( #7122 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4530 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-18 13:40:50 +00:00
6a586c39e9
Adds journal created_on attribute to issue API ( #7111 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4512 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-14 19:03:17 +00:00
a8cf13e8c8
Restores the issue description label ( #6677 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4506 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 17:12:05 +00:00
00d50157d3
Restores object count and adds offset/limit attributes to API responses for paginated collections ( #6140 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4489 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 13:13:49 +00:00
f2b42237d0
Fixes indentation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4487 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 10:24:58 +00:00
5f57bceabb
Makes some attributes optional in API response to get faster/lightweight responses.
...
These attributes are not required for common uses case (eg. updating an object). They can be requested in the reponse using the 'include' parameter. Example GET /issues/1.xml?include=journals. The list of attributes that can be included in responses will be documented in the wiki.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4486 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 10:19:11 +00:00
ab6a93b029
Changes the representation of journal details in issue API.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4483 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 12:22:37 +00:00
0e19aa4362
Fixed: error when serializing back objects with custom fields using ActiveResource ( #6403 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4480 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 10:12:19 +00:00
224921460a
Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 17:43:39 +00:00
9157482049
Adds subtasks to GET /issues/:id API ( #5338 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4465 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 13:02:14 +00:00
735a83c596
Converts IssuesController to use the new API template system and makes xml/json responses consistent ( #6136 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 13:52:07 +00:00
90ba2d4bfb
update xml builder to use the journals instead of journal details
2010-11-03 17:30:07 +01:00
859bfa625d
Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized
...
Conflicts:
app/models/wiki_content.rb
app/views/wiki/history.rhtml
config/locales/bg.yml
config/locales/ca.yml
config/locales/de.yml
test/integration/api_test/projects_test.rb
2010-11-03 16:03:39 +01:00
abb83f4c4f
Added ability to create issue directly as a subtask of another one. #5484
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4311 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-30 16:15:31 +00:00
19c7dc0094
Merge remote branch 'edavis/master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/wiki_controller.rb
app/helpers/issues_helper.rb
app/models/time_entry.rb
app/models/wiki_content.rb
app/views/wiki/edit.rhtml
config/locales/ja.yml
test/functional/wiki_controller_test.rb
2010-10-26 18:28:39 +02:00
8cece46dd4
Merge branch 'master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/context_menus_controller.rb
app/controllers/gantts_controller.rb
app/controllers/issue_moves_controller.rb
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/controllers/previews_controller.rb
app/controllers/timelog_controller.rb
app/helpers/issues_helper.rb
app/helpers/journals_helper.rb
app/models/issue.rb
app/models/journal.rb
app/models/journal_observer.rb
app/views/admin/projects.rhtml
app/views/context_menus/issues.html.erb
app/views/issues/_action_menu.rhtml
app/views/issues/_history.rhtml
app/views/news/_news.rhtml
app/views/news/index.rhtml
app/views/repositories/diff.rhtml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/es.yml
config/locales/eu.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml
config/routes.rb
doc/CHANGELOG
lib/redmine.rb
lib/redmine/export/pdf.rb
lib/redmine/helpers/gantt.rb
lib/redmine/version.rb
public/stylesheets/application.css
test/functional/context_menus_controller_test.rb
test/functional/issues_controller_test.rb
test/functional/journals_controller_test.rb
test/functional/previews_controller_test.rb
test/functional/users_controller_test.rb
test/functional/wiki_controller_test.rb
test/integration/routing_test.rb
test/unit/issue_test.rb
test/unit/mailer_test.rb
test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
dc26fd215b
Add ids to some sections of the issue form
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 18:20:00 +00:00
c058bc2245
Remove the Description label from the issue view and omit the block if empty ( #6677 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-19 19:26:07 +00:00
c8177b99ed
Revert part of r3936.
...
link_to_if_authorized no longer supports paths for the link options.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4258 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-15 23:11:05 +00:00
84ebd786d6
Fix the Log Time link on an issue page
...
Contributed by Philippe Lafoucrière (gravis)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4243 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-08 15:01:20 +00:00
156eca4d22
Added ability to edit issues from different project through contextual menu ( #5332 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-08 03:09:51 +00:00
2ecca7e4df
Refactor: rename TimelogController#details to #index
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-06 18:23:45 +00:00
a09a39402e
Add view_issues_form_details_top hook
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 18:50:09 +00:00
f62a1827f3
Updated issue delete confirmation when it has child issues. #6191
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 02:55:26 +00:00
35dba0f412
Fixed: pressing enter in filters should result to an 'apply', not a 'save'. #2285
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4093 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-16 21:33:49 +00:00
Holger Just
Eric Davis
Gregor Schmidt
Felix Schäfer
Jean-Philippe Lang
Felix Schäfer
Toshi MARUYAMA
Tim Felgentreff
Jean-Baptiste Barth