summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | language fixesRobin Appelman2015-11-231-2/+2
| * | | | | | | | | | | truncate long values on defaultRobin Appelman2015-11-231-1/+17
| * | | | | | | | | | | hide passwords and secrets on defaultRobin Appelman2015-11-231-0/+18
| * | | | | | | | | | | use common --output optionRobin Appelman2015-11-231-7/+11
| * | | | | | | | | | | Add files_external:list command to list configured external storagesRobin Appelman2015-11-232-0/+227
* | | | | | | | | | | | Merge pull request #20693 from owncloud/phpdoc_nodeThomas Müller2015-11-241-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Consistent interface declarationRoeland Jago Douma2015-11-231-8/+0
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #20682 from owncloud/objectid-to-stringThomas Müller2015-11-243-24/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make sure that object id can be a stringJoas Schilling2015-11-233-24/+36
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-24398-2570/+832
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #20622 from owncloud/comments-dbschemeThomas Müller2015-11-231-0/+151
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | DB scheme for Comments table, resolves #20265Arthur Schiwon2015-11-201-0/+151
* | | | | | | | | | | Merge pull request #20684 from owncloud/more-timeThomas Müller2015-11-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | webdav docker tests - wait at least 5 seconds after the full startupMorris Jobke2015-11-231-1/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #20587 from owncloud/sharing-api-integration-tests-roeland...Thomas Müller2015-11-233-19/+262
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added test case about trying to reshare a file with more permissionsSergio Bertolin2015-11-202-9/+28
| * | | | | | | | | | Making webdav path configurableSergio Bertolin2015-11-203-9/+23
| * | | | | | | | | | modified makedavrequest to return responseSergio Bertolin2015-11-201-3/+4
| * | | | | | | | | | added test about resharingSergio Bertolin2015-11-192-10/+31
| * | | | | | | | | | Added test and logic for deleting all group sharesSergio Bertolin2015-11-192-2/+27
| * | | | | | | | | | Added test for shared_with_me parameterSergio Bertolin2015-11-192-1/+22
| * | | | | | | | | | Added some requirements for first test caseSergio Bertolin2015-11-193-8/+150
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #20609 from owncloud/dav-donotauththroughajaxThomas Müller2015-11-232-2/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not authenticate over ajaxVincent Petry2015-11-232-2/+41
* | | | | | | | | | | Merge pull request #20679 from owncloud/fixphpdocThomas Müller2015-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | p() supports string as argumentMorris Jobke2015-11-231-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertIdThomas Müller2015-11-236-62/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Throw an exception in case no table name is passed into lastInsertId of the O...Thomas Müller2015-11-232-2/+4
| * | | | | | | | | | | lastInsertId() is properly working with Oracle if the table name is properly ...Thomas Müller2015-11-234-60/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #20543 from owncloud/share2.0_fix_hooksThomas Müller2015-11-235-260/+503
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | [Sharing 2.0] Move hook and delete children logic to share managerRoeland Jago Douma2015-11-235-260/+503
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #20577 from owncloud/notifications-datetime-timestampThomas Müller2015-11-233-47/+58
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use a DateTime object instead of a timestampJoas Schilling2015-11-233-47/+58
* | | | | | | | | | Merge pull request #20222 from owncloud/federated_sharing_auto_completeThomas Müller2015-11-2328-7/+3086
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | unit testsBjörn Schießle2015-11-207-17/+549
| * | | | | | | | | fixing OCI and othersThomas Müller2015-11-195-20/+9
| * | | | | | | | | make sure that both server don't try to exchange the shared secret in parallelBjörn Schießle2015-11-193-32/+79
| * | | | | | | | | add option to auto add servers to the list of trusted servers once a federate...Björn Schießle2015-11-199-8/+67
| * | | | | | | | | add status to server listBjörn Schießle2015-11-194-5/+19
| * | | | | | | | | change 'cronstatus' to 'status' so that it can be used in other apps tooBjörn Schießle2015-11-192-5/+5
| * | | | | | | | | add federation to shipped.jsonBjörn Schießle2015-11-191-1/+2
| * | | | | | | | | exchange shared secretBjörn Schießle2015-11-1912-119/+1052
| * | | | | | | | | added app "federation", allows you to connect ownClouds and exchange user listsBjörn Schießle2015-11-1919-1/+1505
* | | | | | | | | | Merge pull request #20623 from owncloud/app-list-enhancementsThomas Müller2015-11-231-0/+17
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add cmdline key to show shipped/non-shipped apps onlyVictor Dubiniuk2015-11-231-0/+17
* | | | | | | | | | Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-2358-1620/+4134
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update app version for Webdav impl of files GUIVincent Petry2015-11-221-1/+1
| * | | | | | | | | also match ie11 with Request::USER_AGENT_IERobin Appelman2015-11-221-1/+1
| * | | | | | | | | Now using IE8 workaround of davclient.js for all IE versionsVincent Petry2015-11-222-3/+3
| * | | | | | | | | Patch for davclient.js for FirefoxVincent Petry2015-11-221-5/+5