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
26ef9da02b
Changed the notifications to use a hierarchy UI
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 21:09:06 +00:00
4c9f261a24
Added three new notifiable events based on issue attributes
...
* issue_note_added
* issue_status_updated
* issue_priority_updated
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4221 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 20:20:00 +00:00
244e94de80
Refactor the hardcoded event actions (notifiables) to use a class
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4220 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 20:19:55 +00:00
0a224e8bb1
Bump version to 1.0.2
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 22:39:50 +00:00
ffb3d9260a
Support leading and trailing spaces in filenames or directories in the git adapter. #6499
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 21:54:52 +00:00
bd51119460
Support spaces in the files or directories in the git adapter. #6054
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 19:07:46 +00:00
319849caf8
Parse the timezone in #last_rev for git to correct display the Age diplay. #6346
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4187 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 18:41:06 +00:00
768d67f27b
Workaround for i18n 0.4.x with the old style syntax. #6428 #5608
...
This will also silance the whole trace with the deprecation warning.
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4183 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 17:13:52 +00:00
1809eefe4c
Use the correct local variables in the PDF export. #6382
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 02:55:20 +00:00
68ae2d0dfd
change issue specific journal query and show_details for journal helper
2010-09-15 12:56:33 +02:00
9cd55d8dd4
more test fixes
2010-09-14 18:07:38 +02:00
4b098d7774
Merge branch 'journals' into 1.0-stable
...
Conflicts:
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/helpers/journals_helper.rb
app/views/issues/_history.rhtml
lib/redmine/activity/fetcher.rb
test/functional/issues_controller_test.rb
test/test_helper.rb
2010-09-14 09:32:35 +02:00
5e1c295230
Fixed the zoom, previous, and next links on the Gantt chart.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4074 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:18 +00:00
abf3ee4999
Add project names to the Versions in the Gantt export. #5904
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:11 +00:00
bdb3937e0f
Rewrite the Gantt chart. #6276
...
This version of the Gantt chart supports nested charts. So Projects,
Versions, and Issues will be nested underneath their parents correctly.
Additional features:
* Move all Gantt code to Redmine::Helpers::Gantt class instead of having it in
the Gantt class, controller, and view
* Recursive and nest sub-projects
* Recursive and nest versions
* Recursive and nest issues
* Draw a line showing when a Project is active and it's progress
* Draw a line showing when a Version is active and it's progress
* Show a version's % complete
* Change the color of Projects, Versions, and Issues if they are late or
behind schedule
* Added Project#start_date and #due_date
* Added Project#completed_percent
* Use a mini-gravatar on the Gantt chart
* Added tests for the Gantt rendering
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4072 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:02 +00:00
2bea4b30a5
Merged r4028 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4031 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:21:20 +00:00
22fa8d9b31
Bump version to 1.0.1
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4028 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:15:38 +00:00
a96eb375ec
Merged r3925 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:13 +00:00
780bdccc42
Fixed wrong commit range in git log command. #5628
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-08 07:07:30 +00:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
47ecf151dd
completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized
...
This makes the wiki just use the versioning provided by acts_as_journalized
2010-08-04 19:01:18 +02:00
75024acf5a
possibly use the activity permissions in the fetcher to find visible event types
2010-07-29 11:31:06 +02:00
e771fc03bd
Merged r3883, r3884 and r3885 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3886 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:49:07 +00:00
701d2eaeac
Display project names in cross-project gantt PNG ( #5904 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3885 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:43:19 +00:00
bdad35a736
Display project names for versions too on PDF ( #5904 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3884 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:19:44 +00:00
cb5e63d846
Display project names in cross-project gantt PDF ( #5904 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3883 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:10:08 +00:00
4b52b7a8df
Change version to the show this is the stable branch.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3857 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 16:39:00 +00:00
6ed2e003a1
Merged r3854 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 16:38:56 +00:00
fa8d0c5c6f
Bump version to 1.0.0
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 16:35:43 +00:00
5e259d41e2
Fix typos in the examples. #5823
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3841 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-16 03:11:35 +00:00
2d282f8deb
move (almost) everything over to acts_as_journalized
2010-07-15 18:24:12 +02:00
aecb868b85
remove more journal specific functionality
2010-07-14 19:00:03 +02:00
a84ea6866d
Version 0.9.6
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3836 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-08 03:53:07 +00:00
ad73f12a6b
Include visible subprojects when checking for available Activity event types. #5589
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-06 02:22:03 +00:00
305cab100f
Rename code and locale typo: Developper. #5751
...
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 01:55:44 +00:00
bc3ad9af38
Bump release to 0.9.5
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-28 02:46:25 +00:00
6eea3300f8
Sanitize image links and handle nils in the toc formatter. #5445
...
Based on contribution by Yuki Kita.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-24 02:35:24 +00:00
c5863c0ad0
Support listing directories in svn which include square brackets. #5548
...
Contributed by Gregor Schmidt
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:08:26 +00:00
b53de502ab
Display the link name when external links are used in the toc macro. #5445
...
Contributed by Yuki Kita and Jean-Baptiste Barth
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 21:39:21 +00:00
a499efd328
Updates for 0.9.4 release.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 12:37:20 +00:00
6a8dc735d3
Fixes Bazaar adapter for JRuby/Win32 ( #5404 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 09:56:59 +00:00
b897089729
Fixes Mercurial adapter for JRuby ( #4494 , #5404 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3722 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 09:55:40 +00:00
f65c47e3a7
Fixes theme discovery under JRuby on Rails war structure ( #632 , #5404 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 12:44:19 +00:00
538642c5c4
Let custom field formats control how they are edited.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3675 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-16 15:34:05 +00:00
4cb943571a
Change the case statement into a method call based on the name
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-16 15:34:00 +00:00
d22723ed04
Refactor: Move method
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-16 15:33:55 +00:00
88db9d0bdc
Replace the hardcoded CustomField::FIELD_FORMATS with a class.
...
Custom Field Formats are now full objects and can be registered with
Redmine::CustomFieldFormat to add new formats.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-16 15:33:49 +00:00
4a51f10074
Fixes diff highlighting ( #5199 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-28 11:30:48 +00:00
8cdcf308be
Escape href attribute in auto links ( #5179 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-24 20:26:22 +00:00
Tim Felgentreff
Eric Davis
Jean-Baptiste Barth
Jean-Philippe Lang