Eric Davis
4d48a6b675
Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'
...
Conflicts:
app/helpers/repositories_helper.rb
2011-08-05 08:30:21 -07:00
Eric Davis
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
Eric Davis
2c46411678
[ #547 ] Security audit
2011-08-01 16:00:23 -07:00
Tom Rochette
552cd8dc57
Replace hardcoded string "diff" in Wiki#show and Repositories_Helper.
2011-07-31 09:27:13 -04:00
Tom Rochette
aa6bf25b39
Replaced french word "anonyme" with label_user_anonymous.
2011-07-31 08:57:58 -04:00
Eric Davis
70c3e1c8f9
[ #544 ] html_escape issue fields
2011-07-29 09:25:13 -07:00
Eric Davis
25b7b42c55
Fix for encoding errors on 1.9.2 with the mysql gem
2011-07-29 09:09:02 -07:00
Eric Davis
38b7ec5726
[ #191 ] Add pagination links above the search results
2011-07-08 15:11:53 -07:00
Eric Davis
839654fc85
[ #191 ] Refactor: extract search pagination to partial
2011-07-08 15:09:57 -07:00
Eric Davis
0b042903ca
[ #191 ] Refactor HTML style to CSS
2011-07-08 15:04:11 -07:00
Eric Davis
97dd339bbb
[ #191 ] Refactor: extract methods to helper
2011-07-08 14:59:23 -07:00
Holger Just
63d8264320
Make links in exported wiki HTML files absolute
2011-07-08 21:18:47 +02:00
Eric Davis
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
Eric Davis
66c4db8669
[ #490 ] Escape AuthSources in the list.
...
Contributed by MAEDA, Go
2011-06-27 15:38:45 -07:00
Eric Davis
a75eab1adb
[ #490 ] Escape AuthSources in the list.
...
Contributed by MAEDA, Go
2011-06-27 15:20:15 -07:00
Tom Kersten
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
Eric Davis
9f2c412fa6
[ #383 ] Fix for undefined_method 'to_utf8'
...
Contributed by Artem Naluzhnyy
2011-06-17 14:36:46 -07:00
Eric Davis
67dbd0160d
Document#category should be displayed as a required field
2011-06-17 10:25:56 -07:00
Eric Davis
1e68bed997
[ #442 ] Handle nil changes in Atom feed
2011-06-10 11:21:07 -07:00
Eric Davis
95b19953a4
Add plugin hooks to Users#show view
2011-06-07 14:51:19 -07:00
Holger Just
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
Eric Davis
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
Eric Davis
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
Eric Davis
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
Tom Kersten
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
Eric Davis
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
Gregor Schmidt
3893ef9f7d
[ #416 ] updating watcher_tag in news/show to use watcher_link
2011-05-17 20:22:05 +02:00
Gregor Schmidt
4fff430846
[ #416 ] removing reference to now unused local variable
2011-05-17 20:03:03 +02:00
Gregor Schmidt
a5b439544a
[ #416 ] introducing separate rjs view to reduce controller code
2011-05-17 20:03:03 +02:00
Gregor Schmidt
508b23cf41
[ #416 ] Watcher links work using of css selectors instead of ids
2011-05-17 20:03:02 +02:00
Felix Schäfer
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
Holger Just
c51eb7059a
[ #340 ] Format blockquote tags in emails.
2011-05-15 23:42:39 +02:00
Felix Schäfer
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
Eric Davis
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -07:00
Eric Davis
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
Eric Davis
90df645cae
Use link_to_user instead of a manual link
2011-05-11 15:40:55 -07:00
Eric Davis
315ec5f65c
HTML escape some user values
2011-05-11 15:39:07 -07:00
Eric Davis
e9c542d7da
Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable
2011-05-11 15:29:49 -07:00
Adam Soltys
f27614b576
make username a link to their profile page
2011-05-11 16:18:04 -06:00
Eric Davis
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
Eric Davis
ebf4584141
[ #380 ] Add example of a cross project wiki link
...
Contributed by Alf Gaida
2011-05-06 11:23:44 -07:00
Felix Schäfer
87e055cf47
disable browser autocomplete on password fields on user edit view. #360
2011-05-05 21:25:34 +02:00
Felix Schäfer
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
Gregor Schmidt
edb263cd2b
[ #379 ] using html_title properly
2011-05-05 10:54:39 +02:00
Gregor Schmidt
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
Gregor Schmidt
913c60f71c
Fixing typo
2011-05-02 15:06:41 +02:00
Gregor Schmidt
5cbcd702a4
Replacing Redmine w/ ChiliProject in wiki help texts
2011-05-02 14:49:10 +02:00
Gregor Schmidt
c0d7d45870
Fixing typo in detailed wiki syntax help
2011-05-02 14:43:31 +02:00
Gregor Schmidt
aced650a10
Introducing help layout
2011-05-02 14:32:50 +02:00
Gregor Schmidt
aeafbf3fa8
Cleaning up title and html header in help views
2011-05-02 13:12:35 +02:00