Commit graph

9834 commits

Author SHA1 Message Date
Michael Gapczynski
ea83acedeb Fix target path and reuse mtime 2013-02-26 01:43:04 -05:00
Michael Gapczynski
8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Michael Gapczynski
36827d1549 Fix variable 2013-02-23 16:09:56 -05:00
Michael Gapczynski
00e28cf156 Return unknown free space for shared root folder so we can still upload partial files 2013-02-23 15:42:01 -05:00
Michael Gapczynski
b6a21cc4b5 Fix WebDAV uploading of partial shared files 2013-02-23 15:32:59 -05:00
Michael Gapczynski
09a2730f57 Include etag field for folder contents 2013-02-23 15:22:34 -05:00
Michael Gapczynski
3dfb1628ce Include etags for the root of the shared folder 2013-02-19 20:42:48 -05:00
Frank Karlitschek
3878203679 Merge pull request from owncloud/unknown-freespace
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
Jenkins for ownCloud
99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Frank Karlitschek
a085e4c435 Merge pull request from owncloud/usermenu-css
fix erroneous CSS, remove obsolete selectors
2013-02-19 10:44:58 -08:00
Björn Schießle
95751874a1 Merge pull request from
Bug fix for Issue#1688
2013-02-19 03:09:03 -08:00
Lukas Reschke
3d7545269b Merge pull request from owncloud/Undelete_directory_fix
Fix for Undelete directory action
2013-02-19 01:34:49 -08:00
Thomas Müller
c56542c58d Merge pull request from owncloud/mountconfig
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
Thomas Mueller
0e9b9f4f5f no pretty print 2013-02-19 00:48:38 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Thomas Müller
d9035d4fdc Merge pull request from owncloud/mountconfig
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
Lukas Reschke
474b82931b Merge pull request from owncloud/fixing-1766-master
files_versions no longer contains a personal settings page -> remove the...
2013-02-18 14:25:10 -08:00
Thomas Mueller
f343d9d247 files_versions no longer contains a personal settings page -> remove the call 2013-02-18 23:04:22 +01:00
Victor Dubiniuk
e2f87e456f Calculate size for existing directories only 2013-02-18 23:48:08 +03:00
Thomas Müller
c8e02060c1 Merge pull request from owncloud/user_password_fix
Fix changing user password at 'Personal' page. Ref 
2013-02-18 10:54:27 -08:00
Victor Dubiniuk
06dbcec5a1 Do not set password if it has't provided 2013-02-18 21:20:48 +03:00
Victor Dubiniuk
c5f6a77dbd Correct new password input name 2013-02-18 21:15:32 +03:00
Frank Karlitschek
f554347db5 Merge pull request from owncloud/long-storage-id
Cache: hash long storage ids to ensure they fit in the database
2013-02-18 07:17:27 -08:00
Thomas Müller
0ab87204ec Merge pull request from owncloud/redirect_fix_1737
fix redirect, use the new routing
2013-02-18 07:13:19 -08:00
Qingping Hou
c0ac98066e check filename and timestamp in Trashbin's file_exists method 2013-02-18 09:49:50 -05:00
Robin Appelman
3bf9aa408e Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig 2013-02-18 15:13:25 +01:00
Robin Appelman
2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Björn Schießle
4a3374ecf8 fix redirect, use the new routing 2013-02-18 14:38:29 +01:00
Frank Karlitschek
96ae110a2c Merge pull request from owncloud/sanitizeHTML
Sanitize html
2013-02-18 04:37:48 -08:00
Lukas Reschke
79284b8e57 Sanitize HTML 2013-02-18 08:11:59 +01:00
Lukas Reschke
a984a27fa0 Sanitize user input 2013-02-18 08:04:35 +01:00
Jenkins for ownCloud
3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Thomas Müller
8e76a98d2f Merge pull request from owncloud/style-cleanup-files_external
Style cleanup files_external
2013-02-17 11:53:51 -08:00
Thomas Müller
55d6b96348 Merge pull request from owncloud/fixing-1659-master
Fixing 1659 master
2013-02-17 11:47:35 -08:00
Robin Appelman
451daf3ab1 Keep user quota into account when the storage backend has unkown free space 2013-02-17 20:09:03 +01:00
Bernhard Posselt
90939c8f12 Merge pull request from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
Thomas Müller
c0fafe8199 Merge pull request from owncloud/fix-googledrive
Remove the leading slash from the filename for opendir
2013-02-17 01:52:12 -08:00
Thomas Mueller
325746ae45 Merge branch 'master' into fix-googledrive 2013-02-17 09:41:37 +01:00
Thomas Müller
0f8058cb12 Merge pull request from owncloud/multiselect-bar-fix
fix multiselect bar offset on shared page, close  finally
2013-02-17 00:39:16 -08:00
Thomas Müller
71472c21ed Merge pull request from owncloud/ldap_fix_warnings
LDAP: check array with isset first to avoid warnings about undefined ind...
2013-02-17 00:25:40 -08:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Qingping Hou
4b4b1f8692 Properly delete empty directories in Trashbin
Instead of checking delted file size, we do a real check.

this fixes 
2013-02-16 17:44:51 -05:00
Qingping Hou
50759607e4 add file_exists method to files_trashbin app 2013-02-16 17:42:06 -05:00
Frank Karlitschek
17d21a84b6 Merge pull request from owncloud/fix_1727
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
2013-02-16 05:48:18 -08:00
Lukas Reschke
4708d4549d Add missing requesttoken
This is a trivial fix for a regression caused by 
2013-02-16 13:28:49 +01:00
Jörn Friedrich Dreyer
cad65915a7 look where you are typing ... 2013-02-16 12:55:36 +01:00
Jörn Friedrich Dreyer
e1700c28fa pretty print json 2013-02-16 12:10:54 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
Arthur Schiwon
a28df74ee5 LDAP: check array with isset first to avoid warnings about undefined index 2013-02-16 02:33:19 +01:00
Arthur Schiwon
bef48bad8b LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes 2013-02-16 02:06:45 +01:00