Commit Graph

5438 Commits

Author SHA1 Message Date
Kolan Sh 1e908da66c Merge branch 'master' into backbone.ws 2012-06-15 00:12:40 +04:00
Holger Just 59e2a2fdde Merge branch 'release-v3.2.2' into stable 2012-06-13 11:04:48 +02:00
Holger Just 5c7a3a53c2 Bump version to 3.2.2 2012-06-13 10:26:48 +02:00
Holger Just 4d9060964f Update changelog for v3.2.2 2012-06-13 10:25:18 +02:00
Holger Just 16e266e7e5 Fix SQL injection via nested hashes in conditions. CVE-2012-2695 #1037 2012-06-13 10:12:10 +02:00
Holger Just d629209364 Fix SQL injection via nested hashes in conditions (CVE-2012-2694) #1036 2012-06-13 10:10:03 +02:00
Holger Just 221a2e73ce Merge branch 'release-v3.2.1' into stable 2012-06-10 20:38:18 +02:00
Holger Just c9d141061d Bump version to v3.2.1 2012-06-10 20:36:34 +02:00
Holger Just 8e41daf92a Update changelog for v3.2.1 2012-06-10 20:36:34 +02:00
Felix Schäfer caceb58947 Restore the default class for gravatars #1034 2012-06-10 20:34:23 +02:00
Felix Schäfer 5ef63ec4bb Fix option parsing for gravatars #1034
In addition to that:
* the default size was 50px in the old lib, this has been restored
* some tests to test the default and option parsing
2012-06-10 19:54:46 +02:00
Holger Just e6e057d10d Merge branch 'release-v3.2.0' into stable 2012-06-09 19:07:06 +02:00
Felix Schäfer f8ec89b999 Test stable- and release- branches on Travis too 2012-06-09 19:02:18 +02:00
Holger Just bd132c5607 Bump version to 3.2.0 2012-06-09 17:59:06 +02:00
Holger Just bcb02a4634 Update Changelog for v3.2.0 2012-06-09 17:56:21 +02:00
Holger Just d11e074748 Fix trailing whitespace 2012-06-09 17:52:37 +02:00
Felix Schäfer 1f91054244 Switch from vendored gravatar lib to gravatarify gem #1033 2012-06-09 17:39:22 +02:00
Felix Schäfer 32e1cc2dee Don't test transaction-based features on SQLite
SQLite doesn't support nested transactions, thus we can't test
transaction-based features inside a test wrapped in a transaction.
2012-06-09 17:35:49 +02:00
Felix Schäfer 3997220a45 Add IRC notifications to the Travis config 2012-06-09 12:02:54 +02:00
Felix Schäfer 69656422a1 Test ChiliProject on rubinius on Travis
rubinius 1.9-mode won't load liquid currently:
https://github.com/Shopify/liquid/pull/107
2012-06-07 14:30:45 +02:00
Felix Schäfer d6ad07ee97 Refine some apt-get commands in Travis
* Remove the update, the Travis VMs should be up-to-date enough for us
* Remove the quiets so we can see errors if needed
2012-06-05 16:00:09 +02:00
Justin Geibel 1722e96bb0 Change default branch behaviour for git repos #749
If git repository HEAD points to a branch, use that as the default branch.
Otherwise fall back to previous method.
2012-06-05 15:33:04 +02:00
Andrew Smith 4956e9ca93 Limit the size of the projects dropdown menu. #1016 2012-06-05 15:15:48 +02:00
Andrew Smith 7c1b17509f Clear the document selection when selecting multiple rows. 2012-06-05 15:05:35 +02:00
Andrew Smith c8be011a93 Correct major logic issues when selecting multiple rows.
The rows were being incorrectly selected (because the class name had a
missing '.').

jQuery items can't be directly compared to each other so we need to get
the HTML element to test if they are the same.
2012-06-05 15:05:35 +02:00
Holger Just 8ab42473d9 [#1025] Fix Rails vulnerability (CVE-2012-2660) 2012-06-01 20:56:09 +02:00
Felix Schäfer a43c06ff77 Don't depend on DB ordering in journal_test
And add all fixtures needed to run the test on its own.
2012-05-25 13:37:11 +02:00
Andrew Smith f983b451ad Reformat CSS to use the coding standard. #947
Formatting was done mostly by hand using the following as a guide
http://gnuvince.wordpress.com/2007/02/26/reformatting-a-css-file-with-vim/

" Replace all sequences of white spaces with one space
:%s/[ \t\n]\+/ /g

" Go to the end of the command, then forward one character and insert
" a newline
]/lr^M

