Eric Davis
1e41ec912b
Guard against a LocalJumpError in Project#project_tree
2011-11-14 19:23:49 -08:00
Eric Davis
af9572d985
Confirm before deleting issue categories
2011-11-14 19:10:13 -08:00
Eric Davis
5f3c6b87e4
Show email notification options in a project tree
2011-11-14 18:55:39 -08:00
Felix Schäfer
b1671e46f0
Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
...
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
jwollert
edce16c89a
[ #692 ] enable jump to project box to take options (projects and html)
2011-11-12 16:22:31 -08:00
Romano Licker
977f74e11a
[ #692 ] Main design changes for new theme
2011-11-12 16:22:25 -08:00
Romano Licker
734da91b4b
[ #692 ] login slidedown implemented with tabindex and focus fix
2011-11-12 16:22:24 -08:00
Eric Davis
1897459b76
[ #263 ] Refactor: move top menu logic to ApplicationHelper
2011-11-06 19:49:23 -08:00
Eric Davis
3409f5b620
[ #658 ] Include jQuery v1.7, jquery ui 1.8.16, and smoothness theme
2011-11-06 19:21:56 -08:00
Eric Davis
ab2856b53f
[ #263 ] Add new layout and theme
...
Merge branch 'ticket/unstable/263-new-layout-ready' into unstable
2011-11-06 18:18:35 -08:00
Eric Davis
f10412ef71
[ #263 ] Update tests for views in the new layout
2011-11-06 17:46:31 -08:00
Eric Davis
5620488727
[ #263 ] Removed and tweaks the design based on feedback
2011-11-06 16:39:15 -08:00
Felix Schäfer
af50984023
Better decide if journal implements the method itself. #554
2011-11-06 13:25:31 +01:00
Holger Just
9c8380667c
Merge branch 'master' into unstable
2011-10-31 18:18:44 +01:00
Holger Just
ba93eb24c4
Fix trailing whitespace
2011-10-31 17:26:14 +01:00
Holger Just
21a45b4e52
[ #676 ] Enforce UTF-8 encodings on the params hash
...
Contributed by Toshi MARUYAMA
2011-10-30 11:25:56 +01:00
Holger Just
2f4afeeb38
[ #615 ] Generate project identifier automatically with JavaScript
...
Also let the user know that the identifier must start with a lower case letter.
Contributed by Jan Schulz-Hofen.
2011-10-30 10:33:20 +01:00
Holger Just
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
Felix Schäfer
92dd2934ae
Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
...
[#652 ] fixes wrong redirect after login
2011-10-29 08:47:02 -07:00
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
Holger Just
ec6221b7fe
Use class instead of redundant id
2011-10-29 14:28:51 +02:00
Kornelius Kalnbach
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +02:00
Eric Davis
e51f067f12
Merge branch 'ticket/unstable/263-new-layout' into unstable
2011-10-28 15:12:59 -07:00
Eric Davis
aed2b4f661
[ #263 ] Update jquery load order and embed noConflict in the HTML head directly
2011-10-28 14:36:10 -07:00
Eric Davis
5e2d633ebb
[ #263 ] Merge common.js into application.js
2011-10-28 14:26:14 -07:00
Eric Davis
ca3eeedfff
[ #263 ] Remove profile popups, never finished
2011-10-28 14:21:41 -07:00
Eric Davis
155e1ba2a7
[ #263 ] Remove thickbox
2011-10-28 14:18:53 -07:00
Holger Just
f1a8373d49
Remove non-break space
2011-10-28 17:46:24 +02:00
Romano Licker
5036478017
[ #667 ] improved code readability
2011-10-28 17:05:36 +02:00
Romano Licker
f31999061d
[667] corrected labels and translations for reassign forms
2011-10-28 17:05:09 +02:00
Romano Licker
3bd6aa3578
[ #667 ] made labels visible as this is an accessibility issue
...
even for sighted users
2011-10-28 17:03:38 +02:00
Romano Licker
fdf660e1fd
[ #667 ] linked labels to their elements
2011-10-28 17:03:38 +02:00
Romano Licker
2b472d876d
[ #667 ] linked label to its element
2011-10-28 17:03:38 +02:00
Romano Licker
6f5fda2248
[ #667 ] set ids, created invisible labels and linked them
2011-10-28 17:03:38 +02:00
Romano Licker
4747cdce5b
[ #667 ] linked labels to their element
2011-10-28 17:03:37 +02:00
Romano Licker
c77f3a0fe7
[ #667 ] link label to element
2011-10-28 17:03:37 +02:00
Romano Licker
71271e6ff6
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
Romano Licker
297294362b
[ #667 ] added invisible label
2011-10-28 17:03:37 +02:00
Romano Licker
3c04b30834
[ #667 ] added invisible label for mail notification,
...
linked label where possible
2011-10-28 17:03:37 +02:00
Romano Licker
26a7ea468a
[ #667 ] linked label to its element
2011-10-28 17:03:37 +02:00
Romano Licker
ecf6a9636a
[ #667 ] linked labels to their elements
2011-10-28 17:03:37 +02:00
Romano Licker
2c0fcd3bca
[ #667 ] added invisible labels for reassign select-tag on destroy views
2011-10-28 17:03:37 +02:00
Romano Licker
2f5cf020f3
[ #667 ] set unique id for each checkbox and linked it
...
added "no-css" class to overwrite the current label style
2011-10-28 17:03:36 +02:00
Romano Licker
207af21553
[ #667 ] set id for message_subject and linked it to label,
...
added invisible label
2011-10-28 17:03:36 +02:00
Romano Licker
4717a242cb
[ #667 ] link label to element
2011-10-28 17:03:36 +02:00
Romano Licker
2e688efa70
[ #667 ] link label to element
2011-10-28 17:03:36 +02:00
Romano Licker
0f5d38ca4b
[ #667 ] linked labels to their elements
2011-10-28 17:03:35 +02:00
Romano Licker
bf23c06d93
[ #667 ] added invisible labels for queries
2011-10-28 17:03:35 +02:00
Romano Licker
cd7b30dac6
[ #667 ] added invisible search label
2011-10-28 17:03:35 +02:00
Romano Licker
5ab9ed889c
[ #667 ] added invisible project scope label
2011-10-28 17:03:35 +02:00
Romano Licker
bf8de58548
[ #667 ] added 'for' to link them
2011-10-28 17:03:35 +02:00
Eric Davis
981e74f822
[ #668 ] Remove duplicate module fields when copying projects
2011-10-25 18:23:37 -07:00
Eric Davis
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
Eric Davis
5603103295
[ #240 ] Add link to all News on the Project list page
2011-10-25 15:49:32 -07:00
Eric Davis
b9d186e676
[ #277 ] Show avatars on the News list
2011-10-25 15:49:31 -07:00
Eric Davis
a8e997dbf6
Fully qualify column names
2011-10-14 17:09:46 -07:00
Gregor Schmidt
c1ecadbff7
Moving query related models into separate files
...
This should enable easier overwriting/reloading in plugins, since now the autoloader is able to find the models.
2011-10-12 11:35:26 +02:00
Romano Licker
34dc06a85f
[ #652 ] fixes wrong redirect after login
...
when url contains umlaute
2011-10-11 18:16:43 +02:00
Holger Just
d467f79214
Merge remote-tracking branch 'refs/remotes/thegcat/feature/566-more_watchers_to_filter_by'
2011-10-04 10:28:39 +02:00
Felix Schäfer
0d306a8bfc
Merge pull request #93 from peelman/form-attribute-changes
...
Adding Check All / Uncheck All on New Project form. #644
2011-10-03 01:18:59 -07:00
Felix Schäfer
b47a90b424
Allow to filter watchers by more than just "me". #566
2011-10-03 09:52:00 +02:00
Felix Schäfer
aac42afdaa
Add setting to set today as the start date for new issues. #355
...
Patch contributed by Bruno Medeiros on http://www.redmine.org/issues/2277
2011-10-02 22:02:29 +02:00
Felix Schäfer
225a1587a6
Show the correct authors in wiki diff view.
...
#author doesn't show the author of the journal but of the journaled object.
2011-09-10 09:21:45 +02:00
Holger Just
c57c598204
Fix trailing whitespace
2011-08-27 18:26:12 +02:00
Felix Schäfer
a24a24eb19
Add deferred loading for plugins which's requirements aren't all met yet #256
2011-08-25 18:46:53 +02:00
Felix Schäfer
3d03a3eda5
Merge pull request #96 from finnlabs/pulls/573/fix_aas_in_wiki_content
...
[#573 ] acts_as_searchable definition in WikiPage may be insufficient and cause SQL errors
2011-08-21 08:56:21 -07:00
Gregor Schmidt
962b35e11a
[ #573 ] Being more explicit about search fields to make sure, that AR joins all tables properly
2011-08-11 10:05:34 +02:00
Nick Peelman
2bb19b3e31
Adding check all links to new project form.
...
Makes bulk changes that much faster...
2011-08-08 19:53:33 -04:00
Nick Peelman
b8d0aa0b85
Adding id attribute to modules field set on project form.
2011-08-08 19:53:22 -04:00
Eric Davis
7f06e7394c
[ #263 ] Update SAP theme
2011-08-05 11:32:21 -07:00
Eric Davis
4b8f4c3b83
[ #263 ] Allow setting the page header title
2011-08-05 10:45:48 -07:00
Eric Davis
9bb8f80d7e
[ #263 ] Merging css
...
* Append main.css to the bottom of application.css
* Remove main.css
* Move print styles out to print.css
* Move the CSS reset to be loaded first
* Port some colors to color.css
2011-08-05 09:56:13 -07:00
Eric Davis
b4804f4ce4
[ #263 ] Merged redmine-reset.css into application.css
2011-08-05 09:28:52 -07:00
Eric Davis
ffa2d5f319
[ #263 ] Remove the tree of parent issues from the issue title
2011-08-05 09:01:03 -07:00
Eric Davis
156cdf316e
[ #263 ] Remove duplicated updated label
2011-08-05 08:56:28 -07:00
Eric Davis
a7ab39dd31
[ #557 ] Fix link_to_month to not escape the HTML arrow characters
2011-08-05 08:49:22 -07:00
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
Holger Just
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
Holger Just
fc84783de1
[ #124 ] Validate user status changes
2011-08-02 02:26:55 +02: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
e7e4557009
[ #263 ] Fix journal formatting
2011-07-29 15:04:03 -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
5949f8de91
Port issue history changes
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
c23f73e9fe
Port ApplicationHelper patches
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
Holger Just
d7a9adf880
move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices
2011-07-29 17:23:13 +02:00
Felix Schäfer
531653596d
Touch journaled objects on journal creation only. #543
2011-07-29 15:12:06 +02:00
Felix Schäfer
894911f5dc
Correct deflation of gzipped wiki text. #523
2011-07-29 10:19:43 +02:00
Holger Just
76490fcda5
Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail'
2011-07-27 16:03:14 +02:00
Gregor Schmidt
8c9034f41e
[ #539 ] removing dead code - this went into JournalFormatter
2011-07-26 23:00:47 +02:00
Holger Just
d62a4f1d28
Consider user's timezone for default issue start date
...
Contributed by Jan Schulz-Hofen
2011-07-25 19:16:15 +02:00
Gregor Schmidt
bf14f35223
[ #537 ] version of new WikiContents should be 0
2011-07-25 19:07:05 +02:00
Eric Davis
4b3bd797b0
Fix errors when trying to check for binary SCM strings in 1.9.2
...
1.9.2 removed String#is_binary_data?
2011-07-22 14:35:01 -07:00
Eric Davis
2d98a486d6
Fix failing test due to invalid HTML and missing initial journal
2011-07-22 11:52:55 -07:00
Eric Davis
bbb4f63ae4
Brute force fix for Change#path #from_path on Ruby 1.9.2
...
Some database adapters are returning strings unencoded correctly (sqlite3-ruby)
2011-07-22 10:41:34 -07:00
Eric Davis
d2724ef89c
Brute force fix for Changeset#committer encoding on 1.9.2
2011-07-22 10:10:23 -07:00
Eric Davis
477a5f3702
Refactor: replace comment with extracted utility method
2011-07-19 12:14:16 -07:00
Eric Davis
c62e16b6cc
Refactor: replace comment with utility method
2011-07-19 12:14:08 -07:00
Eric Davis
a2eeb4ae20
Refactor: extract setup to before_filter
2011-07-19 12:14:02 -07:00
Eric Davis
9771e20462
Refactor: use the new utility method to load ivars for settings
2011-07-19 12:13:53 -07:00
Eric Davis
1d3d7ff10c
Refactor: extract method to prepare to reuse
2011-07-19 12:13:46 -07:00
Eric Davis
db7bc2bb82
Refactor: extract method with before_filter
2011-07-19 12:13:39 -07:00
Eric Davis
075f4e49df
Refactor: remove unused instance variable
2011-07-19 12:13:33 -07:00
Eric Davis
e04928c5b1
Refactor: change large :except before_filter to :only
2011-07-19 12:13:15 -07:00
Eric Davis
2918437f34
Refactor: audit and remove unknown actions
2011-07-19 12:13:08 -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
Eric Davis
4a3e32b0f4
[ #514 ] Fix forum notifications, only one email per created Message
2011-07-08 14:49:39 -07:00
Felix Schäfer
1bfe6715c6
Put empty start_dates in the future too. #499
2011-07-08 23:20:17 +02:00
Felix Schäfer
7222345ba8
Put issues with an empty due date in the future. #499
2011-07-08 23:09:11 +02:00
Eric Davis
1fae552c8f
[ #467 ] Fix Journal#journaled to prevent uninitialized constant Journal::Journaled
2011-07-08 12:43:03 -07:00
Felix Schäfer
7c4abeb8d3
Correct filters for int,float custom fields. #498
2011-07-08 21:39:36 +02: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
32f92a5058
[ #501 ] Ugly patch to stop creating journals when only line endings change
2011-07-01 12:25:07 -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
c034d5e548
[ #398 ] Remove helpers from IssuesController
2011-06-17 14:46:09 -07:00
Eric Davis
8698b40974
Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0
2011-06-17 14:42:26 -07: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
1cf08ee300
[ #474 ] Changesets should use the author method for events
...
This will let them pick up the committer string if user is nil
2011-06-17 12:29:04 -07:00
Eric Davis
3d164f1da0
[ #480 ] Fix replying to IssueJournals through email
2011-06-17 12:10:23 -07:00
Eric Davis
67dbd0160d
Document#category should be displayed as a required field
2011-06-17 10:25:56 -07:00
Felix Schäfer
85c3d38d24
Fix the wiki links in the activity view. #469
...
Contributed by Artem Naluzhnyy.
2011-06-16 20:56:48 +02:00
Eric Davis
f47821db0c
[ #350 ] Remove freeze from Settings so the values can be modified later
2011-06-10 11:44:44 -07:00
Eric Davis
ee9b129382
Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0
...
Conflicts:
test/unit/journal_test.rb
2011-06-10 11:41:52 -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
Eric Davis
bfba5e2151
[ #441 ] Journals should touch their journaled to update updated_on/at fields
2011-06-05 11:49:40 -07:00
Eric Davis
ba3ddee99d
[ #444 ] Remove extra variable
2011-06-03 10:50:16 -07:00
Eric Davis
f518251d5f
[ #444 ] Fix Changeset#to_utf8 coding standards
2011-06-03 10:46:46 -07:00
Jean-Philippe Lang
0f7ae9b658
Fixed: Update of Subversion changesets broken by r3466 under Solaris ( #5255 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:15:13 -07:00
Toshi MARUYAMA
6efba7b05d
scm: use upcase to compare encoding name "UTF-8" in log converting.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:14:05 -07:00
Toshi MARUYAMA
e19c56d61a
scm: replace invalid utf-8 sequences in comments instead of stripping on Ruby 1.8.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:13:48 -07:00
Toshi MARUYAMA
0adf1a87b1
scm: code clean up app/models/changeset.rb.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:38 -07:00
Toshi MARUYAMA
5511155674
scm: fix log converting error in Ruby 1.9 and add more tests.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5370 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:23 -07:00
Toshi MARUYAMA
60b34ea29b
scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5368 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:12:09 -07:00
Toshi MARUYAMA
81bdbd77f7
scm: not use Iconv for log converting in Ruby 1.9 and fix tests fails in Ruby 1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-03 10:11:49 -07:00
Holger Just
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
Eric Davis
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
Eric Davis
e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -07:00
Eric Davis
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
Eric Davis
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
Eric Davis
e4fac8d40f
[ #350 ] Refactor: extract method
2011-05-27 14:59:42 -07:00
Eric Davis
b95c526151
Fix failing test: RepositoryMercurialTest#test_activities
2011-05-27 14:08: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
Felix Schäfer
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
Felix Schäfer
5c8e04db55
Fix SearchController tests.
...
The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).
2011-05-25 16:40:34 +02: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
Eric Davis
a4f7629f1f
[ #400 ] Fix some tests broken by 6656103
2011-05-20 14:22:55 -07:00
Felix Schäfer
66561031eb
[ #400 ] Fix the event types (icons on activity and search views).
2011-05-20 13:51:51 -07:00
Felix Schäfer
cf0804259d
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-20 15:45:54 +02:00
Felix Schäfer
dbc10d2730
Save the comments to wiki page updates correctly. #415
2011-05-20 15:44:47 +02:00
Felix Schäfer
6598a44ddd
Add a helper to format user lists. #304
2011-05-19 23:48:02 +02: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
4635a8c2a4
[ #416 ] using a simpler approach to replace node with partial
2011-05-17 20:03:02 +02:00
Gregor Schmidt
e3f54d470c
[ #416 ] :class might be nil or a symbol - then + will not work as expected
2011-05-17 20:03:02 +02:00
Gregor Schmidt
2c2ed95866
[ #416 ] Re-Adding watcher_tag for backwards compatibility
...
adding deprecation warning
2011-05-17 20:03:02 +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
Holger Just
d90102420d
[ #112 ] Adapt database switches to use ChiliProject::Database
2011-05-15 23:15:52 +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
Gregor Schmidt
76c72d8f11
[ #414 ] remove returning which will be removed in future versions of Rails
2011-05-14 00:19:53 +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
bf90848ae8
Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable
2011-05-13 09:29:48 -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