Commit Graph

3971 Commits

Author SHA1 Message Date
Eric Davis 3f51825918 Merge branch 'release-v1.5.2' into stable-1.x 2011-08-01 16:50:55 -07:00
Eric Davis 3b86aceb4b Bump version to 1.5.2 2011-08-01 16:32:43 -07:00
Eric Davis c5c75ec3bc Update Changelog for 1.5.2 2011-08-01 16:32:28 -07:00
Eric Davis e950862d80 [#547] Security audit
Conflicts:

	app/helpers/calendars_helper.rb
	app/helpers/issues_helper.rb
	app/helpers/queries_helper.rb
	app/helpers/reports_helper.rb
	app/helpers/sort_helper.rb
	app/views/common/_diff.rhtml
	app/views/common/error.html.erb
	app/views/projects/show.rhtml
	app/views/reports/_details.rhtml
	app/views/reports/_simple.rhtml
	app/views/repositories/_dir_list_content.rhtml
	app/views/search/index.rhtml
	app/views/versions/_issue_counts.rhtml
	app/views/versions/index.html.erb
2011-08-01 16:30:38 -07:00
Eric Davis 9851ca9220 Merge branch 'release-v1.5.1' into stable-1.x 2011-07-29 11:41:54 -07:00
Eric Davis e9f76cec2a Bump version to 1.5.1 2011-07-29 11:40:23 -07:00
Eric Davis 5af0c79260 Update changelog for 1.5.1 2011-07-29 11:39:54 -07:00
Eric Davis 71d7906e7d [#544] html_escape issue fields
Merged from master 70c3e1c8f9

Conflicts:

	app/helpers/application_helper.rb
2011-07-29 10:59:08 -07:00
Holger Just 3700bb666c move protect_from_forgery to the beginning of the before_filter chain as per the recommended rails practices
Merged from master d7a9adf880

Conflicts:

	app/controllers/application_controller.rb
2011-07-29 10:57:43 -07:00
Eric Davis c8a6f8043e Merge branch 'release-v1.5.0' into stable 2011-06-27 15:44:22 -07:00
Eric Davis 967d0e6baa Bump version to 1.5.0 2011-06-27 15:42:55 -07:00
Eric Davis 86c2ee6f5d Update CHANGELOG for v1.5.0 release 2011-06-27 15:41:57 -07:00
Eric Davis a75eab1adb [#490] Escape AuthSources in the list.
Contributed by MAEDA, Go
2011-06-27 15:20:15 -07:00
Felix Schäfer 308852e21c Merge pull request #78 from tomkersten/488_wiki_show_format_hook
Added view hook for additional wiki formats [refs #488]
2011-06-22 13:51:10 -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 44b1bcfa37 Merge branch 'release-v1.4.0' 2011-05-27 11:41:22 -07:00
Eric Davis aae1abde5c Merge branch 'release-v1.4.0' into stable 2011-05-27 11:39:08 -07:00
Eric Davis 0e31482de9 Bump version to 1.4.0 2011-05-27 11:37:03 -07:00
Eric Davis f6454629f2 Update Changelog for release 1.4.0 2011-05-27 11:22:49 -07:00
Eric Davis e9676954be Fix tpyo in the example 2011-05-27 09:28:45 -07:00
Eric Davis b8904ce7a2 Handle a nil user when testin email.
undefined method `logged?' for nil:NilClass
2011-05-27 09:27:05 -07:00
Eric Davis 5cbf188032 Merge remote-tracking branch 'schmidt/b/425-avoid-deprec-notation-for-rake-tasks/master' 2011-05-27 09:26:07 -07:00
Eric Davis c4658bd271 [#202] Add the theme used on chiliproject.org
Using 3c2ef2757165e23b65fd from
https://github.com/edavis10/squeejee_theme/tree/chiliproject.org
2011-05-27 09:18:48 -07:00
Emilio Carlos da Palma 7796ae89ff Fix the issue #424. 2011-05-26 21:09:21 -03:00
Gregor Schmidt 20a5e41538 [#425] Avoid deprecated API to define rake tasks with parameters
This should avoid deprecation warnings when using ChiliProject with Rake 0.9
2011-05-24 17:02:30 +02:00
Eric Davis a74517b983 Merge remote-tracking branch 'hufocf/feature/357-wrap-text-in-pdf' 2011-05-20 11:43:24 -07:00
Eric Davis eaa5382043 [#81] Add a favicon based on a Flickr image
http://www.flickr.com/photos/thebrownhouse/4599233853/sizes/l/
2011-05-20 11:28:40 -07:00
Felix Schäfer 333a3187bd Work around a deprecation in rubygems 1.6+. #322 2011-05-20 00:04:04 +02:00
Felix Schäfer 6598a44ddd Add a helper to format user lists. #304 2011-05-19 23:48:02 +02:00
Felix Schäfer 90c713d2d2 Recognize git Repositories of the form 'identifier.git' in the apache perl module. 2011-05-16 06:11:59 -07: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 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 9f07b2f4b4 Merge pull request #38 from edavis10/ticket/master/324-plugin-generators
Rename plugin generators to ChiliProject. #324
2011-05-05 13:14:26 -07:00
Felix Schäfer d6da8cadf6 Merge pull request #39 from enderson/326-pt_BR-updates
pt-BR updates. #326
2011-05-05 12:27:49 -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
Felix Schäfer 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
Felix Schäfer 5938048e42 Merge pull request #48 from schmidt/b/379-wrong-header-in-wiki-help
Fix html_title usage in help views for Ruby 1.9. #379
2011-05-05 11:44:57 -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 dbd6dfc69b [#373] Refactoring auto_completes#issues action
hoping to make it more intention revealing
2011-05-04 19:12:56 +02:00
Gregor Schmidt 8509212991 [#373] Adding test and fix for duplicates in issue autocompleter 2011-05-04 19:01:15 +02:00
Eric Davis 7cd96b6a6f Merge branch 'f/362-introduce-help-controller' 2011-05-02 14:38:04 -07:00
Gregor Schmidt 0b7b564a34 adding basic test, to make sure, nothing breaks 2011-05-02 15:24:11 +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