mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,840 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

3873 Commits

Author SHA1 Message Date
Robin Appelman cf7321915d seperate mimetype guessing from filename 2013-06-06 23:51:44 +02:00
Björn Schießle fdaab7372e always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not 2013-06-06 13:30:18 +02:00
Jenkins for ownCloud 81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Michael Gapczynski cb9fe475c4 Merge branch 'master' into hook-improvements 
Conflicts:
	lib/files/view.php
 2013-06-04 18:19:08 -04:00
Arthur Schiwon c8a2beccb0 Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374 2013-06-03 22:36:36 +02:00
Jörn Friedrich Dreyer 96b1e54d4a Merge pull request #3444 from owncloud/share-fix 
Fix undefined index for share mount point retrieval
 2013-06-03 11:35:06 -07:00
icewind1991 8c991d97aa Merge pull request #3561 from owncloud/user 
Refactor of user management
 2013-06-03 08:13:40 -07:00
Thomas Tanghus 2572c9a6b7 Merge pull request #3578 from owncloud/ocdialog 
Replacement for jquery.dialog to fit better with ownCloud design.
 2013-06-03 06:37:27 -07:00
Robin Appelman 0ce2b2708c also clear cached users when removing a single backend 2013-06-03 14:19:17 +02:00
Robin Appelman 2a82964830 use caching for userExists 2013-06-03 13:46:05 +02:00
Robin Appelman 83fbdc903f cast result to bool 2013-06-03 13:39:34 +02:00
Robin Appelman eb2a1e0f8a move phpdoc comments 2013-06-03 13:33:56 +02:00
Robin Appelman 1a4021a0fe User: return backend result 2013-06-03 13:19:01 +02:00
Robin Appelman fbe3213fec User: consisten variable naming 2013-06-03 13:17:03 +02:00
Robin Appelman 00b4bfcbf5 User: remove determineDisplayName 2013-06-03 13:15:42 +02:00
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
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +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 3e00a3603c adding PHPDoc comment to getManager() 
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
 2013-06-01 00:49:06 +02:00
Robin Appelman 2c69403fd6 fix namespacing error 2013-06-01 00:39:59 +02:00
Robin Appelman 82fd15706e fix undefined variables 2013-06-01 00:39:59 +02:00
Robin Appelman e430f442b5 use single quotes 2013-06-01 00:39:59 +02: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
Florin Peter b840de4e01 user should set into session before postLogin hook otherwise it will break not only the files_encryption app 2013-05-31 21:30:13 +02:00
Robin Appelman cdb2f559a8 Fix postLogin hook 2013-05-31 19:58:31 +02:00
Robin Appelman 473f3c6916 fix typo 2013-05-31 18:18:13 +02:00
Robin Appelman f00844a003 fix caching of user objects 2013-05-31 17:42:51 +02:00
Robin Appelman b8b0b7606a initialize the session earlier 2013-05-31 17:31:52 +02:00
Robin Appelman a8fb803319 cache instances of \OC\User\User 2013-05-31 17:31:27 +02:00
Robin Appelman 542bcf9156 Merge branch 'master' into user 2013-05-31 16:35:51 +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 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
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
Florin Peter 505a300776 we should also normalize on update and search because the database layer will not do this for us 2013-05-25 20:35:12 +02:00
Michael Gapczynski 0fdf3a7e63 Merge pull request #3388 from roha4000/master 
Duplicate DB entries in filecache table when renaming folder in WebUI #2
 2013-05-25 11:18:20 -07:00
Michael Gapczynski c870aed1b6 Merge pull request #3493 from owncloud/bumpversion 
Bump version for files_encryption changes
 2013-05-25 10:20:42 -07:00
Michael Gapczynski 2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Michael Gapczynski 0a29d2029a Clear opcode caches after writing to the config file, fixes #3372 2013-05-25 11:25:43 -04:00
Florin Peter c245f5a99f added more places where normalization is needed 2013-05-25 14:56:00 +02:00
Florin Peter f6bf9de6de prevent for returning while false normalize string 2013-05-25 14:54:36 +02:00
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Florin Peter 946e9ccc0a Merge branch 'master' into fix_for_2377 2013-05-24 20:54:13 +02:00
Florin Peter 736f10039d changed builtin normalizer to \OC_Util::normalizeUnicode 2013-05-24 20:36:20 +02:00
Florin Peter 661b5501b0 added normalizeUnicode() method to OC_Util 2013-05-24 20:35:01 +02:00
Thomas Müller 4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Alessandro Cosentino 3fbfe3c06a small typo in the comments 2013-05-23 20:59:02 -04:00
Michael Gapczynski a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 
Support for moving/copying folders between storages
 2013-05-23 17:35:11 -07:00
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Florin Peter d4b700ef4e revert previous fix and added normalizer to cache class 2013-05-23 20:29:46 +02:00
Michael Gapczynski 30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Michael Gapczynski 3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 10:23:16 -04:00