wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12092 commits 157 branches 562 tags 714 MiB
Commit graph

12092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
bd7771867b LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links 2013-05-30 16:55:21 +02:00
Jörn Friedrich Dreyer
476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10 
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
 2013-05-30 06:00:52 -07:00
icewind1991
aa1c5a5d63 Merge pull request #3529 from owncloud/folder-permissions 
Cache: provide a function to get the permissions of all files in a folder with one query
 2013-05-30 05:54:29 -07:00
Jenkins for ownCloud
8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Florin Peter
6d94b393bf fix share and un-share for single file 2013-05-30 01:38:11 +02:00
Florin Peter
8c17f26226 fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files 2013-05-30 01:13:22 +02:00
Florin Peter
313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes 
Conflicts:
	apps/files_encryption/hooks/hooks.php
 2013-05-30 00:45:29 +02:00
Michael Gapczynski
5a47054505 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-05-29 18:22:54 -04:00
Michael Gapczynski
dbbf195727 Only retrieve the current user's permissions 2013-05-29 18:08:18 -04:00
Thomas Tanghus
2ce555fe55 Merge pull request #3533 from owncloud/signature-delimiter 
fix wrong signature delimiter - fix #3523
 2013-05-29 14:58:00 -07:00
Morris Jobke
4a6f774642 Merge pull request #3507 from owncloud/remove_unused_vars 
remove unused varaibles
 2013-05-29 14:46:04 -07:00
Florin Peter
d59ae569ba reformat code 2013-05-29 23:13:45 +02:00
Florin Peter
838fd1a20a changed " to ' 2013-05-29 23:11:30 +02:00
Florin Peter
1337f48d64 fixes for pgsql 2013-05-29 20:41:07 +02:00
Florin Peter
8c6eec7a8f Merge branch 'master' into remove_unused_vars 2013-05-29 20:29:09 +02:00
Florin Peter
ee7c4c4c93 changed l10n to full sentences 2013-05-29 20:27:12 +02:00
Morris Jobke
5c04b3a63a fix wrong signature delimiter - fix #3523 2013-05-29 20:21:48 +02:00
Florin Peter
f1b884aa5d changed deprecated class 2013-05-29 20:15:04 +02:00
Florin Peter
df41a60c50 fixed typo 2013-05-29 20:11:53 +02:00
Florin Peter
353d19d183 fixes if cache returns false 2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d fix $parent/$source typo 2013-05-29 19:58:05 +02:00
Michael Gapczynski
5bbc583b56 Merge pull request #3532 from owncloud/scan-update 
Only update metadata that has changed
 2013-05-29 10:23:41 -07:00
Florin Peter
1202ab9995 Merge branch 'master' into file_encryption_external_storage_fixes 2013-05-29 19:19:40 +02:00
Florin Peter
d265264542 fix for share folder on external storage 2013-05-29 19:11:39 +02:00
icewind1991
8a5dec7775 Merge pull request #3530 from owncloud/cache-mimeicon 
Cache mimetype icons
 2013-05-29 08:20:58 -07:00
Michael Gapczynski
59655e9afd Style fixes 2013-05-29 10:56:28 -04:00
Michael Gapczynski
ea55367678 Organize conditionals in a better order 2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9 Only update metadata that has changed 2013-05-29 10:19:03 -04:00
Robin Appelman
24a401a548 Cache mimetype icons 2013-05-29 15:43:41 +02:00
Björn Schießle
ae0f37e9e2 fix indention 2013-05-29 15:37:27 +02:00
Robin Appelman
44d217c425 Cache: provide a function to get the permissions of all files in a folder with one query 2013-05-29 15:25:42 +02:00
Björn Schießle
8587f565d2 remove unnecessary variable 2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5 use public API for error handling; improved while condition 2013-05-29 14:40:47 +02:00
Björn Schießle
893a1ed6f5 for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists 2013-05-29 14:19:18 +02:00
Björn Schießle
672811c103 if one public link share was found, we don't have to check it for the other folders 2013-05-29 13:12:30 +02:00
Björn Schießle
b44192f366 check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages 2013-05-29 13:10:26 +02:00
Florin Peter
5dd865a57f changes l10n after review 2013-05-29 12:47:50 +02:00
Florin Peter
efd629462e changes after review 2013-05-29 12:23:33 +02:00
Florin Peter
c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Jenkins for ownCloud
7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Robin Appelman
8320f41dbe Emit leacgy OC_User hooks 2013-05-29 01:05:49 +02:00
Robin Appelman
3e7e2c8a5c fix setting getting active userid 2013-05-29 00:47:55 +02:00
Robin Appelman
198655f109 fix User->setHome when the backend action fails 2013-05-29 00:47:44 +02:00
Robin Appelman
4b688db612 implement old user api on top of the new one 2013-05-29 00:32:10 +02:00
Robin Appelman
955bda1842 New user management classes 2013-05-29 00:31:55 +02:00
icewind1991
fee43ec506 Merge pull request #3511 from owncloud/sessionclass 
Abstract session access away in a class
 2013-05-28 13:37:39 -07:00
Florin Peter
71a532fc4d fixed if fopen returns false typically on external storage 2013-05-28 20:50:14 +02:00
kondou
1d799f22c1 Default to localhost, if nothing is entered. 2013-05-28 17:34:57 +02:00
Robin Appelman
fa6bfe8837 didn't mean to commit this yet 2013-05-28 17:21:44 +02:00
Florin Peter
4b4b447e2a fixed missing convert to new session handler 2013-05-28 17:06:37 +02:00