Commit Graph

4295 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 8dc6bdd96b clean up usage of DatabaseSetupException and catch Exceptions in entrypoints 2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer c0bdbd9d81 introduce and use executeAudited in db.php 2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer d264d0a79d Merge pull request #3648 from owncloud/sql_limit_as_param
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Björn Schießle db06b906e5 Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer 5ec13742b3 use to_char to allow comparing string to CLOB cloumns in oracle 2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer 307f1626e8 convert LIMIT to parameter 2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer 124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
infoneo b39113ae3e Update mapper.php
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Robin Appelman 94ca576c9a use a getter for the storage loader to ensure the instance is created 2013-06-07 17:50:10 +02:00
Robin Appelman 2708ab09ab storage loader needs to be accessible by apps 2013-06-07 17:40:19 +02:00
Robin Appelman 85a9b7f094 Storage wrapper: provide access to the wrapped storage 2013-06-07 17:12:45 +02:00
Robin Appelman f35578ec54 merge master into storage-wrapper 2013-06-07 17:12:16 +02:00
Robin Appelman bd67512409 manage creating and wrapping storages in it's own class 2013-06-07 17:07:13 +02:00
Michael Gapczynski 9ef989f917 Merge pull request #2919 from owncloud/hook-improvements
Hook improvements
2013-06-07 06:35:50 -07:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Robin Appelman 85abede9bf actually return result 2013-06-07 00:22:05 +02:00
Robin Appelman 0470a5ba94 fix variable name 2013-06-07 00:17:51 +02:00
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
Thomas Tanghus 9cd6645037 Move comment and set requesttoken. 2013-06-05 00:38:08 +02:00
Michael Gapczynski cb9fe475c4 Merge branch 'master' into hook-improvements
Conflicts:
	lib/files/view.php
2013-06-04 18:19:08 -04:00
Michael Gapczynski e0359b0b24 One more style fix 2013-06-03 18:17:32 -04:00
Michael Gapczynski 1c61732193 Merge branch 'master' into convert-oc_config 2013-06-03 18:06:13 -04:00
Michael Gapczynski d50d663928 Style and comment fixes 2013-06-03 18:05:38 -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
Thomas Tanghus ad5c4bf771 Cleanup hacke v.2 2013-05-31 00:53:57 +02:00
Thomas Tanghus e21649ccff Revert "Clean up hack."
This reverts commit 138c7f615b.
2013-05-31 00:53:15 +02:00
Thomas Tanghus 138c7f615b Clean up hack. 2013-05-31 00:28:03 +02:00
Michael Gapczynski bd0d189f6f Merge branch 'master' into googledrive 2013-05-30 11:20:22 -04: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
kondou 1d799f22c1 Default to localhost, if nothing is entered. 2013-05-28 17:34:57 +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 16925672e8 Merge branch 'master' into googledrive 2013-05-27 11:35:57 -04:00
Michael Gapczynski 0953b68556 Return null if file size is negative for WebDAV, fix #2013 2013-05-27 11:35:31 -04: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
Thomas Tanghus e66f609a64 Hack base.php to make Basic Auth work 2013-05-25 05:51:51 +03:00
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Bart Visscher d12e44f96a Merge branch 'master' into doctrine
Conflicts:
	lib/MDB2/Driver/sqlite3.php
	lib/base.php
	lib/db.php
2013-05-24 21:46:42 +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
Florin Peter 85e0c78166 fix problems with german "Umlaut" in folder name 2013-05-23 01:21:36 +02:00
Björn Schießle ee53bd1aa3 Merge branch 'master' into files_encryption
Conflicts:
	lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
Jörn Friedrich Dreyer 1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer 1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Georg Ehrke efb2e69230 fix return value of OC_Util::isinternetconnectionworking() 2013-05-22 12:21:11 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Roland Hager 2ea2abf11e Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users. 2013-05-22 08:18:57 +02:00
Michael Gapczynski 7a0c592f93 Fix undefined index for share mount point retrieval 2013-05-21 20:21:19 -04:00
Florin Peter 28d72b822d Merge branch 'master' into files_encryption
Conflicts:
	lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
