Commit Graph

9919 Commits

Author SHA1 Message Date
Björn Schießle 4dea6a6228 Merge branch 'master' into trashbin_encryption
Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php
2013-02-25 12:14:51 +01:00
Frank Karlitschek 9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
Frank Karlitschek 8f65916904 Merge pull request #1882 from owncloud/required_version
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller 906f8fa6f6 Merge pull request #1881 from owncloud/safemode_check
add a safe_mode check
2013-02-24 11:23:27 -08:00
Robin Appelman 4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Jenkins for ownCloud 7019972320 [tx-robot] updated from transifex 2013-02-24 00:06:53 +01:00
Michael Gapczynski 069adf86f2 Merge pull request #1879 from owncloud/fix-webdav-quota
Don't throw insufficient storage exception if free space is unknown
2013-02-23 14:38:29 -08:00
Michael Gapczynski d29c2b0169 Reuse $freeSpace variable 2013-02-23 16:00:50 -05:00
Michael Gapczynski a2d3333a09 Don't throw insufficient storage exception if free space is unknown 2013-02-23 15:37:44 -05:00
Thomas Müller a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup
Whitespace cleanup
2013-02-23 11:39:13 -08:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle eabfd9b69b put value assignment into brackets 2013-02-22 16:45:57 +01:00
Bernhard Posselt 78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 07:44:24 -08:00
Bernhard Posselt 608ebb59dd Merge pull request #1859 from owncloud/blacklist-fix
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
Björn Schießle d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Robin Appelman 62c65bc1c8 Add OC\Files\Filesystem::isFileBlacklisted 2013-02-22 16:13:08 +01:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Björn Schießle 5b94959686 using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false 2013-02-22 14:56:50 +01:00
Thomas Tanghus 2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
blizzz 5c76fffc01 Merge pull request #1854 from owncloud/fix_mount_order
Fix order of mount commands in lib/files/filesystem.php
2013-02-22 05:37:31 -08:00
Georg Ehrke f51d8c1cd9 fix order of mount commands 2013-02-22 14:19:29 +01:00
blizzz c0443a2f0d Merge pull request #1849 from owncloud/mount_users_home
mount users home before write/read file to it, necessary to deal with external homes [master]
2013-02-22 04:54:25 -08:00
Björn Schießle 9edec542c5 mount users home before write/read file to it, necessary to deal with external homes 2013-02-22 13:15:47 +01:00
Frank Karlitschek 51d050c935 Merge pull request #1848 from owncloud/keep_transparency
keep transparency when resizing or cropping png/gif
2013-02-22 04:02:26 -08:00
Jörn Friedrich Dreyer 16a5f15f85 keep transparency when resizing or cropping png/gif 2013-02-22 12:42:40 +01:00
Thomas Müller 31d2b9bc07 Merge pull request #1838 from owncloud/fix-changedisplayname-call
Fix error path in changedisplayname call
2013-02-22 02:14:00 -08:00
Bart Visscher 83e613b45a Fix error path in changedisplayname call 2013-02-22 00:49:44 +01:00
Bart Visscher 59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher 19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher 83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Bart Visscher 1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Bart Visscher db8dbb9847 Style cleanup files_versions 2013-02-21 23:47:21 +01:00
Bart Visscher fb7de77474 Style cleanup files_trashbin 2013-02-21 23:47:21 +01:00
Bart Visscher 59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +01:00
Bernhard Posselt a8a85ed6b4 Merge pull request #1835 from owncloud/normalize-giant-caret
fix giant advanced caret in installation
2013-02-21 14:07:13 -08:00
Lukas Reschke 40a5a52684 Merge pull request #1836 from owncloud/update-version-remark
Update hint by the internal version number.
2013-02-21 12:39:48 -08:00
Bart Visscher 88bea55f97 Update hint by the internal version number.
So we don't repeat the 4.5 <=> 4.90 mixup
2013-02-21 21:30:25 +01:00
Jan-Christoph Borchardt e7d1bbfae3 fix giant advanced caret in installation 2013-02-21 18:20:14 +01:00
Frank Karlitschek 218447392f Merge pull request #1830 from owncloud/fix_css_number
make number-input fields look like they should
2013-02-21 08:52:14 -08:00
Björn Schießle 89ef06cd79 rename app to 'deleted files' 2013-02-21 16:34:22 +01:00
Arthur Schiwon eceb7341bb make number-input fields look like they should 2013-02-21 16:25:47 +01:00
Björn Schießle 0a6e9933fc Merge pull request #1812 from owncloud/add-logging-to-webdav-test-master
Enhancment to the WebDAV-Testing ...
2013-02-21 05:58:34 -08:00
Frank Karlitschek c5e0dda887 add a safe_mode check 2013-02-21 11:09:00 +01:00
Björn Schießle c8c0e72e73 Merge pull request #1768 from houqp/issue_1739
bug fix for issue 1739
2013-02-21 01:09:15 -08:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Björn Schießle 6aed7abfbe Merge branch 'master' into trashbin_encryption 2013-02-21 00:05:30 +01:00
Björn Schießle eb3769e6d6 Merge pull request #1773 from owncloud/trash_bin_delete_selected
Trash bin delete selected
2013-02-20 15:03:26 -08:00