3d164f1da0
[ #480 ] Fix replying to IssueJournals through email
2011-06-17 12:10:23 -07:00
67dbd0160d
Document#category should be displayed as a required field
2011-06-17 10:25:56 -07:00
85c3d38d24
Fix the wiki links in the activity view. #469
...
Contributed by Artem Naluzhnyy.
2011-06-16 20:56:48 +02:00
f47821db0c
[ #350 ] Remove freeze from Settings so the values can be modified later
2011-06-10 11:44:44 -07:00
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
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
bfba5e2151
[ #441 ] Journals should touch their journaled to update updated_on/at fields
2011-06-05 11:49:40 -07:00
ba3ddee99d
[ #444 ] Remove extra variable
2011-06-03 10:50:16 -07:00
f518251d5f
[ #444 ] Fix Changeset#to_utf8 coding standards
2011-06-03 10:46:46 -07:00
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
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
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
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
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
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
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
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -07:00
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
e4fac8d40f
[ #350 ] Refactor: extract method
2011-05-27 14:59:42 -07:00
b95c526151
Fix failing test: RepositoryMercurialTest#test_activities
2011-05-27 14:08: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
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
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
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
a4f7629f1f
[ #400 ] Fix some tests broken by 6656103
2011-05-20 14:22:55 -07:00
66561031eb
[ #400 ] Fix the event types (icons on activity and search views).
2011-05-20 13:51:51 -07:00
cf0804259d
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-20 15:45:54 +02:00
dbc10d2730
Save the comments to wiki page updates correctly. #415
2011-05-20 15:44:47 +02:00
6598a44ddd
Add a helper to format user lists. #304
2011-05-19 23:48:02 +02: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
4635a8c2a4
[ #416 ] using a simpler approach to replace node with partial
2011-05-17 20:03:02 +02:00
e3f54d470c
[ #416 ] :class might be nil or a symbol - then + will not work as expected
2011-05-17 20:03:02 +02:00
2c2ed95866
[ #416 ] Re-Adding watcher_tag for backwards compatibility
...
adding deprecation warning
2011-05-17 20:03:02 +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
d90102420d
[ #112 ] Adapt database switches to use ChiliProject::Database
2011-05-15 23:15:52 +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
76c72d8f11
[ #414 ] remove returning which will be removed in future versions of Rails
2011-05-14 00:19:53 +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
bf90848ae8
Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable
2011-05-13 09:29:48 -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
c2d058a53b
[ #390 ] check to handle mysql2's early type casting
2011-05-11 00:19:11 +02: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
1f8828838e
[ #123 ] Attachment changes need to be prefixed
2011-05-06 14:08:39 -07:00
ebf4584141
[ #380 ] Add example of a cross project wiki link
...
Contributed by Alf Gaida
2011-05-06 11:23:44 -07:00
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +02: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
800cee548b
Merge pull request #46 from schmidt/b/373-duplicates-in-issue-autocomplete
...
Avoid duplicates in issue autocomplete. #373
2011-05-05 11:55:38 -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
dbd6dfc69b
[ #373 ] Refactoring auto_completes#issues action
...
hoping to make it more intention revealing
2011-05-04 19:12:56 +02:00
8509212991
[ #373 ] Adding test and fix for duplicates in issue autocompleter
2011-05-04 19:01:15 +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
bdc7325a82
Merge branch 'master' into unstable
...
Conflicts:
doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07: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
d2973a641e
[ #347 ] Fix potential Execution After Redirect bugs
...
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.
Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
ef8141a2c1
Remove deprecated journals tests and controller.
2011-04-21 11:45:31 +02:00
d4adcae569
Update the Issue#show.api to new journals type
2011-04-21 11:44:55 +02:00
ed252f7246
[ #309 ] Set the back_url after sending a lost password so HTTP_REFERER isn't used
...
Contributed by Robert Chady
2011-04-20 16:24:54 -07:00
1eee7312f6
[ #289 ] Remove single helpers in favor of :all in ApplicationController
2011-04-20 16:08:00 -07: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
e78149f85c
Keep issue filter params on sort headers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
1335548949
Changes pagination links to non-AJAX requests ( #5138 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:53 -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
1cab1bd51e
Skip a count(*) SQL query.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
1d0b4dcdcc
Do not load projects association in #rolled_up_trackers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5293 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
3374130e60
Skip a few count(*) SQL queries on the issue list.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5292 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
2431d830b1
No PUT request to get previous/next month.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5287 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -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
bb4a10fc85
Fixed: bulk destroying parent and child issues raises a stale object error ( #7920 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5283 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
4e6962e7c9
Keep filter params in 'Per page' links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 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
35a848dac7
Initialize TimeEntry with issue and project for the issue edit form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5274 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
8fae4e2ee5
Fixes #possible_values_options when given an object with nil project.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 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
Eric Davis
Felix Schäfer
Jean-Philippe Lang
Toshi MARUYAMA
Holger Just
Tom Kersten
Gregor Schmidt
Adam Soltys
Simon COURTOIS
Felix Schäfer