" Make sure there is a semi-colon before each closing bracket
:%s/\([^; ]\) *}/\1;}/g

" Add a newline after every semi-colon
:%s/;/;^M/g

" Add a newline after every opening brace and make put one space
" between it and the preceeding text
:%s/\([^ ]*\) *{/\1 {^M/g

" Add two newlines after every closing brace
:%s/}/}^M^M/g

" Remove 'trailing' spaces in front of the semi-colons
:%s/ *;/;/g

" Make sure there is only one space after a colon
:%s/: */: /g

" Make the text before the colon lowercase
:%s/\(.\{-}\):/\L\1:/g

" Remove all trailing spaces at the beginning of lines
:%s/^ \+/g

" Indent the whole file
gg=G

" Split each rule onto its own line (This also matched some
" property/value combos so needed confirming
:%s/\([a-z0-9]\+\), \+/\1,^M/gc
2012-05-21 13:45:39 +02:00
Andrew Smith 61c00779d0 Set the X-CSRF-Token header for AJAX requests with jQuery. #950 2012-05-20 20:41:02 +02:00
Dereckson 375045a82b Improving French translation #967 2012-05-20 20:35:33 +02:00
Felix Schäfer 2e18840f12 Disable autocomplete on registragion form #844 2012-05-20 10:30:34 +02:00
Felix Schäfer 20448c7efb Load all required fixtures on issue unit test #863
Contributed by Toshi MARUYAMA
2012-05-20 10:18:00 +02:00
Andrew Smith 9cd14ca152 Fix a typo when calculating the menu X position. #1007 2012-05-19 11:52:51 +02:00
Felix Schäfer 87f68e58ad Recalculate last reply of thread on message deletion #968 2012-05-19 11:38:40 +02:00
Andrew Smith 43723385c6 Handle the '(Un)Check all' link. #994 2012-05-19 10:37:17 +02:00
Felix Schäfer 93abdcf487 Fix comments missing in wiki add/update mails #986 2012-05-19 00:00:16 +02:00
Felix Schäfer 1d3cdf1fa9 Correct email sending on attachment to document #1008 2012-05-18 22:45:52 +02:00
Felix Schäfer 3e84c4817b Updated czech localization by Radek Tříška 2012-05-18 22:02:40 +02:00
Felix Schäfer 7930e8fa66 Also test stable and unstable branches on TravisCI 2012-05-14 14:18:52 +02:00
Felix Schäfer d4f0542e74 Don't rely on ordering in news_test
The tests would fail because not all storage backends have a default
ordering
2012-05-14 12:39:17 +02:00
tmaruyama 6a26543887 scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.
git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-14 10:54:17 +02:00
Felix Schäfer 03dfae0529 ChiliProject on Travis <3 <3 <3 2012-05-14 10:45:50 +02:00
Eric Davis 75bb38df08 Require WikiContent directly so WikiContentJournal is loaded before it's patched.
Error: uninitialized constant MergeWikiVersionsWithJournals::WikiContentJournal
2012-04-16 09:25:35 -07:00
Jean-Philippe Lang 16947dc016 [984] Allow to change locked and sticky status and the board of messages 2012-04-14 15:02:07 +02:00
unknown e7d96825b2 [#988] Improving Swedish translation 2012-04-13 16:07:42 +02:00
Holger Just 2bcd8787d3 Remove cookie cleaning method as it is not required anymore 2012-04-13 13:44:16 +02:00
jwalkerbg 6a4559e6af [#983] Translated several keys to Bulgarian language. 2012-04-13 09:45:08 +02:00
Gabriel Mazetto 859a9cb9d2 Some translation fixes and more missing translations for pt-BR 2012-04-12 08:20:02 +02:00
Holger Just 33260d885d Ensure array order for repeatable success of tests 2012-04-11 23:15:33 +02:00
Holger Just 277815ec96 Don't render cusom queries in the sidebar anymore
The queries are now part of the issues menu and are thus redundant in the
sidebar.
2012-04-11 20:50:42 +02:00