Thomas Müller e2444ec9c5 Merge pull request #3266 from owncloud/hooks
New hook system
2013-05-21 15:21:25 -07:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
Michael Gapczynski c62f230ddb Merge branch 'master' into move-maint-start 2013-05-21 11:26:56 -04:00
Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Michael Gapczynski 09ff46eda2 Remove user name addition to paths in deleteAll 2013-05-20 10:21:55 -04:00
Thomas Tanghus c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Florin Peter 31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud 6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Florin Peter 58a8d67a9b fix for webdav because initMounts() is triggered twice so we lost the root path 2013-05-20 01:57:16 +02:00
Florin Peter b3b6738d59 Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit 079f918d5c.
2013-05-20 01:47:35 +02:00
Florin Peter 079f918d5c fix for webdav and wrong reference for findByStorageId 2013-05-19 22:30:03 +02:00
Michael Gapczynski fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04:00
Michael Gapczynski 41e2d64c86 Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem 2013-05-19 14:15:49 -04:00
Michael Gapczynski 67729f5f9f Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
2013-05-19 10:09:24 -07:00
Lukas Reschke 7ec36c5bbb Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
2013-05-19 13:33:33 +02:00
Michael Gapczynski 9bebf9b4c8 Don't set Content-Length header if size is unknown 2013-05-17 14:14:12 -04:00
Bart Visscher 854da1d9ca Add classes replaced by the public api to the code checker 2013-05-17 15:48:51 +02:00
FlorinPeter 0f314c1404 Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
fix for SQLite3Result::fetchArray() on setup
2013-05-17 01:55:28 -07:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Florin Peter d7dc710c8b revert changes 2013-05-17 01:22:30 +02:00
Florin Peter a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00
Florin Peter 469d6028ad revert changes 2013-05-17 01:17:55 +02:00
Björn Schießle 95297c2469 add pre-shared hooks 2013-05-16 17:44:28 +02:00
Björn Schießle 9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jenkins for ownCloud 966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Thomas Mueller 195f6143a3 Merge branch 'master' into convert-oc_config 2013-05-15 23:51:13 +02:00
Thomas Mueller 3c779b0632 Merge branch 'master' into hooks 2013-05-15 23:49:41 +02:00
Thomas Mueller 5dcec346e5 Merge branch 'master' into fix-3353 2013-05-15 23:43:46 +02:00
Thomas Müller dfddaf8fbf Merge pull request #3374 from owncloud/vobject_compound_property
Add Compound property to avoid double escaping values.
2013-05-15 14:34:16 -07:00
Florin Peter c50bf3e3c5 fix for losing mount point "/" 2013-05-15 20:09:02 +02:00
Florin Peter 68059b1ec3 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 19:49:40 +02:00
Thomas Tanghus cb41a30b00 Add Compound property to avoid double escaping values. 2013-05-15 18:56:54 +02:00
Florin Peter 0916769f67 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 17:00:01 +02:00
Michael Gapczynski d91161186b Fix finding mount in background watcher, fixes #3353 2013-05-15 09:33:38 -04:00
Florin Peter 751487ded7 merge changes for files_encryption 2013-05-15 10:20:19 +02:00
Florin Peter 807740a07a fix for losing mount point "/" 2013-05-15 10:19:38 +02:00
Florin Peter 226aec8d56 Merge branch 'master' into files_encryption 2013-05-15 03:22:06 +02:00
Michael Gapczynski f8336c1e2c Turn off theme before update 2013-05-14 09:34:01 -04:00
Michael Gapczynski 71eed76dbe Prevent backgroundScan() from looping if opendir() is failing for the same path 2013-05-13 11:17:08 -04:00
Bart Visscher 009e9559f3 Remove default return hint 2013-05-13 08:28:10 +02:00
Bart Visscher 061fb79e5c Use the constants from OC_Log 2013-05-13 08:28:10 +02:00
Bart Visscher 31ad43f922 Code style 2013-05-13 08:28:10 +02:00
Bart Visscher 0b4018e7ff Remove include for loading legacy class 2013-05-13 08:28:10 +02:00
Bart Visscher 7e5bb96027 Fix OC\Log with OC_Log in wrong namespace 2013-05-13 08:28:10 +02:00
Bart Visscher b41999a2c0 Implement OC\Log as proxy to OC_Log
OC\Log implements the Psr\Log\LoggerInterface interface. See
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
for the full interface specification.
2013-05-13 08:28:10 +02:00
Frank Karlitschek 0e55accee2 Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues. 2013-05-13 02:42:18 +02:00
infoneo be4eef682a Fixed problems with a dots in a filenames 2013-05-12 15:22:57 +03:00
Morris Jobke c5cb3f9577 Merge pull request #3311 from owncloud/disable_mbstring.func_overload
disable mbstring.func_overload in setup v.3
2013-05-12 03:28:18 -07:00
Thomas Tanghus baf058316c disable mbstring.func_overload in setup 2013-05-12 10:56:32 +02:00
Lukas Reschke 63d51980e1 Get config from template 2013-05-12 10:51:21 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
infoneo 8f19c5ecab Dots in a filenames fix 2013-05-12 01:47:48 +02:00
Morris Jobke 9f3c156aca Merge pull request #3283 from owncloud/move-legacy-fs
Move legacy filesystem classes
2013-05-10 07:53:04 -07:00
Jörn Friedrich Dreyer 9134395b43 don't emit rename hooks on partial file renames 2013-05-10 12:01:50 +02:00
Jörn Friedrich Dreyer c3b0d3d38c rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted 2013-05-10 12:00:13 +02:00
Robin Appelman 990f23c024 fix typo 2013-05-09 22:52:44 +02:00
Björn Schießle 2e81efc37e don't call correctFolder() in touchHook, it will be called later in the writeUpdate() 2013-05-08 23:00:24 +02:00
Björn Schießle 0e30e68b22 update etag for for the touched file 2013-05-08 23:00:03 +02:00
Robin Appelman d97ef0805b Add mechanism to allow apps to wraper storage classes 2013-05-08 22:35:10 +02:00
Bart Visscher 83444d9c64 camelCase class properties 2013-05-08 18:20:44 +02:00
Bart Visscher 9f5b7657fb Remove include for loading legacy class 2013-05-08 18:17:26 +02:00
Robin Appelman ba9db19640 Add wrapper storage backend 2013-05-08 16:53:05 +02:00
Robin Appelman d9c19fa8d7 Move legacy filesystem classes 2013-05-08 16:48:47 +02:00
FlorinPeter e8a80c6c2f Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
fix for tearDownFS, after filesystem::tearDown() in Util
2013-05-08 05:43:54 -07:00
Robin Appelman 71fc4a2cf4 Autoloader: fix loading app clases located in lib/ 2013-05-08 00:50:33 +02:00
Robin Appelman 2a01d39940 Autoloader: load the 3rdparty libraries using prefixes 2013-05-07 23:07:47 +02:00
Robin Appelman 0d25c0001c check for setlocale after setting up the paths to prevent autoloader confusion 2013-05-07 22:53:07 +02:00
Robin Appelman 6d903cf7ae Autoloader: add support for custom namespace paths 2013-05-07 22:39:35 +02:00
Robin Appelman 72ed74f28a Autoloader: split getting the class paths and loading the class 2013-05-07 22:26:55 +02:00
Florin Peter 03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Robin Appelman cac86bb4db Allow disabling the global classpath in an autoloader 2013-05-07 22:24:47 +02:00
Robin Appelman d1fcb7eb52 Allow the autoloader to try mutliple possible paths for each path 2013-05-07 22:21:59 +02:00
Robin Appelman 19cfe74bf5 Add per-autoloader classPath 2013-05-07 22:19:00 +02:00
Robin Appelman 0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
Bart Visscher e620286b25 Fix returns of values in OCP\Config 2013-05-07 20:07:28 +02:00
Bart Visscher 07df94def6 Convert OC_Config to object interface 2013-05-07 19:59:46 +02:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
Michael Gapczynski 349a533f66 Merge pull request #3025 from owncloud/move-file
Cache: only look for child entires when doing a move operation when moving a folder
2013-05-07 07:52:57 -07:00
Robin Appelman b8a421a86d New hook system 2013-05-07 16:34:09 +02:00
Bart Visscher 398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
Morris Jobke 2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Bart Visscher 51a1f829b8 Merge pull request #3120 from owncloud/ocs_properties
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +02:00
Bart Visscher 460f827f7e Also check for needed upgrade in the Sabre Maintenance connector 2013-05-04 00:07:30 +02:00
Bart Visscher 41f7eb948a Move start of the maintenance mode to the ajax call
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Robin Appelman b7585050b5 Move legacy backgroundjob classes to a place where they can be autoloaded 2013-05-03 16:42:48 +02:00
Bart Visscher d89e748926 Use supplied tablename 2013-05-03 16:02:53 +02:00
Bart Visscher a541b80592 Merge pull request #3222 from owncloud/fix-3218
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
Bart Visscher dcbbca1f89 Merge pull request #2972 from AndreasErgenzinger/master
Translations for themes
2013-05-03 05:41:28 -07:00
Bart Visscher 05a0b4533b Merge pull request #2491 from riso/xsendfile_fix_zip
improved handling of xsendfile zip generation race condition
2013-05-03 05:37:01 -07:00
Tom Needham cb5a69dd22 Merge pull request #3216 from owncloud/fix-api-3rdparty
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
Thomas Müller 444a209a2a Merge pull request #3183 from miicha/patch-1
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
Michael Gapczynski 73d7cae6df One more mount point fix 2013-05-02 18:22:43 -04:00
Michael Gapczynski 7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Bernhard Posselt 11afb2e5a8 respect format output 2013-05-02 14:51:53 +02:00
Bernhard Posselt 0f38e6ec9c logout before output to not run into header already sent problems 2013-05-02 14:49:05 +02:00
Bernhard Posselt ed0c23a9cc fix bug that would only return error responses for 3rdparty apps 2013-05-02 14:36:16 +02:00
joel hansson 7f58b0ef7c typo fix in a comment. 2013-05-01 12:29:15 +03:00
FlorinPeter b464970142 Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
fix for infinite loop causing on files_encryption branch when testing
2013-04-29 17:05:41 -07:00
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +02:00
miicha fbf9233648 fixing mimetype for "new" ms office formats
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
2013-04-30 02:38:05 +03:00
Florin Peter f55aaad858 fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent 2013-04-29 15:43:48 +02:00
Frank Karlitschek 1f194b7bdc Merge pull request #3154 from owncloud/fix_3153
Change app identifier for core api routes
2013-04-28 03:51:21 -07:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Lukas Reschke 51a1f41225 Merge pull request #3121 from owncloud/ocs_fix_api_response
Fix the api response when a shipped and third party app both fail.
2013-04-27 10:05:06 -07:00
Tom Needham d33f6b9af6 Use correct variable when checking auth 2013-04-27 17:45:23 +01:00
Morris Jobke 0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint
web_server_restart needs to be true to display the hint
2013-04-27 08:19:08 -07:00
Morris Jobke 86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
Raghu Nayyar 2bcb64e781 Merge pull request #3114 from owncloud/update-notification
Add an update notification
2013-04-26 21:12:38 -07:00
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman 8a838e0e03 Code style 2013-04-26 17:30:55 +02:00
Bart Visscher 7db5ec30c3 Add check for Magic Quotes 2013-04-26 16:32:58 +02:00
Bart Visscher f5b0d904fb web_server_restart needs to be true to display the hint 2013-04-26 16:21:56 +02:00
icewind1991 5474fea1f6 Merge pull request #3136 from owncloud/mount-cleanup
Separation of mount management
2013-04-26 06:55:21 -07:00
Bart Visscher 686f836736 Merge pull request #3026 from owncloud/cli-no-session
Don't start the session when in cli mode
2013-04-26 06:20:39 -07:00
Bart Visscher 948e3d5b7c Merge pull request #3028 from owncloud/simplyfy-resource-locating
Simplify resource locating in templatelayout
2013-04-26 05:56:09 -07:00
Robin Appelman 172499d5f3 Don't start the session when in cli mode 2013-04-26 14:53:59 +02:00
Bart Visscher 7e89a017bf Merge pull request #2955 from owncloud/displaynames-numeric
Fix OC_User::getDisplaynames when using numeric user id's
2013-04-26 05:51:07 -07:00
Bart Visscher b46f6e4f97 Simplify app js locating for layout pages 2013-04-26 14:21:51 +02:00
Bart Visscher ea4ae857a1 Simplify app css locating for layout pages 2013-04-26 14:21:50 +02:00
Bart Visscher 710acde9a1 Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
Overwrite host and webroot when forcessl is enabled
2013-04-26 05:10:49 -07:00
Robin Appelman 809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Robin Appelman bcd9a69033 Cache: seperate handing of numeric storage id's to it's own class 2013-04-26 00:00:18 +02:00
Florin Peter 672d177f10 added post rename proxy 2013-04-25 22:43:15 +02:00
Bart Visscher bc9792910a Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/MDB2/Driver/sqlite3.php
	lib/db.php
