1565 Commits

Author SHA1 Message Date
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
635923f90d [#263] Fix admin menu sidebar styling 2011-07-29 15:33:59 -07:00
Eric Davis
8f45e780ce [#263] Fix issue subject style 2011-07-29 15:33:43 -07:00
Eric Davis
124c98d4ba [#263] Fix for changes to the admin_menu 2011-07-29 15:06:09 -07:00
Eric Davis
8c183dda2e [#263] Fix XSS regression from merge 2011-07-29 15:04:22 -07:00
Eric Davis
5cedd5cdcb [#263] Don't output heads_for_wiki_formatter 2011-07-29 14:46:39 -07:00
Eric Davis
cf40447356 Fix the thickbox loading image path 2011-07-29 14:43:33 -07:00
Eric Davis
6c9c85134a Fix the issue action bar CSS 2011-07-29 14:43:33 -07:00
Eric Davis
6435905132 Port issue show view 2011-07-29 14:43:33 -07:00
Eric Davis
ce973429fe Move the Add link next to the Related issues label 2011-07-29 14:37:24 -07:00
Eric Davis
cff91d8cf0 Port id selectors to the main issues list 2011-07-29 14:37:24 -07:00
Eric Davis
13f57032c1 Add the new issue button partial 2011-07-29 14:37:24 -07:00
Eric Davis
7485858da2 Cleanup styles in the issue filter section 2011-07-29 14:37:24 -07:00
Eric Davis
2dc0e100c3 Port the issue filter section on the issues list 2011-07-29 14:37:24 -07:00
Eric Davis
ec21b4c075 Merge issue context menu changes 2011-07-29 14:32:53 -07:00
Eric Davis
84ef979c47 Add welcome text to the project list 2011-07-29 14:31:27 -07:00
Eric Davis
6d522a9acd Remove the list of versions from sidebar, will be moved to menu 2011-07-29 14:31:26 -07:00
Eric Davis
48675d63a5 Clean up footer 2011-07-29 14:31:26 -07:00
Eric Davis
484ed29fa2 Port main layout 2011-07-29 14:29:23 -07:00
Eric Davis
1f57eb01b1 Merge HTML head section 2011-07-29 14:25:35 -07: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