4d48a6b675
Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'
...
Conflicts:
app/helpers/repositories_helper.rb
2011-08-05 08:30:21 -07:00
30e81bed5c
Merge remote-tracking branch 'tomzx/b551_hardcoded_french_string'
...
Conflicts:
app/views/wiki/annotate.rhtml
app/views/wiki/diff.rhtml
app/views/wiki/show.rhtml
2011-08-05 08:27:49 -07:00
2c46411678
[ #547 ] Security audit
2011-08-01 16:00:23 -07:00
552cd8dc57
Replace hardcoded string "diff" in Wiki#show and Repositories_Helper.
2011-07-31 09:27:13 -04:00
aa6bf25b39
Replaced french word "anonyme" with label_user_anonymous.
2011-07-31 08:57:58 -04:00
63d8264320
Make links in exported wiki HTML files absolute
2011-07-08 21:18:47 +02:00
30bcd6c66b
Merge branch 'master' into release-v2.0.0
...
Conflicts:
doc/CHANGELOG.rdoc
lib/redmine/version.rb
2011-07-01 21:46:38 -07:00
ffc1db8a54
Added hook for additional wiki formats [refs #488 ]
...
* Allows plugins to add to the list of supported export formats at the
bottom of the Wiki#show view template
2011-06-20 22:32:47 -05:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
ce8bb652c6
[ #423 ] Removed explicit render in WikiController#show
...
* Allows for format extensions in plugins w/o giving a double-render
error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
(vs. just 'sidebar')
2011-05-27 10:20:45 -07:00
508b23cf41
[ #416 ] Watcher links work using of css selectors instead of ids
2011-05-17 20:03:02 +02:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
1b05ca5a6e
Adds an option to #render_page_hierarchy to add timestamp titles.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5099 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:56 -07:00
8b4c8e6902
Fixes wiki diff rendering.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
771147ce80
Extracts a diff helper from the WikiDiff class.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02: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
05e6e91098
Fis Atom links on wiki index pages.
2011-02-11 09:27:03 +01:00
9726157e3f
Fix Atom links on the wiki show page. #168
...
This fixes the autodiscovery link provided in the precedent commit and adds the link to the "other formats" section.
2011-02-11 09:21:08 +01:00
e19c7ac227
Add an RSS autodiscovery tag to wiki pages. #168
...
Contributed by Yuki Sonoda.
2011-02-11 09:01:36 +01: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
ef288fbff7
Broken links on wiki diff view.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 22:33:44 +00:00
666c54e86c
Adds a combo to select parent on wiki page rename ( #5136 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 14:30:32 +00:00
65097e7d11
fixing tests
2010-11-05 11:46:03 +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
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
70bf0706b2
Refactor: convert WikiController#destroy to use HTTP DELETE
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4295 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-26 15:59:20 +00:00
4b045badcf
Refactor: Rename WikiController#page_index to #index
...
index is the action that should list a collection of records, which is
what #page_index does.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4290 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-25 16:16:46 +00:00
d9652183f6
Fixed: file upload on wiki page broken by recent refactoring ( #6724 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4274 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 17:38:05 +00:00
cac3b1e538
Refactor: split WikiController#edit into #update
...
update will handle the saving and should be accessed via POST only.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 16:20:20 +00: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
c06c22cf2e
Refactor: extract method from WikiController#special
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4261 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-18 15:27:49 +00:00
0271105794
Refactor: extract #page_index from WikiController#special
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-15 15:36:10 +00:00
e8468b51cc
Refactor: extract method in WikiController#special to create a new #export method
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-13 17:13:50 +00:00
0d967c0572
Fix links to activity pages broken with r4047. #6392
...
Contributed by Felix Schafer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4092 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-16 21:26:30 +00:00
b925325ddb
Refactor: extract ProjectsController#activity to a new Activities controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-27 14:05:54 +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
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
ad487bf7cc
Replace the hardcoded "CodeRay" css class name for highlighted elements.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 13:22:50 +00: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
c174540a0e
Adds attachments upload on wiki edit form ( #1223 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3500 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 09:43:13 +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
6c8b87fbc8
Adds a permission for exporting wiki pages.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-06 09:30:53 +00:00
Eric Davis
Tom Rochette
Holger Just
Tom Kersten
Gregor Schmidt
Felix Schäfer
Jean-Philippe Lang
Felix Schäfer
Tim Felgentreff
Jean-Baptiste Barth
Wieland Lindenthal