aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* p() supports string as argumentMorris Jobke2015-11-231-1/+1
* 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
| * | Send download token as cookie to tell the UI that it startedVincent Petry2015-11-221-0/+27
| * | Fix issue when renaming creates a separate entryVincent Petry2015-11-221-8/+5
| * | Properly join path sectionsVincent Petry2015-11-225-11/+5
| * | Fix OC.FileInfo to copy all propertiesVincent Petry2015-11-221-25/+17
| * | Fix undefined HTTP_USER_AGENTThomas Müller2015-11-222-8/+28
| * | Update davclient.jsVincent Petry2015-11-221-1/+1
| * | Use oc:fileid property instead of oc:idVincent Petry2015-11-222-19/+5
| * | Fix port issue - options.host already has the port attachedThomas Müller2015-11-223-22/+6
| * | Fix js file load orderThomas Müller2015-11-221-2/+2
| * | Parse share owner from Webdav to display in UIVincent Petry2015-11-221-1/+21
| * | Query tags/favorite through Webdav in file listVincent Petry2015-11-224-14/+118
| * | Make public link share page work with Webdav and add operationsVincent Petry2015-11-226-117/+35
| * | Make files app use Webdav for most operationsVincent Petry2015-11-2222-1470/+828
| * | Added OC.Files.Client Webdav-based files clientVincent Petry2015-11-227-5/+1533
| * | Add evert's davclient.js + es6-promise + IE8 workaroundVincent Petry2015-11-2213-5/+1591
* | | Merge pull request #20524 from owncloud/pgsql-version-check-errorThomas Müller2015-11-231-6/+3
|\ \ \
| * | | assume pgsql >=9 if checking the version failsRobin Appelman2015-11-161-6/+3
* | | | Merge pull request #20558 from owncloud/remove-path-from-shared-withThomas Müller2015-11-231-0/+1
|\ \ \ \
| * | | | Unset `path` for shared with meLukas Reschke2015-11-171-0/+1
* | | | | Merge pull request #20559 from owncloud/settings_app_to_controllerThomas Müller2015-11-236-71/+226
|\ \ \ \ \
| * | | | | Moved changedisplayname to usercontrollerRoeland Jago Douma2015-11-206-71/+226
* | | | | | Merge pull request #20649 from owncloud/scrutinizer-patch-1Thomas Müller2015-11-2311-20/+30
|\ \ \ \ \ \
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-2011-20/+30
* | | | | | | Merge pull request #20633 from owncloud/symfony_console_2.7.4Thomas Müller2015-11-231-0/+0
|\ \ \ \ \ \ \
| * | | | | | | [3rdparty] Bump for symfony/console-2.7.4Roeland Jago Douma2015-11-231-0/+0
| | |_|_|_|/ / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2316-18/+66
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2224-6/+84
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2120-8/+62
|/ / / / /
* | | | | Merge pull request #20641 from owncloud/files_external_missing_backendThomas Müller2015-11-201-11/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | dont die if the external storage backend doesn't existRobin Appelman2015-11-201-11/+20
* | | | | Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisab...Thomas Müller2015-11-208-44/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adjust PHPDoc as suggestedThomas Müller2015-11-203-3/+3