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
635923f90d
[ #263 ] Fix admin menu sidebar styling
2011-07-29 15:33:59 -07:00
8f45e780ce
[ #263 ] Fix issue subject style
2011-07-29 15:33:43 -07:00
124c98d4ba
[ #263 ] Fix for changes to the admin_menu
2011-07-29 15:06:09 -07:00
8c183dda2e
[ #263 ] Fix XSS regression from merge
2011-07-29 15:04:22 -07:00
5cedd5cdcb
[ #263 ] Don't output heads_for_wiki_formatter
2011-07-29 14:46:39 -07:00
cf40447356
Fix the thickbox loading image path
2011-07-29 14:43:33 -07:00
6c9c85134a
Fix the issue action bar CSS
2011-07-29 14:43:33 -07:00
6435905132
Port issue show view
2011-07-29 14:43:33 -07:00
ce973429fe
Move the Add link next to the Related issues label
2011-07-29 14:37:24 -07:00
cff91d8cf0
Port id selectors to the main issues list
2011-07-29 14:37:24 -07:00
13f57032c1
Add the new issue button partial
2011-07-29 14:37:24 -07:00
7485858da2
Cleanup styles in the issue filter section
2011-07-29 14:37:24 -07:00
2dc0e100c3
Port the issue filter section on the issues list
2011-07-29 14:37:24 -07:00
ec21b4c075
Merge issue context menu changes
2011-07-29 14:32:53 -07:00
84ef979c47
Add welcome text to the project list
2011-07-29 14:31:27 -07:00
6d522a9acd
Remove the list of versions from sidebar, will be moved to menu
2011-07-29 14:31:26 -07:00
48675d63a5
Clean up footer
2011-07-29 14:31:26 -07:00
484ed29fa2
Port main layout
2011-07-29 14:29:23 -07:00
1f57eb01b1
Merge HTML head section
2011-07-29 14:25:35 -07:00
70c3e1c8f9
[ #544 ] html_escape issue fields
2011-07-29 09:25:13 -07:00
25b7b42c55
Fix for encoding errors on 1.9.2 with the mysql gem
2011-07-29 09:09:02 -07:00
38b7ec5726
[ #191 ] Add pagination links above the search results
2011-07-08 15:11:53 -07:00
839654fc85
[ #191 ] Refactor: extract search pagination to partial
2011-07-08 15:09:57 -07:00
0b042903ca
[ #191 ] Refactor HTML style to CSS
2011-07-08 15:04:11 -07:00
97dd339bbb
[ #191 ] Refactor: extract methods to helper
2011-07-08 14:59:23 -07: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
66c4db8669
[ #490 ] Escape AuthSources in the list.
...
Contributed by MAEDA, Go
2011-06-27 15:38:45 -07:00
a75eab1adb
[ #490 ] Escape AuthSources in the list.
...
Contributed by MAEDA, Go
2011-06-27 15:20:15 -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
9f2c412fa6
[ #383 ] Fix for undefined_method 'to_utf8'
...
Contributed by Artem Naluzhnyy
2011-06-17 14:36:46 -07:00
67dbd0160d
Document#category should be displayed as a required field
2011-06-17 10:25:56 -07:00
1e68bed997
[ #442 ] Handle nil changes in Atom feed
2011-06-10 11:21:07 -07:00
95b19953a4
Add plugin hooks to Users#show view
2011-06-07 14:51:19 -07:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07: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
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
8994a0b58d
[ #406 ] Added missing and removed unused code for Journals
...
acts_as_journalized changed the interfaces and didn't include all of
the recent changes to the Journals system.
* removed Journal diffs, acts_as_journalized handles them differently
* fixed the Journal atom feed
* added the journal preview back in
* added missing tests
2011-05-20 15:37:53 -07:00
3893ef9f7d
[ #416 ] updating watcher_tag in news/show to use watcher_link
2011-05-17 20:22:05 +02:00
4fff430846
[ #416 ] removing reference to now unused local variable
2011-05-17 20:03:03 +02:00
a5b439544a
[ #416 ] introducing separate rjs view to reduce controller code
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
c51eb7059a
[ #340 ] Format blockquote tags in emails.
2011-05-15 23:42:39 +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
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -07: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
90df645cae
Use link_to_user instead of a manual link
2011-05-11 15:40:55 -07:00
315ec5f65c
HTML escape some user values
2011-05-11 15:39:07 -07:00
e9c542d7da
Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable
2011-05-11 15:29:49 -07:00
f27614b576
make username a link to their profile page
2011-05-11 16:18:04 -06:00
13de4cc4b0
[ #383 ] Fixed failing tests due to a helper method name conflict (to_utf8)
...
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
ebf4584141
[ #380 ] Add example of a cross project wiki link
...
Contributed by Alf Gaida
2011-05-06 11:23:44 -07:00
87e055cf47
disable browser autocomplete on password fields on user edit view. #360
2011-05-05 21:25:34 +02:00
6fa5eb895f
Merge pull request #47 from schmidt/b/374-url-escaping-in-js-calls
...
Don't HTML-escaped URLs before passing them to the JavaScript helper. #374
2011-05-05 12:00:41 -07:00
edb263cd2b
[ #379 ] using html_title properly
2011-05-05 10:54:39 +02: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
913c60f71c
Fixing typo
2011-05-02 15:06:41 +02:00
5cbcd702a4
Replacing Redmine w/ ChiliProject in wiki help texts
2011-05-02 14:49:10 +02:00
c0d7d45870
Fixing typo in detailed wiki syntax help
2011-05-02 14:43:31 +02:00
aced650a10
Introducing help layout
2011-05-02 14:32:50 +02:00
aeafbf3fa8
Cleaning up title and html header in help views
2011-05-02 13:12:35 +02:00
8fb5e8b211
Introducing help controller, moving wiki syntax documentation to help controller
2011-05-02 12:45:19 +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
42653cef32
Shorten query[column_names] param name.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
07cf681d61
Makes all pagination-like links use #link_to_content_update ( #5138 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:50 -07: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
0c0763ad4b
Disable unused fields when switching the period type.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
82b638f727
Removed hidden project_id and issue_id parameters.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5298 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
789ccec246
Changed timelogs filters to use non-AJAX requests ( #1965 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
61d4a623a8
Fixed: list of users for adding to a group may be empty if 100 first users have been added ( #8029 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
62a4170531
Shortens filter param names.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
561fc8b0f2
Disable unused filter fields so they don't get submitted.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
d8fbdca760
Adds User and Version custom field format that can be used to reference a project member or version in custom fields ( #2096 ).
...
These new field formats are available for project, issue, version and time entry custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
c8682120db
Possible values label not hidden on custom field form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
33c28af67a
Removed hard coded french strings ( #8020 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
e06b581595
Adds support for preview when editing an issue note ( #5520 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -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
8c57b95c6a
Load scripts and css for wiki formatter toolbar when needed.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
4bcba6a094
Adds support for saturday as the first week day ( #7097 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -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
5395caed68
scm: remove "View all revisions" in sub directory ( #7984 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5223 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
f6fc3b88ff
scm: add rev param to "View revisions" ( #7984 ).
...
There are two paths to show specific revision.
* http://www.redmine.org/projects/redmine/repository/revisions/5219/show
* http://www.redmine.org/projects/redmine/repository/show?rev=5219
First link is http://www.redmine.org/projects/redmine/repository/revisions/5219/changes .
But, Second link is http://www.redmine.org/projects/redmine/repository/changes .
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
3c619704bf
scm: do not display 'View revision' links in subversion if path or revision are nil ( #7984 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5219 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
70d58275e2
scm: backout r5213. do not display both 'View all revisions' and 'View revision' links ( #7984 , #7246 ).
...
Git and Mercurial support *branch*.
Git in repository root shows *master branch*.
Git master branch does not have all revisions.
Mercurial default branch is *default branch*.
Mercurial shows *tip* in repository root.
Mercurial does not treat directory. "hg log DIR" costs high.
Getting correct limited changesets in sub directory and branch is very heavy.
So, if there is no recent revision in sub directory and branch,
no changeset shows.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5218 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
50405c5f9f
Do not display both 'View all revisions' and 'View revision' links ( #7984 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5213 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
a51ef9490c
Show open and closed issues from "Issues by" version links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5187 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -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
29ce58b493
Adds links to reset filters on users and projects list.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
4f8e8df6e0
Adds a Group filter on the admin users list ( #7893 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
3c19cacf97
Replaces TimeEntry.visible_by with a visible scope.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:40:03 -07:00
51faa24b37
scm: use blank? for "root @ branch" in repository tree viewing.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Eric Davis
Tom Rochette
Holger Just
Tom Kersten
Gregor Schmidt
Felix Schäfer
Adam Soltys
Felix Schäfer
Jean-Philippe Lang
Toshi MARUYAMA