0f763f4508
Merge pull request #1823 from owncloud/update-expire-function
...
Update expire function
2013-02-25 05:30:21 -08:00
e30b3f64e0
fix line endings
2013-02-25 14:29:31 +01:00
4c980a4851
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
a37577e007
Merge pull request #1810 from owncloud/trashbin_encryption
...
Trashbin file encryption support
2013-02-25 05:13:38 -08:00
7da97550df
some final code clean-up
2013-02-25 14:12:56 +01:00
7ebbecd81f
always use "==="
2013-02-25 14:09:20 +01:00
3f48bebe92
Merge pull request #1827 from owncloud/fix_getVersions
...
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
660670ec68
Merge pull request #1832 from owncloud/fix_1779
...
use :hover pseudo class to set opacity
2013-02-25 04:35:34 -08:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
9ceae51091
Merge pull request #1887 from owncloud/fixing-1843-master
...
remove the check for session data folder - causes trouble on some enviro...
2013-02-25 04:16:38 -08:00
da82f7f5f3
Merge pull request #1888 from Raydiation/master
...
Fixes apps require version checking
2013-02-25 03:57:29 -08:00
8068051ca4
more tests to fail the version check
2013-02-25 12:47:34 +01:00
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
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
ecd40f0abc
spaces to tabs
2013-02-25 11:40:55 +01:00
736d5deaee
version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version
2013-02-25 11:39:55 +01:00
632ca9f06d
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
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
ebcb778a99
remove the check for session data folder - causes trouble on some environments
...
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
8f65916904
Merge pull request #1882 from owncloud/required_version
...
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
278a6f5b41
update oldDisplayName value on displayName change
...
This patch fixes a bug that can be reproduced in following way:
1. change displayName
2. clear text in displayName input click change again
Then you will get an error and previous displayName will be restored.
Expected behavior should restore the new updated displayName.
2013-02-24 18:13:25 -05:00
2f3c5d8afc
when user changes displayName, also update it on expand button
2013-02-24 18:07:35 -05:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
906f8fa6f6
Merge pull request #1881 from owncloud/safemode_check
...
add a safe_mode check
2013-02-24 11:23:27 -08:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
7019972320
[tx-robot] updated from transifex
2013-02-24 00:06:53 +01:00
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
d29c2b0169
Reuse $freeSpace variable
2013-02-23 16:00:50 -05:00
a2d3333a09
Don't throw insufficient storage exception if free space is unknown
2013-02-23 15:37:44 -05:00
a417028ccd
Merge pull request #1862 from owncloud/whitespace-cleanup
...
Whitespace cleanup
2013-02-23 11:39:13 -08:00
6aa0ecc9b8
[tx-robot] updated from transifex
2013-02-23 00:05:33 +01:00
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
15f5325078
Don't use routes when displaying error page
2013-02-22 21:39:44 +01:00
e4e915fa3b
LDAP: simplify default for user home settings, fixes wrong display of default value in settings
2013-02-22 21:26:07 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
eabfd9b69b
put value assignment into brackets
2013-02-22 16:45:57 +01:00
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
608ebb59dd
Merge pull request #1859 from owncloud/blacklist-fix
...
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
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
62c65bc1c8
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 16:13:08 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
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
2268596e1a
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 14:51:21 +01:00
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
f51d8c1cd9
fix order of mount commands
2013-02-22 14:19:29 +01:00
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
9edec542c5
mount users home before write/read file to it, necessary to deal with external homes
2013-02-22 13:15:47 +01:00
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
16a5f15f85
keep transparency when resizing or cropping png/gif
2013-02-22 12:42:40 +01:00
31d2b9bc07
Merge pull request #1838 from owncloud/fix-changedisplayname-call
...
Fix error path in changedisplayname call
2013-02-22 02:14:00 -08:00
Björn Schießle
Björn Schießle
Bernhard Posselt
Thomas Müller
Bart Visscher
Frank Karlitschek
Qingping Hou
Robin Appelman
Michael Gapczynski
Arthur Schiwon
Jörn Friedrich Dreyer
Thomas Tanghus
Georg Ehrke