Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix-sharing-code | Thomas Müller | 2013-10-23 | 64 | -80/+578 |
|\ | |||||
| * | 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 |
| * | | | | | | | | | | New OCS route: | Thomas Müller | 2013-10-21 | 1 | -2/+11 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | dispayNamesInGroup(s) should always return uid as key in the result attr, fix... | Arthur Schiwon | 2013-10-20 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | [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 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| * | | | | | | | | | Use display name from magic cookie, fixes #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #5395 from owncloud/more_check_options | Vincent Petry | 2013-10-18 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add options to disable the check for a working .htaccess file in data and for... | Frank Karlitschek | 2013-10-17 | 1 | -0/+7 |
| * | | | | | | | | | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout | Vincent Petry | 2013-10-18 | 2 | -1/+49 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixed spaces | Vincent Petry | 2013-10-17 | 1 | -3/+3 |
| | * | | | | | | | | | Added timeout value to WebDAV post setup check | Vincent Petry | 2013-10-16 | 1 | -1/+3 |
| | * | | | | | | | | | Added DAV client wrapper that support timeout values | Vincent Petry | 2013-10-16 | 1 | -0/+46 |
| * | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 22 | -26/+4 |
| | |/ / / / / / / / | |/| | | | | | | | |