2013-04-25 18:16:09 +02:00
icewind1991 80e91e1ac6 Merge pull request #3132 from owncloud/mount-setupfs
Make sure the filesystem is initialized when searching for mounts
2013-04-25 08:07:07 -07:00
Robin Appelman cea56df59e Have the filecache updater testcase clean the filesystem properly 2013-04-25 16:56:48 +02:00
Robin Appelman 31d7f4df2a Make sure the filesystem is initialized when searching for mounts 2013-04-25 16:11:48 +02:00
Florin Peter fac288a4ad added unencrypted file size to file cache
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
Lukas Reschke 632221bed0 Correct the parameter description
Thanks @kabum
2013-04-25 14:27:08 +03:00
Lukas Reschke 2d4af5dfca Correct function description
$password is not supported
2013-04-25 14:20:32 +03:00
Bernhard Posselt c9c1e483c5 use utf-8 encoding for json 2013-04-25 11:36:41 +02:00
Tom Needham b3e7485612 Correct the api response when both a shipped app and/or a third party app fail 2013-04-25 01:08:11 +01:00
Thomas Tanghus c84281990c Merge pull request #2993 from owncloud/resolve_apps_lib_path
Let autoloader resolve paths under apps lib directory.
2013-04-24 13:33:05 -07:00
Lukas Reschke d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
icewind1991 dd1c876009 Merge pull request #3112 from owncloud/markdown-mimetype
Add markdown to mimetype list
2013-04-24 08:18:10 -07:00
icewind1991 3b576c5f77 Merge pull request #3111 from owncloud/csp-audio
Allow loading of external media ressources
2013-04-24 08:17:42 -07:00
Lukas Reschke a34350c803 Merge pull request #3106 from IMM0rtalis/xframe_restriction_config
- xframe restriction configurable now
2013-04-24 08:02:12 -07:00
Robin Appelman 3d42d49d14 Add markdown to mimetype list 2013-04-24 16:54:34 +02:00
Lukas Reschke 4f96d7fb85 Allow loading of external media ressources 2013-04-24 16:45:51 +02:00
Daniel Molkentin ff6fb0906b Merge pull request #3100 from owncloud/ensure_index_php
Fix for #3049
2013-04-24 07:14:33 -07:00
Daniel Molkentin 6ac2fdf44b sync parameters in setup.php with the ones in the actual .htaccess 2013-04-24 15:11:58 +02:00
Florian Scholz 03aa86d8a6 - xframe restriction configurable now 2013-04-24 14:45:40 +02:00
Robin Appelman b31dc10c3c Add support for the old public backgroundjob api 2013-04-24 14:40:49 +02:00
Robin Appelman 117412272e Update documentation for \OCP\BackgroundJob 2013-04-24 14:24:28 +02:00
Bernhard Posselt a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +02:00
Bernhard Posselt b98b56e4a8 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 13:45:40 +02:00
Morris Jobke b1c9b296e8 Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
Tom Needham 7eb6cc62f8 Make class properties protected instead of private to allow subclassing 2013-04-23 23:03:39 +01:00
Thomas Mueller d209cac2a1 lastRun is not a method 2013-04-23 23:46:56 +02:00
Florin Peter 25ff32db6b Added post proxy for getFileInfo.
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
2013-04-23 22:20:31 +02:00
Bernhard Posselt 9dde43db57 Merge pull request #3080 from owncloud/validate_redirect_mast
Disallow URLs containing a @
2013-04-23 12:21:39 -07:00
Lukas Reschke 495868497c Merge pull request #3077 from owncloud/rename-checksourcepath
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-23 07:17:36 -07:00
Sam Tuke 4aa80d02be Merge branch 'master' into files_encryption 2013-04-23 14:13:40 +02:00
Markus Goetz f1a63254fb Fix ugly error style on install
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
Jenkins for ownCloud 05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Bernhard Posselt edd37c779d Merge pull request #3074 from owncloud/sqlite3-raiseerror
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 14:34:09 -07:00
Lukas Reschke 6e78c4fcc0 Disallow URLs containing a @ 2013-04-23 00:26:40 +03:00
Bernhard Posselt 4af4a5bd98 Merge pull request #3073 from owncloud/setup-error-message
Improve error message if user creation fails during setup
2013-04-22 13:28:18 -07:00
Robin Appelman 3c90625ef1 Files: also check if the source path is valid when doing a rename or copy operation 2013-04-22 21:23:12 +02:00
Bart Visscher 2314067e75 Merge pull request #3019 from owncloud/fix-3004
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-22 20:46:13 +02:00
Robin Appelman 7c1a4d2f57 Fix raiseError call in the MDB2 sqlite3 driver 2013-04-22 20:34:00 +02:00
Robin Appelman 5942d5aeac Improve error message if user creation fails during setup 2013-04-22 20:32:40 +02:00
Robin Appelman e63633b5f3 Don't try to use backgroundjobs before the installtion is done 2013-04-22 20:23:23 +02:00
Björn Schießle b5cb5dab51 fix encryption to owncloud user for public link shares 2013-04-22 14:30:10 +02:00
Björn Schießle b24a673714 the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared 2013-04-22 14:12:18 +02:00
Jenkins for ownCloud f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Robin Appelman 40de36a8f3 Try to supress pre-upgrade backgroundjob error 2013-04-21 00:58:15 +02:00
Robin Appelman 07f510692c Ensure we don't throw an exception before we can upgrade to the new backgroundjob system 2013-04-21 00:08:55 +02:00
Robin Appelman db0ea9780b Add database table for backgroundjob 2013-04-21 00:04:58 +02:00
Robin Appelman 7948341a86 Rework background job system 2013-04-20 23:27:46 +02:00
Robin Appelman eed5e9f804 Cache: check one folder and one file each time the backgroundwatcher runs
Because there are usually way less folders than files it walks trought the list of all folder quicker, this causes new files to be detected quicker
2013-04-20 16:57:53 +02:00
Robin Appelman 15dae6198f Cache: add a backgroundjob to check for external changes to the filesystem 2013-04-20 16:38:03 +02:00
Jenkins for ownCloud 03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Bart Visscher 0701d0019b Merge pull request #3020 from owncloud/cleaner-webdav-reason
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 07:56:41 -07:00
Bart Visscher e1c5b31d65 Test if we want a 3rdparty style/script before checking the 3rdparty root 2013-04-19 16:09:39 +02:00
Robin Appelman 10be42f5b7 Cache: only look for child entires when doing a move operation when moving a folder 2013-04-19 15:06:48 +02:00
Bart Visscher 7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus 4ccc9d896a Merge pull request #3010 from owncloud/fix-cookie_path
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
Thomas Tanghus e09c17de5b Added explanation 2013-04-18 22:29:50 +02:00
Bart Visscher e4876c9117 Don't use empty session.cookie_path, otherwise we get multiple cookies 2013-04-18 21:11:58 +02:00
Björn Schießle fe58e4b1a6 we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again 2013-04-18 17:48:16 +02:00
Thomas Tanghus 9facb67fab Let autoloader resolve paths under apps lib directory. 2013-04-18 08:30:09 +02:00
Jenkins for ownCloud cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Brice Maron 43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Bernhard Posselt 3b2a0523f8 Merge pull request #2978 from owncloud/displayname_can_be_null
Remove not null constraint. Fix #2976
2013-04-17 07:47:17 -07:00
Morris Jobke 867a527148 Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
Thomas Tanghus 44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Bernhard Posselt 8471340db9 use date and time instead of timestamp 2013-04-17 12:24:18 +02:00
Thomas Tanghus ec280e6f9f Merge pull request #2746 from owncloud/use-count-userexists
Use count SQL to check for user existance
2013-04-17 03:06:50 -07:00
AndreasErgenzinger eef1cf529e additional safety checks 2013-04-17 10:41:07 +02:00
AndreasErgenzinger 7611d218df merge translations with those from theme 2013-04-17 10:34:29 +02:00
AndreasErgenzinger 6a5f5ce157 merge translations with those from theme 2013-04-17 10:29:32 +02:00
Bart Visscher f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
Jenkins for ownCloud 37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Robin Appelman 8a50459223 Fix OC_User::getDisplaynames when using numeric user id's
fixes #2948
2013-04-17 01:08:27 +02:00
Michael Gapczynski 2040f0af78 Merge pull request #2943 from owncloud/always_load_cache_hooks_first
always connect file cache updater hooks first
2013-04-16 12:21:09 -07:00
Bart Visscher 8d1db84ed1 Merge pull request #2887 from owncloud/l10n-caching
L10N: cache the result of findLanguage
2013-04-16 09:11:33 -07:00
Jörn Friedrich Dreyer 606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00
Jenkins for ownCloud d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Arthur Schiwon 2fa34d6772 Make FileCache upgrade more robust, fixes #2650 2013-04-15 11:56:30 +02:00
Michael Gapczynski 9ead7c4776 Don't unlink old renamed file if stream copy failed 2013-04-13 15:04:46 -04:00
Michael Gapczynski 4f6f6456aa Check if operation worked before sending post hooks, fixes #2484 2013-04-13 15:02:47 -04:00
kondou d759dca203 Handle empty datafolder better.
If datafolder is erased, the default value will be shown as a placeholder.

