Commit Graph

341 Commits

Author SHA1 Message Date
Robin Appelman 0e2bf8d373 Merge branch 'master' into filesystem 2012-10-26 10:42:41 +02:00
Jenkins for ownCloud c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Bart Visscher 43ac43d7af dir in newfile has to start with / 2012-10-25 08:37:13 +02:00
Lukas Reschke 515e1b467e Merge pull request #81 from fmms/master
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Lukas Reschke 694b1d397d Revert e1a4fe9890 2012-10-24 17:58:52 +02:00
Robin Appelman 5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Björn Schießle 07e08d5928 urldecode target directory 2012-10-24 15:37:51 +02:00
Robin Appelman 7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Lukas Reschke a7eb56c799 Merge pull request #76 from fmms/master
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Jenkins for ownCloud f33af71eb0 [tx-robot] updated from transifex 2012-10-24 02:08:34 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke e1a4fe9890 Fix urlencoding in the breadcrumb 2012-10-23 17:50:36 +02:00
Lukas Reschke 73f85c3b81 Merge pull request #62 from fmms/master
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
Robin Appelman 7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991 ab944094e2 Merge pull request #12 from scambra/fixes
check free space using folder's owner
2012-10-23 07:02:21 -07:00
Arthur Schiwon 6a2a915559 Files: urldecode urlencoded dir names, fixes oc-2111 2012-10-23 13:50:24 +02:00
Felix Moeller 36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Jenkins for ownCloud bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller 6a00a6b9ed Make Jenkins more happy.
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Jenkins for ownCloud d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Robin Appelman 5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud 16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Jenkins for ownCloud f5043c0661 [tx-robot] updated from transifex 2012-10-19 02:08:00 +02:00
Robin Appelman 9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Thomas Müller e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Jenkins for ownCloud 519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Thomas Müller 9f01cd05fb Merge pull request #37 from scambra/js-interpolation-l10n
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Robin Appelman 77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
scambra c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
scambra 5ecce8bfb7 Translate modification date when file is created/uploaded, use same strings as lib/template.php 2012-10-16 20:25:11 +02:00
Jenkins for ownCloud c3823aa864 [tx-robot] updated from transifex 2012-10-16 02:08:21 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman 11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Robin Appelman 5b2f3c7f72 fix blocking drag & drop upload of folders 2012-10-12 15:30:16 +02:00
Lukas Reschke e5f2d46c6f Sanitize user input 2012-10-12 14:10:05 +02:00
Jenkins for ownCloud b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Jenkins for ownCloud 673e3dae3f [tx-robot] updated from transifex 2012-10-11 02:07:32 +02:00
Björn Schießle 41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Thomas Müller 29fa9dfb79 Merge pull request #25 from visit1985/uploadfilesize
fixed max possible upload size for files app in admin screen
2012-10-10 00:41:19 -07:00
Jenkins for ownCloud fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Jenkins for ownCloud f1fc73ea5b [tx-robot] updated from transifex 2012-10-09 02:07:41 +02:00