Commit Graph

5505 Commits

Author SHA1 Message Date
Felix Schäfer 3f9007b909 Merge branch 'release-v3.6.0' into stable 2013-01-29 22:37:23 +01:00
Felix Schäfer 6bef9c26ab Bump version to v3.6.0 2013-01-29 22:33:42 +01:00
Felix Schäfer 6744e23ed2 Update Changelog for v3.6.0 2013-01-29 21:46:27 +01:00
Felix Schäfer 065542c7d1 Remove Rails patches which are already included in Rails 2.3.16 #1219 2013-01-29 21:44:15 +01:00
Felix Schäfer dc66e8f831 Bump Rails version to 2.3.16 #1219 2013-01-29 21:24:25 +01:00
Felix Schäfer 6e30b3d3fc Get notified about other watched things than issues #1216
When I select "only for things I watch or am involved in" as my Email
notifications setting, I want to get notified about everyhing I watch,
not just issues. The previous setting would only notify me about issues
I'm involved in, now I will additionally be notified about everything I watch.
2013-01-25 15:30:32 +01:00
Holger Just 2854524ba9 Merge branch 'release-v3.5.1' into stable 2013-01-16 23:26:41 +01:00
Holger Just eb41df17d2 Bump version to v3.5.1 2013-01-16 23:26:13 +01:00
Holger Just 7f7a06706f Update Changelog for v3.5.1 2013-01-16 23:25:47 +01:00
Holger Just db3087b318 Fix for CVE-2013-0155 in Rails 2013-01-16 23:24:15 +01:00
Holger Just d8536ced55 Merge branch 'release-v3.5.0' into stable 2013-01-09 14:06:00 +01:00
Holger Just 908391d54e Bump version to v3.5.0 2013-01-09 14:05:02 +01:00
Holger Just 93b2a1daf9 Update Changelog for v3.5.0 2013-01-09 14:04:56 +01:00
Holger Just c69a005353 Remove Rails patches which are already included in Rails 2.3.15 #1200 2013-01-09 13:56:52 +01:00
Holger Just bf4ed9b37b Bump Rails version to 2.3.15 #1200 2013-01-09 13:56:43 +01:00
Holger Just 90a94d75c3 Merge branch 'release-v3.4.0' into stable 2013-01-06 23:47:42 +01:00
Holger Just 2243c8dfd0 Bump version to v3.4.0 2013-01-06 23:43:44 +01:00
Holger Just cee98d306b Update Changelog for v3.4.0 2013-01-06 23:43:04 +01:00
Holger Just 0dac4ecb53 Ensure UTF-8 source encoding 2013-01-06 23:42:41 +01:00
Holger Just c65779bbc1 Update Copyright for 2013
We programmers have a nice new years tradition: We revisit all of
our projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2013-01-06 23:42:27 +01:00
Holger Just 0261b16b3e Update locales 2013-01-06 23:20:08 +01:00
Holger Just c80591fe57 Adapt tests for escaping of ' introduced in 8e417fd 2013-01-06 21:17:19 +01:00
Felix Schäfer cdad6f752a Links to new/not existing wikipages are italic #1197 2013-01-06 21:13:34 +01:00
Felix Schäfer 335da86b55 Correctly save the subprojects setting when editing queries #1188 2013-01-06 20:32:53 +01:00
Holger Just 8e417fd5c4 Fix XSS vulnerabilities in Rails (CVE-2012-3464, CVE-2012-3465) #1113 #1114 2013-01-06 20:32:53 +01:00
Holger Just 07e54eda9e SQL Injection Vulnerability in Ruby on Rails (CVE-2012-5664) #1195 2013-01-06 20:32:53 +01:00
Holger Just a93a3af895 Consider HEAD a readonly method in Redmine.pm #1134 2013-01-06 20:32:53 +01:00
Holger Just 5156fbbfc4 Make the WikiContentJournal class available during migration #1194 2013-01-06 20:32:53 +01:00
Felix Schäfer 4d4efa482e Use capybara < 2 as capybara 2 drops ruby 1.8 support 2013-01-02 16:36:49 +01:00
Holger Just c734c6506d Install Darcs 2.3 on Travis CI #1142
Our tests break on Darcs >=2.5 as Darcs changed the repository
format and the command API.
2013-01-02 16:16:39 +01:00
Toshi MARUYAMA e7ef06a926 add travis build status to README.rdoc 2012-12-09 18:24:13 +01:00
Felix Schäfer 0dfa793abc Add a CONTRIBUTING guide. #1192 2012-12-09 18:10:11 +01:00
C-Moreira ce5524ba4d Add localized translation for Time entry menu. #1118 2012-11-22 11:54:11 +01:00
Holger Just 003fc93b15 Make the commented configuration.yml.example more approachable #1144 2012-09-14 22:27:49 +02:00
Holger Just da4641442f Update package list before installing packages on Travis 2012-09-12 21:39:09 +02:00
Web Siduction 0e1a622a6a wiki-text monospaced 11px 2012-08-20 20:18:17 +02:00
Holger Just d63d2d2e81 Display sidebar queries outside of a project #1090 2012-08-20 18:48:28 +02:00
Holger Just 7a4b664577 Set default category_id instead of the object #1087
Rails 2.3 still has issues with synchronizing the association_id
and association attributes of an object. That means, if you set the
association with an object first and then just set the id afterwards, the object wins and the setting of the id gets lost.

This is not an issue in Rails >= 3.1 anymore.
2012-08-20 18:26:32 +02:00
Felix Schäfer d24d4ce6b6 Stick with a working version of mocha
mocha 0.12.2 is known not to work with test/unit:
https://github.com/freerange/mocha/issues/94

Pinning the version of mocha until this is resolved
2012-08-06 10:34:41 +02:00
jplang a2f8557f23 Correctly copy advanced workflow settings #904
Original commit message:
Fixed: Workflow copy does not copy advanced workflow settings

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6148 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-06 08:20:58 +02:00
Holger Just 080c5b63ca Merge branch 'release-v3.3.0' into stable 2012-07-15 20:26:01 +02:00
Holger Just 22204d588d Merge branch 'master' into stable 2012-07-15 18:46:48 +02:00
Holger Just 19dd488298 Bump version to 3.3.0 2012-07-15 18:45:49 +02:00
Holger Just 12cedb1e91 Update Changelog for v3.3.0 2012-07-15 18:44:41 +02:00
Holger Just 27f24a78db Add copyright statement 2012-07-15 18:43:00 +02:00
Andrew Smith 4838c4ede8 Replace the progress bars with a copied jQuery version. Fixes #1056 2012-07-15 18:28:23 +02:00
Holger Just f2e4c71b27 Add gravatar no-op library.
This helps to not break on plugins having require "gravatar"
in their init.rb. This statement is not needed anymore in any
supported version of ChiliProject (or Redmine for that matter) and
should thus be removed from all plugins.
2012-07-15 17:48:43 +02:00
Andrew Smith ff94716791 Replace the JS calendar with a jQueryUI version. 2012-07-15 15:25:13 +02:00
Felix Schäfer cb9ac281d9 Add date_field and date_field_tag form helpers #817 2012-07-15 15:19:02 +02:00
Felix Schäfer a642a1fdc4 Bump net-ldap #1078 2012-07-14 21:16:16 +02:00