If installation is submitted without a datafolder the default value will be used.
2013-04-13 15:56:01 +02:00
Frank Karlitschek 8efd71099f Merge pull request #2909 from owncloud/addHook
allow Storages to join MountPoint initialization
2013-04-13 05:19:27 -07:00
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Arthur Schiwon e3b733f23d allow Storages to join MountPoint initialization 2013-04-13 00:33:21 +02:00
Jenkins for ownCloud 33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Robin Appelman 2180a4c420 -L10N: cache the result of findLanguage 2013-04-12 00:58:14 +02:00
Jörn Friedrich Dreyer 121c8bd303 Merge pull request #2747 from owncloud/cache-contructed-cache-objects
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Com...
2013-04-10 08:09:09 -07:00
Bernhard Posselt 526076f2e0 Merge pull request #2781 from owncloud/fix-2592
Correct undefined variable in post_shared hook, fixes #2592
2013-04-10 05:53:50 -07:00
Robin Appelman 258ad38fd3 Fix touch for creating new files 2013-04-10 13:48:24 +02:00
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
eMerzh 8db76ef7d2 Merge pull request #2147 from eMerzh/split_config
[OC6] Allow to load splited config files
2013-04-09 09:56:16 -07:00
Bernhard Posselt 352af6005f Merge pull request #2801 from OpenLarry/patch-1
fixes #2679 - 5.0.3 Renaming -> Nothing happens
2013-04-09 03:40:40 -07:00
Bernhard Posselt 16b513e4dc added correct check for gd and check for php-intl 2013-04-09 12:22:55 +02:00
Bernhard Posselt 6fc0319e1b Merge pull request #2754 from owncloud/cookie-path
Just send the cookies in the ownCloud directory
2013-04-09 02:36:20 -07:00
Bernhard Posselt 8cd4cadb22 Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
Add mimetype filter to getDirectoryContent function
2013-04-09 02:25:40 -07:00
Björn Schießle 2d489a94c6 Merge pull request #2797 from owncloud/fixing-2792-master
fixes #2792 - only touch if writable
2013-04-09 01:50:05 -07:00
Bernhard Posselt 5bb248efd6 Merge pull request #2764 from owncloud/remove-limit-from-count-query
Remove wrong limit parameter from count query in compatibility function
2013-04-09 00:19:09 -07:00
Bernhard Posselt 74f90eabe4 Merge pull request #2798 from owncloud/fixing-2789-master
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-09 00:18:13 -07:00
Jenkins for ownCloud 5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Michael Gapczynski d51a94161e Initialize collectionTypes variable as false 2013-04-08 17:46:52 -04:00
OpenLarry 49313b334a fixes #2679 2013-04-09 00:26:16 +03:00
Thomas Müller 89818e279b Merge pull request #2785 from owncloud/vobject_stringproperty
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
2013-04-08 14:23:38 -07:00
Thomas Mueller 46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Bart Visscher a07a8794b8 Add mimetype filter to getDirectoryContent function 2013-04-08 22:40:03 +02:00
Thomas Mueller d069ee8a8b fixes #2792 - only touch if writable 2013-04-08 22:22:49 +02:00
Thomas Tanghus ae9548bc6e Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762 2013-04-08 14:57:43 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Michael Gapczynski e704bcd96e Correct undefined variable in post_shared hook, fixes #2592 2013-04-07 20:05:54 -04:00
Bart Visscher a8b366e612 Merge pull request #2610 from owncloud/vcategories_purge_multi
Allow purging multiple objects from category index table.
2013-04-06 09:48:03 -07:00
Bart Visscher 142b020d38 Remove wrong limit parameter from count query in compatibility function 2013-04-06 17:58:47 +02:00
Bart Visscher fa8214ecc9 Use the MDB2 function to get the count result 2013-04-06 15:38:30 +02:00
Frank Karlitschek e91e8b1170 Merge pull request #2751 from Borkason/patch-1
Fix indentation in util.php.
2013-04-06 03:01:05 -07:00
Lukas Reschke fbffbe0170 Juse send the cookies in the ownCloud directory 2013-04-06 00:16:52 +02:00
Jenkins for ownCloud 6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
Birk Borkason d6253696cb Fix indentation in util.php. 2013-04-05 21:49:57 +03:00
Bart Visscher 3213c47188 Use count SQL to check for user existance 2013-04-05 17:23:36 +02:00
Bart Visscher 50fb13c861 Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common 2013-04-05 17:20:08 +02:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Lukas Reschke f944ac9cba Add a name to the version parameter
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
2013-04-05 00:33:05 +03:00
Thomas Tanghus d048ff719d Remove redundant line 2013-04-04 14:10:34 +02:00
Bart Visscher 52fba43297 Merge pull request #2708 from owncloud/dont_expose_installatio
Don't expose the server installation time
2013-04-04 00:48:55 -07:00
Bart Visscher 2f19629407 Merge pull request #2706 from owncloud/random_is_random_and_not_time
Use a more random source...
2013-04-04 00:48:21 -07:00
Lukas Reschke 877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00
Lukas Reschke 37cb79155e *gnaaarf* 2013-04-04 01:27:13 +03:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Lukas Reschke 6645a54cac Use random bytes instead of time
Thanks for the heads-up @VicDeo :-)
2013-04-04 01:05:44 +03:00
Arthur Schiwon e75406e712 PostreSQL compatibility, fixes #2666 2013-04-03 23:56:59 +02:00
Lukas Reschke ba7c0cf548 Use a more random source... 2013-04-04 00:56:34 +03:00
Jörn Friedrich Dreyer 7eef643600 Merge pull request #2594 from owncloud/fix_part_file_ignoring
Fix part file ignoring
2013-04-03 01:38:18 -07:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud 9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Brice Maron 63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
Brice Maron 2b8cf4959a Log Queries when we add a log query flag 2013-03-30 17:40:46 +01:00
Thomas Tanghus 73dd54c962 Don't try to call a an array :-P 2013-03-30 16:35:13 +01:00
Sam Tuke 3cbfacb439 Merge branch 'master' into files_encryption 2013-03-29 15:59:54 +01:00
Bernhard Posselt 66d7cc4c74 Merge pull request #2584 from mrtorrent/fix_instanceid_format
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
Thomas Tanghus a56abd3f9b Typehint and check $ids parameter. 2013-03-29 14:54:08 +01:00
Bart Visscher ec980a8a25 Merge pull request #2585 from mrtorrent/fix_install_app_version_check
Fix install app version check
2013-03-29 05:38:58 -07:00
Thomas Tanghus d838a3b33f Allow purging multiple objects from category index table. 2013-03-29 05:51:41 +01:00
Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Jörn Friedrich Dreyer aa103bd5b3 supress write hook for .part files 2013-03-28 12:15:27 +01:00
Jörn Friedrich Dreyer 4a70315ad1 ignore files in scanFile instead of scan to catch all occurences. 2013-03-28 12:15:27 +01:00
Arthur Schiwon 78c694b6ee Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy 2013-03-27 19:20:08 +01:00
Arthur Schiwon 3d29a82150 Cache: Do not overwrite ETag when file did not change 2013-03-27 19:19:40 +01:00
Arthur Schiwon 2a2d409733 Only prepare an SQL statement once. 2013-03-27 19:19:16 +01:00
Arthur Schiwon 1d676fb0e6 Add PHPDoc 2013-03-27 19:18:58 +01:00
Arthur Schiwon d9e07ca60a Adjust to Icewind's fix 2013-03-27 19:18:34 +01:00
Robin Appelman 1a874b9106 Cache: fix property path for getting legacy etag 2013-03-27 19:18:13 +01:00
Robin Appelman 19c7d9c3dc Port Icewind's fix I 2013-03-27 19:17:49 +01:00
Arthur Schiwon 5fc276602a Change LIMIT in DB query respectively remove where not necessary 2013-03-27 19:13:14 +01:00
Arthur Schiwon e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01:00
Arthur Schiwon 9d25058905 Performance: prepare queries only once 2013-03-27 19:12:04 +01:00
Arthur Schiwon 7839ec5093 Fix lost ETag on Cache Upgrade 2013-03-27 19:11:35 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 8dd7fa8507 Use isAppVersionCompatible in app installer 2013-03-27 10:16:05 +00:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 93a6ed3dab Ensure instanceid contains a letter
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent 53fd122b89 Minor typo, coding style fixes for OC_Util::getInstanceId 2013-03-26 21:48:49 +00:00
Thomas Tanghus 74852243e2 Merge pull request #2567 from owncloud/fix_insertIfNotExist
Properly prepare insertIfNotExist queries.
2013-03-26 08:59:10 -07:00
Bernhard Posselt d49e8ffb5e Merge pull request #2568 from itheiss/master
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
Björn Schießle d16dd1ad2a listen to touch hook to update the mtime after sync 2013-03-26 09:42:55 +01:00
Thomas Tanghus 5b66b317b1 And removing an irrelevant comment ;) 2013-03-26 01:01:38 +01:00
Thomas Tanghus 5f53145eb0 Double quotes to backticks 2013-03-26 01:00:15 +01:00
Thomas Tanghus 9d618005b6 Missing backticks. Thx @Raydiation :) 2013-03-26 00:24:08 +01:00
Thomas Tanghus 5e81016392 D'oh, why concatenate static strings. 2013-03-26 00:21:57 +01:00
Thomas Tanghus 07236800a7 Quote key for SQLite. 2013-03-26 00:19:23 +01:00
Thomas Tanghus 1c3f5ba6ef Properly prepare insertIfNotExist queries. 2013-03-25 23:59:34 +01:00
Robin Appelman 0e55b61169 Improve phpdoc for the filecache 2013-03-24 02:06:50 +01:00
Bernhard Posselt bbeb657c03 Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
Fixing file mapper ext master
2013-03-23 05:34:25 -07:00
Bernhard Posselt 3d2acb5389 Merge pull request #2446 from owncloud/fixing-safe-mode-check-master
more accurate safe_mode check - refs #2258
2013-03-23 05:33:32 -07:00
Robin Appelman 6326a3a9f7 Some improvements for the Storage phpdoc 2013-03-23 00:10:30 +01:00
itheiss 568c256aff Fix #2499
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.

