kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,696 Commits 5 Branches 46 Tags
Commit Graph

1476 Commits

Author SHA1 Message Date
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 1eee7312f60267b0f8e575cc96302812f2dc38a8
 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
Gregor Schmidt
8fb5e8b211 Introducing help controller, moving wiki syntax documentation to help controller 2011-05-02 12:45:19 +02:00
Eric Davis
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
Felix Schäfer
b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Felix Schäfer
d4adcae569 Update the Issue#show.api to new journals type 2011-04-21 11:44:55 +02:00
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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