Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | When updating an appstore app, execute a database update | Bart Visscher | 2013-10-25 | 1 | -1/+5 |
| | | | | See #5202 | ||||
* | Merge pull request #5402 from owncloud/fixing-5367-master | Thomas Müller | 2013-10-24 | 2 | -1/+11 |
|\ | | | | | fixes chunked upload | ||||
| * | fixes #5367 | Thomas Müller | 2013-10-17 | 2 | -1/+11 |
| | | |||||
* | | Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg | Thomas Müller | 2013-10-23 | 1 | -0/+18 |
|\ \ | | | | | | | prefer logo png from theme over svg from core | ||||
| * | | prefer logo png from theme over svg from core | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -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-placeholdershim | Thomas Müller | 2013-10-23 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Ie8 placeholdershim | ||||
| * | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 1 | -0/+1 |
| |/ / | | | | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9 | ||||
* | | | Merge pull request #5464 from owncloud/fixing-5456-master | Thomas Müller | 2013-10-23 | 2 | -3/+18 |
|\ \ \ | | | | | | | | | Fixing 5456 master | ||||
| * | | | creating and deleting of file and folder 'Shared' in root is not allowed | Thomas Müller | 2013-10-22 | 2 | -3/+18 |
| | | | | |||||
* | | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts | Thomas Müller | 2013-10-23 | 2 | -14/+38 |
|\ \ \ \ | |_|/ / |/| | | | Ignore duplicate inserts in file cache and mime type | ||||
| * | | | Catch duplicate insertion errors while scanning files | Vincent Petry | 2013-10-23 | 2 | -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-logexceptionstacktrace | Thomas Müller | 2013-10-23 | 1 | -0/+33 |
|\ \ \ \ | | | | | | | | | | | Expand exception stack trace in log in debug mode | ||||
| * | | | | Added $app parameter to logException | Vincent Petry | 2013-10-23 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Moved logException to OCP\Util class | Vincent Petry | 2013-10-23 | 1 | -0/+33 |
| | | | | | |||||
* | | | | | Merge pull request #5458 from owncloud/fixing-5222-master | VicDeo | 2013-10-23 | 4 | -4/+105 |
|\ \ \ \ \ | |_|/ / / |/| | | | | php 5.3 compatibility regarding OC\DB\Connection fixed | ||||
| * | | | | add missing file header | Thomas Müller | 2013-10-23 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | fixing php 5.3.3 error: | Thomas Müller | 2013-10-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Undefined variable: this lib/private/appframework/dependencyinjection/dicontainer.php:92 | ||||
| * | | | | php 5.3 compatibility regarding OC\DB\Connection fixed | Thomas Müller | 2013-10-21 | 3 | -2/+96 |
| | | | | | |||||
* | | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enable | Björn Schießle | 2013-10-23 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Encryption set init status on enable | ||||
| * | | | | | add post_enable hook if a app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #5482 from owncloud/fix_weird_http_namespace | Thomas Müller | 2013-10-23 | 8 | -6/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix namespace for OCP\Appframework\Http | ||||
| * | | | | | Fix namespace for OCP\Appframework\Http | Thomas Tanghus | 2013-10-23 | 8 | -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-master | Thomas Müller | 2013-10-22 | 1 | -3/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDi... | ||||
| * | | | | | Use quoteIdentifier with proper objects | Victor Dubiniuk | 2013-10-21 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDiff ↵ | Thomas Müller | 2013-10-17 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist and my design the name cannot be changed adding PHPDoc | ||||
* | | | | | | Merge pull request #5451 from owncloud/reuse-session-ocs-master | Thomas Müller | 2013-10-22 | 1 | -3/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Support existing sessions within OCS API calls | ||||
| * | | | | | | Support existing sessions within OCS API calls | Thomas Müller | 2013-10-21 | 1 | -3/+19 |
| | | | | | | | |||||
* | | | | | | | - delete properties on node delete | Thomas Müller | 2013-10-22 | 3 | -0/+19 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | - move properties on node move | ||||
* | | | | | | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 6 | -11/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | introduce link_to_docs() and migrate links | ||||
| * | | | | | | use OC_Helper::linkToDocs() in lib/private/config.php | Thomas Müller | 2013-10-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | introduce OC_Helper::linkToDocs() | Thomas Müller | 2013-10-21 | 3 | -6/+18 |
| | | | | | | | |||||
| * | | | | | | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 5 | -11/+16 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5437 from owncloud/create-custom-logfile | Thomas Müller | 2013-10-22 | 1 | -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 Fischer | 2013-10-20 | 1 | -1/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #5249 from owncloud/activities-api | Thomas Müller | 2013-10-21 | 6 | -0/+184 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [OC6] Activities api | ||||
| * \ \ \ \ \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 18 | -313/+139 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/server.php | ||||
| * | | | | | | | remove test code | Thomas Müller | 2013-10-16 | 1 | -4/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 26 | -362/+253 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | adding OC6 public API for activities | Thomas Müller | 2013-10-09 | 3 | -5/+44 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-09 | 292 | -493/+1411 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | initial implementation of activity manager | Thomas Müller | 2013-09-29 | 4 | -0/+73 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'appframework-master' into activities-api | Thomas Müller | 2013-09-29 | 58 | -1355/+2057 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/iservercontainer.php | ||||
| * | | | | | | | | | | adding basic interfaces for the activities api | Thomas Müller | 2013-09-20 | 3 | -0/+77 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | New OCS route: | Thomas Müller | 2013-10-21 | 1 | -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 Schiwon | 2013-10-20 | 1 | -1/+1 |
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #5209 | ||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 3 | -4/+25 |
| | | | | | | | | | |||||
* | | | | | | | | | the logfile shoudn't be world readable. | Frank Karlitschek | 2013-10-18 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3219 from owncloud/disabled-links-ui | Frank Karlitschek | 2013-10-18 | 2 | -0/+22 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Disabled links UI fixes | ||||
| * | | | | | | | | | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 2 | -0/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Don't return links for shared files if disabled | Michael Gapczynski | 2013-10-18 | 1 | -0/+4 |
| | | | | | | | | | |