e.g. 'mail_domain' => 'example.com'
2013-03-22 10:07:06 +01:00
Robin Appelman e5f8acf4c0 Add phpdoc documentation to the Storage interface 2013-03-21 13:11:52 +01:00
Lukas Reschke ad2d222466 Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
Valerio Ponte 033c94d076 fixed xsendfile zip generation race condition 2013-03-20 22:37:02 +01:00
VicDeo 3e9ea6d13b Remove space before parethesis 2013-03-20 16:54:06 +04:00
Thomas Mueller 28d2379c43 initial fix for MSSQL 2013-03-19 19:17:40 +01:00
Thomas Mueller 6f13a35513 documentation added and trying to fix minor code issues 2013-03-19 18:52:54 +01:00
Thomas Mueller 268d4a525d some more test cases & fix on file name generation with index 2013-03-19 16:57:54 +01:00
Thomas Mueller 0fff3c9698 adding extension to slugified physical path 2013-03-19 16:53:37 +01:00
Bernhard Posselt 8ca01451fd Merge pull request #2244 from owncloud/fixing-windows-datadir-master
remove trailing slash from data dir on windows
2013-03-19 07:38:41 -07:00
Bernhard Posselt 8858960a19 Merge pull request #2451 from owncloud/fix_npe_master
fix npe when createStorage() returns null
2013-03-19 07:28:59 -07:00