70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
cc10d1a0d8
Removed extraneous hidden_field on wiki history ( #7379 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
e7a9c386ef
Removed hard-coded style on wiki history view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4651 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-06 21:24:32 +00: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
c514dd6885
Refactor: convert WikiController to a REST resource
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-28 21:25:38 +00:00
e9efa5b981
Refactor: use :id instead of :page when linking to Wiki Pages
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-27 16:27:06 +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
c259ada6e1
Refactor: rename WikiController#index to #show, it's a single resource action
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-21 16:07:28 +00:00
d3381fb518
Refactor: change :id on WikiController to use :project_id
...
Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-20 21:26:30 +00:00
08a013da44
Minor bug fixes to journalized versions
2010-08-10 16:18:26 +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
3e2e5a0a0c
Removes broken javascript on wiki history.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3559 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-10 19:16:03 +00:00
113049412b
Link to the user from the wiki history view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3496 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-26 16:03:05 +00:00
af6b01f55d
Hiding the View Differences button when a wiki page's history only has one version.
...
Patch contributed by Chaoqun Zou (#1743 )
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-20 05:09:13 +00:00
91a5fa32d7
Fixes non-matching html tag ( #1734 ).
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1714 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-03 09:30:56 +00:00
9a1b46fe42
New setting added to specify how many objects should be displayed on most paginated lists.
...
Default is: 25, 50, 100 (users can choose one of these values).
If one value only is entered in this setting (eg. 25), the 'per page' links are not displayed (prior behaviour).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-12-29 11:36:30 +00:00
31c6ebb310
Added wiki annotate view. It's accessible for each version from the page history view.
...
Slight style change: pre-wrap added on file/diff contents.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-12-20 19:10:24 +00:00
57d3dd3b80
Sligth changes on my page issue tables and wiki history, changesets tables.
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@808 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-10-05 20:34:21 +00:00
f2a5304d64
Sligth changes to wiki views.
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-09-29 10:26:57 +00:00
5e20417e6d
Added wiki diff.
...
Diff can be viewed from the page history, or directly from the project activity page for each edit.
Uses Lars Christensen's diff library.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-07-14 11:25:03 +00:00
6d7a855ca2
Added pagination on wiki page history.
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@571 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-06-23 18:53:45 +00:00
52547466f0
Fixed: 10342 Creation of Schema in Oracle
...
Comment is a reserved keyword for Oracle. The five 'Comment' columns are renamed to 'Commments'.
Migration scripts were modified to let oracle users create the database. For the others, migration 41 will rename the columns (only if columns have the 'old' name).
Fixed also a few oracle specific issues.
Note: currently (in Rails 1.2.3), there's bug in Rails oracle adapter. See: http://dev.rubyonrails.org/ticket/7344
Attached patch is required for redMine to work properly.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@479 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-04-25 15:06:20 +00:00
027bf93849
added svn:eol-style native property on /app files
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-03-12 17:59:02 +00:00
c514316a2e
wiki branch merged into trunk
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@323 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-03-10 15:09:49 +00:00
Felix Schäfer
Jean-Philippe Lang
Tim Felgentreff
Eric Davis
Wieland Lindenthal