summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* When updating an appstore app, execute a database updateBart Visscher2013-10-251-1/+5
| | | | See #5202
* Merge pull request #5402 from owncloud/fixing-5367-masterThomas Müller2013-10-242-1/+11
|\ | | | | fixes chunked upload
| * fixes #5367Thomas Müller2013-10-172-1/+11
| |
* | Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svgThomas Müller2013-10-231-0/+18
|\ \ | | | | | | prefer logo png from theme over svg from core
| * | prefer logo png from theme over svg from coreJörn Friedrich Dreyer2013-10-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions. fixes #5074 partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem @karlitschek @jancborchardt please review
* | | Merge pull request #5497 from owncloud/ie8-placeholdershimThomas Müller2013-10-231-0/+1
|\ \ \ | | | | | | | | Ie8 placeholdershim
| * | | Fixed sharing dropdown placeholders in IE8/9Vincent Petry2013-10-231-0/+1
| |/ / | | | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9
* | | Merge pull request #5464 from owncloud/fixing-5456-masterThomas Müller2013-10-232-3/+18
|\ \ \ | | | | | | | | Fixing 5456 master
| * | | creating and deleting of file and folder 'Shared' in root is not allowedThomas Müller2013-10-222-3/+18
| | | |
* | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinsertsThomas Müller2013-10-232-14/+38
|\ \ \ \ | |_|/ / |/| | | Ignore duplicate inserts in file cache and mime type
| * | | Catch duplicate insertion errors while scanning filesVincent Petry2013-10-232-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two scanning processed run at the same time, for example when scan.php and list.php were called at the same time on an external storage mountpoint, duplicate insertion errors can occurs. These errors are now logged and ignored. Since both scans are running in parallel transactions, they don't see each other's changes directly in the DB which can cause duplicate insertion errors for mime types as well, but those mime types can't be selected yet. The solution to this is to force-reload the mimetypes list after the transaction is finished. Fixes #5199
* | | | Merge pull request #5478 from owncloud/core-logexceptionstacktraceThomas Müller2013-10-231-0/+33
|\ \ \ \ | | | | | | | | | | Expand exception stack trace in log in debug mode
| * | | | Added $app parameter to logExceptionVincent Petry2013-10-231-4/+4
| | | | |
| * | | | Moved logException to OCP\Util classVincent Petry2013-10-231-0/+33
| | | | |
* | | | | Merge pull request #5458 from owncloud/fixing-5222-masterVicDeo2013-10-234-4/+105
|\ \ \ \ \ | |_|/ / / |/| | | | php 5.3 compatibility regarding OC\DB\Connection fixed
| * | | | add missing file headerThomas Müller2013-10-231-0/+6
| | | | |
| * | | | fixing php 5.3.3 error:Thomas Müller2013-10-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Undefined variable: this lib/private/appframework/dependencyinjection/dicontainer.php:92
| * | | | php 5.3 compatibility regarding OC\DB\Connection fixedThomas Müller2013-10-213-2/+96
| | | | |
* | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enableBjörn Schießle2013-10-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Encryption set init status on enable
| * | | | | add post_enable hook if a app gets enabledBjoern Schiessle2013-10-221-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #5482 from owncloud/fix_weird_http_namespaceThomas Müller2013-10-238-6/+11
|\ \ \ \ \ | | | | | | | | | | | | Fix namespace for OCP\Appframework\Http
| * | | | | Fix namespace for OCP\Appframework\HttpThomas Tanghus2013-10-238-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid having to use OCP\Appframework\Http\Http in the public - and stable - API OCP\Appframework\Http is now both a class and a namespace.
* | | | | | Merge pull request #5391 from owncloud/undefined-property-in-schema-masterThomas Müller2013-10-221-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
| * | | | | Use quoteIdentifier with proper objectsVictor Dubiniuk2013-10-211-0/+5
| | | | | |
| * | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDiff ↵Thomas Müller2013-10-171-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist and my design the name cannot be changed adding PHPDoc
* | | | | | Merge pull request #5451 from owncloud/reuse-session-ocs-masterThomas Müller2013-10-221-3/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support existing sessions within OCS API calls
| * | | | | | Support existing sessions within OCS API callsThomas Müller2013-10-211-3/+19
| | | | | | |
* | | | | | | - delete properties on node deleteThomas Müller2013-10-223-0/+19
| |_|/ / / / |/| | | | | | | | | | | | | | | | | - move properties on node move
* | | | | | Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-226-11/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | introduce link_to_docs() and migrate links
| * | | | | | use OC_Helper::linkToDocs() in lib/private/config.phpThomas Müller2013-10-211-1/+1
| | | | | | |
| * | | | | | introduce OC_Helper::linkToDocs()Thomas Müller2013-10-213-6/+18
| | | | | | |
| * | | | | | introduce link_to_docs() and migrate linksThomas Müller2013-10-215-11/+16
| |/ / / / /
* | | | | | Merge pull request #5437 from owncloud/create-custom-logfileThomas Müller2013-10-221-1/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Try to create custom log file before falling back to default.
| * | | | | Try to create custom log file before falling back to default.Andreas Fischer2013-10-201-1/+11
| | | | | |
* | | | | | Merge pull request #5249 from owncloud/activities-apiThomas Müller2013-10-216-0/+184
|\ \ \ \ \ \ | | | | | | | | | | | | | | [OC6] Activities api
| * \ \ \ \ \ Merge branch 'master' into activities-apiThomas Müller2013-10-1618-313/+139
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/server.php
| * | | | | | | remove test codeThomas Müller2013-10-161-4/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-1626-362/+253
| |\ \ \ \ \ \ \
| * | | | | | | | adding OC6 public API for activitiesThomas Müller2013-10-093-5/+44
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-09292-493/+1411
| |\ \ \ \ \ \ \ \
| * | | | | | | | | initial implementation of activity managerThomas Müller2013-09-294-0/+73
| | | | | | | | | |
| * | | | | | | | | Merge branch 'appframework-master' into activities-apiThomas Müller2013-09-2958-1355/+2057
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/iservercontainer.php
| * | | | | | | | | | adding basic interfaces for the activities apiThomas Müller2013-09-203-0/+77
| | | | | | | | | | |
* | | | | | | | | | | New OCS route:Thomas Müller2013-10-211-2/+11
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /ocs/cloud/user Response: <?xml version="1.0"?> <ocs> <meta> <status>ok</status> <statuscode>100</statuscode> <message/> </meta> <data> <id>thomas</id> <display-name>DeepDiver</display-name> <email>no-response@domain.tld</email> </data> </ocs>
* | | | | | | | | | dispayNamesInGroup(s) should always return uid as key in the result attr, ↵Arthur Schiwon2013-10-201-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | fixes #5209
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-193-4/+25
| | | | | | | | |
* | | | | | | | | the logfile shoudn't be world readable.Frank Karlitschek2013-10-181-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-182-0/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Disabled links UI fixes
| * | | | | | | | | Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-182-0/+18
| | | | | | | | | |
| * | | | | | | | | Don't return links for shared files if disabledMichael Gapczynski2013-10-181-0/+4
| | | | | | | | | |