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

3781 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
b76725c1fa Merge pull request #3560 from owncloud/init-order-session 
initialize the session earlier
 2013-06-03 03:21:05 -07:00
Robin Appelman
38bd234686 make sure the filesystem is setup before doing mount operations 2013-06-02 22:09:44 +02:00
Robin Appelman
b5e817d638 fix clearing mounts when filesystem isn't initialized yet 2013-06-02 21:44:24 +02:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Thomas Müller
1b3c9fe5ae Merge pull request #3454 from owncloud/fix_hasInternetConnection 
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
 2013-05-31 17:05:45 -07:00
Thomas Mueller
dd4a07321a fix method naming 2013-05-31 23:24:09 +02:00
icewind1991
94a6622bcd Merge pull request #3459 from owncloud/fix_for_2377 
fix problems with german "Umlaut" in folder name
 2013-05-31 14:00:02 -07:00
Robin Appelman
b8b0b7606a initialize the session earlier 2013-05-31 17:31:52 +02:00
FlorinPeter
d636e168a6 Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes 
File encryption external storage fixes
 2013-05-31 03:21:46 -07: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
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
dbbf195727 Only retrieve the current user's permissions 2013-05-29 18:08:18 -04:00
Florin Peter
1337f48d64 fixes for pgsql 2013-05-29 20:41:07 +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
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
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
Jenkins for ownCloud
7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Robin Appelman
57f712f8a9 implement ArrayInterface with Session 2013-05-28 16:52:40 +02:00
Robin Appelman
cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Jenkins for ownCloud
3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman
040045cc2e provide a dummy session for CLI 2013-05-28 01:15:38 +02:00
Robin Appelman
f547b66d6b check fix if session start is successfull 2013-05-28 01:13:36 +02:00
Robin Appelman
e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Robin Appelman
76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Robin Appelman
9e65f40d1b Add PublicEmitter class 2013-05-27 20:20:06 +02:00
kondou
3001db6b50 Update jquery to 1.10.0 & add jquery-migrate 1.2.1 2013-05-27 20:13:13 +02:00
Georg Ehrke
557cc4c1ab make method names camelCase 2013-05-27 19:24:31 +02:00
Georg Ehrke
d69b7e24d2 update comment 2013-05-27 19:20:29 +02:00
Georg Ehrke
58c9175a56 move check if internet connection is disabled on purpose to a dedicated method 2013-05-27 19:19:17 +02:00
Michael Gapczynski
6151c0d310 Merge pull request #3412 from owncloud/fix_2013 
Don't set Content-Length header if size is unknown
 2013-05-27 07:44:35 -07:00
Jenkins for ownCloud
73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
Jenkins for ownCloud
0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Florin Peter
adcafbde34 Merge branch 'master' into fix_for_2377 2013-05-25 20:37:28 +02:00