Commit Graph

31 Commits

Author SHA1 Message Date
Toshi MARUYAMA 3e89c2ff3e fix typos of source comments at WikiContent model
git-svn-id: http://svn.redmine.org/redmine/trunk@13058 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-04-06 14:14:40 +00:00
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Jean-Philippe Lang 205eda8b33 Use AR callbacks instead of observers (removed in Rails4) for notifications.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-14 14:26:27 +00:00
Jean-Philippe Lang e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Jean-Philippe Lang 0e30724d66 Group events in the activity view (#12542).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-08 08:24:01 +00:00
Jean-Philippe Lang 6cccdce06e Ability to delete a version from a wiki page history (#10852).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 18:45:14 +00:00
Jean-Philippe Lang 9796d18609 Handle deleted wiki page versions (#10852).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-21 04:43:15 +00:00
Jean-Philippe Lang d940797aa7 set_table_name and set_locking_column are deprecated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-27 16:28:35 +00:00
Jean-Philippe Lang f1cae4f7af WikiContent::Version#text may return ascii-8bit encoded string (#10590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9329 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 07:21:51 +00:00
Toshi MARUYAMA f0f7158d87 fix typo "RedMine" at app/models/wiki_content.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9316 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-03 14:04:38 +00:00
Jean-Philippe Lang b8a924e4e1 Adds #current_version? method to wiki content.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7972 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 20:12:03 +00:00
Toshi MARUYAMA 1dab1cd5cc Ruby 1.9: fix encoding error on wiki diffs (#4050)
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.

Contributed by Moritz Breit.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7927 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-25 23:15:55 +00:00
Toshi MARUYAMA 97abb12aeb remove trailing white-spaces from WikiContent model source.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5795 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-16 00:00:26 +00:00
Eric Davis 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
Eric Davis 17eab0f5f9 Fix wiki links on the activity page. #6746
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-26 15:44:30 +00:00
Jean-Philippe Lang 5879273739 Makes the wiki sidebar editable (#5208).
The content of the wiki page named 'Sidebar' is rendered in the sidebar if it exists. Permission to edit protected pages is required to create this page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3632 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 12:56:18 +00:00
Jean-Philippe Lang bb477a3a0f Make sure users don't get notified for thing they can not view (#3589).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 14:26:54 +00:00
Jean-Philippe Lang 9c9dc6e814 Adds email notification on wiki changes (#413). It's disabled by default and can be enabled in application settings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 09:55:13 +00:00
Jean-Philippe Lang 682c5d1113 Follows r2720 (#3308).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 11:06:29 +00:00
Jean-Philippe Lang 7319e8e235 Adds wiki comments length validation (#3308).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2720 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 08:49:45 +00:00
Jean-Philippe Lang fce4615f10 Display latest user's activity on account/show view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2066 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-30 11:18:22 +00:00
Jean-Philippe Lang 455abea320 Adds a permission 'view wiki edits' so that wiki history can be hidden to certain users (#1154).
A migration automatically adds this permission to roles that were allowed to view wiki pages.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-13 16:45:01 +00:00
Jean-Philippe Lang a774c5c48b Activity refactoring.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-07-27 17:54:09 +00:00
Jean-Philippe Lang 6d2a89142a Add an icon to each event on the activity view.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1342 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-04-12 16:54:14 +00:00
Jean-Philippe Lang 624723d0ce Activity enhancements:
* overall activity view and feed added, link is available on the project list (#423, #494)
* switch added on the project activity view to include subprojects (closes #530)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1227 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-03-11 19:33:38 +00:00
Jean-Philippe Lang 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
Jean-Philippe Lang 124ef65c1f Fixed warning: toplevel constant User referenced by WikiContent::User
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1000 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-12-15 11:57:48 +00:00
Jean-Philippe Lang 603e11d7a5 Merged 0.6 branch into trunk.
Permissions management was rewritten. Some permissions can now be specifically defined for non member and anonymous users.
This migration:
* is irreversible (please, don't forget to *backup* your database before upgrading)
* resets role's permissions (go to "Admin -> Roles & Permissions" to set them after upgrading)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-08-29 16:52:35 +00:00
Jean-Philippe Lang 5332c4362c Added page association on versioned WikiContent
git-svn-id: http://redmine.rubyforge.org/svn/trunk@565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-06-17 19:32:58 +00:00
Jean-Philippe Lang f12315075f Optimistic locking added for wiki edits.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-05-26 17:22:27 +00:00
Jean-Philippe Lang 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