Commit Graph

21276 Commits

Author SHA1 Message Date
Lukas Reschke c0ddf06dfe Merge pull request #11666 from owncloud/setup-hidesqlitemessageforautoconfig
Hide SQLite information on setup when autoconfig is used
2014-10-20 19:50:20 +02:00
Lukas Reschke 32aa1b1b65 Merge pull request #11593 from owncloud/useRelativePathToOwnCloudInstallation
Refer to relative path instead of absolute path
2014-10-20 19:05:17 +02:00
Vincent Petry 51976b2729 Add proper setup and teardown
Properly restore REQUEST_URI and SCRIPT_NAME after test runs
2014-10-20 17:11:08 +02:00
Vincent Petry f52ed231b3 Hide SQLite information on setup when autoconfig is used 2014-10-20 16:20:24 +02:00
Lukas Reschke 4ce3c25c5c Add "$_SERVER['REQUEST_URI']" to fix the unit tests
Let's hope that works
2014-10-20 15:09:44 +02:00
Lukas Reschke 8f8abdbaee Add unit tests for convertToRelativePath 2014-10-20 15:09:43 +02:00
Lukas Reschke 7b94c7f9c1 Refer to relative path instead of absolute path
There is no need to refer to the absolute path here if we can use the relative one.

Conflicts:
	lib/private/templatelayout.php
2014-10-20 15:09:43 +02:00
Thomas Müller a359fe7e6a adding unit tests for en_GB and en-GB - just to verify 2014-10-20 15:04:42 +02:00
Thomas Müller c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Thomas Müller d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Thomas Müller 6af0e76a03 remove legacy class OC_Updater 2014-10-20 14:44:42 +02:00
Thomas Müller 8da6e4b9f0 Merge pull request #11644 from owncloud/tune-share-autocomplete
adjust autocomplete behavior for sharing menu
2014-10-20 14:35:43 +02:00
Robin Appelman 9fd234f63f Log some additional events 2014-10-20 13:38:38 +02:00
Robin Appelman beb1c6ad74 Allow adding events that hapend before the event logger was loaded 2014-10-20 13:38:38 +02:00
Robin Appelman 4a8358bc50 Rename to NullQueryLogger 2014-10-20 13:38:38 +02:00
Robin Appelman 1e69f5e7ac Log some basic events 2014-10-20 13:38:38 +02:00
Robin Appelman 6e08014781 Rename namespace to Diagnostics 2014-10-20 13:38:38 +02:00
Robin Appelman 2790bda4f8 Activate the query logger on connect 2014-10-20 13:38:37 +02:00
Robin Appelman b71d1d3616 Add QueryLogger interface to allow apps to get a list of used queries 2014-10-20 13:38:37 +02:00
Robin Appelman d38050cf52 Add an EventLogger interface to allow apps to get a log of the request timeline 2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer cb3a4d22b1 make tests compatible with hook based skeleton generation 2014-10-20 11:29:20 +02:00
Jörn Friedrich Dreyer ca0e3fdfea throw exception in writeBack, the returned boolean is checked nowhere 2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer 9b0f0df7f5 make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud 87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
jknockaert 1b7e9d66b3 ok; still some bugs that had to be fixed 2014-10-20 00:28:41 +02:00
jknockaert 3be57d0169 small fix 2014-10-19 22:54:34 +02:00
jknockaert e318858152 rework getFileSize 2014-10-19 22:27:15 +02:00
Jenkins for ownCloud 245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud 68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
blizzz 2b6281fc9d Merge pull request #11494 from owncloud/fix-ldap-ingroup-for-9225-2
fix retrieval of group members and cache group members
2014-10-17 23:57:00 +02:00
Arthur Schiwon 7ff7a49f3d adjust group manager tests 2014-10-17 20:53:09 +02:00
Arthur Schiwon e16122f2a1 add one simple cache test 2014-10-17 20:16:04 +02:00
Arthur Schiwon 4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon a7a532f58a with several backends, more than limit can be returned 2014-10-17 20:16:04 +02:00
Arthur Schiwon 5170dc3ae6 fix retrievel of group members and cache group members
fix changed variable name
2014-10-17 20:14:52 +02:00
Craig Morrissey 446cebf492 adjust autocomplete behavior for sharing menu 2014-10-17 11:55:32 -04:00
Morris Jobke 9aa809debf update 3rdparty to match master - just adds the merge commit 2014-10-17 15:07:14 +02:00
Morris Jobke 7bf401e48a Merge pull request #11430 from owncloud/minify-js-css-master
adding cssmin and jssmin(minify)
2014-10-17 15:05:59 +02:00
Lukas Reschke 439b33ec38 Merge pull request #11634 from owncloud/loadapps-encapsulaterequire
Encapsulate require_once to avoid name space bleedind
2014-10-17 14:32:10 +02:00
Björn Schießle 2e875bc6b6 Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
2014-10-17 14:18:59 +02:00
Vincent Petry 27c22f071d Encapsulate require_once to avoid name space bleedind
The script required by require_once might use variable names like $app
which will conflict with the code that follows.

This fix encapsulates require_once into its own function to avoid such
issues.
2014-10-17 12:45:45 +02:00
Thomas Müller 93b0f1a3bf adding cssmin and jssmin(minify)
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content

adding repair step to clean the asset cache after upgrade + coding style adjustments
2014-10-17 12:22:26 +02:00
blizzz 688a141586 Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
drastic ldap speedup (update)
2014-10-17 12:07:27 +02:00
Morris Jobke f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master
Fix SVG icons
2014-10-17 12:01:27 +02:00
Thomas Müller d37eee09a5 fixing usage of EncryptionException 2014-10-17 11:46:22 +02:00
Morris Jobke 276db93dac Merge pull request #11629 from owncloud/add-notice-to-php-doc
Add PHPDoc about sanitization of "insertIfNotExist"
2014-10-17 11:35:16 +02:00
Morris Jobke eceb1d03cb Merge pull request #11594 from owncloud/sharing_toggle_password
set password field placeholder back if passward was disabled
2014-10-17 11:32:29 +02:00
Lukas Reschke af335a39f1 Add PHPDoc about sanitization of "insertIfNotExist"
Let's document this potential pitfall properly.
2014-10-17 11:06:49 +02:00
Lukas Reschke 479424a459 Add some basic sanitization
Better to be safe than sorry ;)
2014-10-17 10:39:35 +02:00
Thomas Müller 04323fbc19 implement sidebar fro personal settings - bad kung-fu 2014-10-17 10:38:13 +02:00