Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5528 from frisco82/changeUpadateNotification | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
|\ | |||||
| * | Changed update message to be more instructive, changed update style to be les... | Ramiro Aparicio | 2013-10-24 | 1 | -2/+4 |
* | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindex | Thomas Müller | 2013-10-24 | 1 | -1/+5 |
|\ \ | |||||
| * | | Remove WebDAV redirect from the root path | Vincent Petry | 2013-10-24 | 1 | -1/+5 |
* | | | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 2 | -1/+95 |
|\ \ \ | |_|/ |/| | | |||||
| * | | - fixing namespace | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
| * | | handle case where fileid is not set | Thomas Müller | 2013-10-23 | 2 | -4/+12 |
| * | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 2 | -1/+85 |
| |/ | |||||
* | | Merge pull request #5402 from owncloud/fixing-5367-master | Thomas Müller | 2013-10-24 | 2 | -1/+11 |
|\ \ | |||||
| * | | 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 | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -0/+18 |
* | | | | Merge pull request #5497 from owncloud/ie8-placeholdershim | Thomas Müller | 2013-10-23 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #5464 from owncloud/fixing-5456-master | Thomas Müller | 2013-10-23 | 2 | -3/+18 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Catch duplicate insertion errors while scanning files | Vincent Petry | 2013-10-23 | 2 | -14/+38 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5478 from owncloud/core-logexceptionstacktrace | Thomas Müller | 2013-10-23 | 1 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | 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 |
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Thomas Tanghus | 2013-10-23 | 8 | -6/+11 |
* | | | | | | Merge pull request #5391 from owncloud/undefined-property-in-schema-master | Thomas Müller | 2013-10-22 | 1 | -3/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use quoteIdentifier with proper objects | Victor Dubiniuk | 2013-10-21 | 1 | -0/+5 |
| * | | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDiff do... | Thomas Müller | 2013-10-17 | 1 | -6/+2 |
* | | | | | | 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 | Thomas Müller | 2013-10-21 | 1 | -3/+19 |
* | | | | | | | - delete properties on node delete | Thomas Müller | 2013-10-22 | 3 | -0/+19 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 6 | -11/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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. | 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 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 18 | -313/+139 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | adding basic interfaces for the activities api | Thomas Müller | 2013-09-20 | 3 | -0/+77 |