summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19890 from owncloud/db-keep-shared-locksThomas Müller2015-10-222-18/+107
|\ | | | | Keep shared locks until the end of the request so we can reuse them
| * add phpdocRobin Appelman2015-10-212-0/+13
| |
| * Keep shared locks until the end of the request so we can reuse themRobin Appelman2015-10-212-18/+94
| |
* | Merge pull request #19937 from owncloud/detailsview-donotopenonrenameThomas Müller2015-10-221-3/+6
|\ \ | | | | | | Do not display details bar after rename
| * | Do not display details bar after renameVincent Petry2015-10-211-3/+6
| | |
* | | Merge pull request #19935 from ↵Thomas Müller2015-10-221-18/+1
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-19916-settings-menu-hide-on-file-action Use the normal OC.menu JS for handling the Settings menu
| * | | Use the normal OC.menu JS for handling the Settings menuJoas Schilling2015-10-211-18/+1
| | | |
* | | | Merge pull request #19931 from owncloud/fix-webui-upload-and-conflictsThomas Müller2015-10-222-11/+129
|\ \ \ \ | | | | | | | | | | Fix file upload, conflict dialog, also in public link
| * | | | Fix file upload, conflict dialog, also in public linkVincent Petry2015-10-212-11/+129
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public link page. - Fix public link upload by properly adding the form data using a new utility function "addFormData". That one is needed because IE8 upload and regular upload use a different format...
* | | | Merge pull request #19791 from ↵Thomas Müller2015-10-223-106/+361
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/provisioning_api_adding_integration_tests Added more tests and fixed a problem with asort which was returning f…
| * | | | using canonize in assertEquals for arraysSergio Bertolin2015-10-211-15/+5
| | | | |
| * | | | Added more tests and fixed a problem with asort which was returning false ↵Sergio Bertolin2015-10-203-106/+371
| | | | | | | | | | | | | | | | | | | | positives
* | | | | Merge pull request #19952 from owncloud/share-dialogue-testsThomas Müller2015-10-221-0/+78
|\ \ \ \ \ | | | | | | | | | | | | Add JS tests for share dialog
| * | | | | Fix line lengths in share dialog unit testsTom Needham2015-10-211-2/+8
| | | | | |
| * | | | | Add JS tests for share autocompletion handlingTom Needham2015-10-211-0/+56
| | | | | |
| * | | | | Add test for remote share info tooltopTom Needham2015-10-211-0/+16
| | | | | |
* | | | | | Merge pull request #19960 from owncloud/bump_pimple_3.0.2Thomas Müller2015-10-221-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | 3rdparty bump for pimple-3.0.2
| * | | | | | 3rdparty bump for pimple-3.0.2Roeland Jago Douma2015-10-221-0/+0
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2288-80/+74
|/ / / / / /
* | | | | | Merge pull request #19930 from owncloud/sort_usernamesThomas Müller2015-10-211-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | [provisioning api] fix failing testcase
| * | | | | | [provisioning api] losen testRoeland Jago Douma2015-10-211-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we have no control of how backends sort their list of users and we also don't want to sort yet another time the test now just checks if the correct number of elements is returned and if they are from the list of group members.
* | | | | | | Merge pull request #19920 from owncloud/pear-core-minimal-1.0.1Thomas Müller2015-10-211-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 3rdparty bump of pear-core-minimal
| * | | | | | | 3rdparty bump of pear-core-minimalRoeland Jago Douma2015-10-211-0/+0
| | | | | | | |
* | | | | | | | Merge pull request #19954 from owncloud/remote-unrequired-dependenciesThomas Müller2015-10-2116-128/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use IRequest's `getScriptName` functionality instead of $_SERVER
| * | | | | | | | Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME']Lukas Reschke2015-10-211-1/+13
| | | | | | | | |
| * | | | | | | | Remove dependency on ICrypto + use XORLukas Reschke2015-10-2115-127/+22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19953 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-92/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Delete indie.json
| * | | | | | | Delete indie.jsonThomas Müller2015-10-211-92/+0
|/ / / / / / /
* | | | | | | Merge pull request #19918 from owncloud/send-begin-messageThomas Müller2015-10-213-0/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update: state which step we are going to start and warn if it might b…
| * | | | | | | Update: state which step we are going to start and warn if it might be slowJoas Schilling2015-10-213-0/+30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #19934 from owncloud/doclinks-9.0Thomas Müller2015-10-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update doc links in README for 9.0
| * | | | | | | Update doc links in README for 9.0Vincent Petry2015-10-211-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgradeThomas Müller2015-10-213-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Install new shipped apps on upgrade
| * | | | | | | increase core version and add dav version numberMorris Jobke2015-10-212-1/+2
| | | | | | | |
| * | | | | | | Install new shipped apps on upgrade -fixes #19925Thomas Müller2015-10-211-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #19827 from owncloud/subadmin_non_staticThomas Müller2015-10-216-111/+705
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make OC_SubAdmin non static
| * | | | | | | Fix unit testRoeland Jago Douma2015-10-212-16/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that OC_SubAdmin is just a wrapper around OC\SubAdmin some unit tests had to be fixed because they expected different behaviour. Eventually they should move to properly mocked instances of OC\SubAdmin of course
| * | | | | | | Legacy OC_SubAdmin is now just a wrapperRoeland Jago Douma2015-10-211-79/+57
| | | | | | | |
| * | | | | | | New \OC\SubAdmin classRoeland Jago Douma2015-10-214-95/+633
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DI * Tests * moved OC_SubAdmin to legacy * Added to private OC\GroupManager
* | | | | | | Merge pull request #19936 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove the core version from shipped.json
| * | | | | | | Remove the core version from shipped.jsonThomas Müller2015-10-211-1/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #19923 from ↵Thomas Müller2015-10-212-2/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/apps-donotdisplaybrokenappiconininternetexplorer Disable app icon preview in apps page for IE
| * | | | | | Disable app icon preview in apps page for IEVincent Petry2015-10-212-2/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All IE versions are not able to properly upscale SVG icons unless the said SVG files contain a "viewBox" attribute, which is not always the case. Also we cannot guarantee that all third party apps will have this attribute in their icons. So for now, app icons will not be displayed in IE instead of broken ones.
* | | | | | Merge pull request #19924 from ↵Thomas Müller2015-10-211-6/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | owncloud/issue-19891-update-lists-disabled-apps-twice Update - Only add one section for disabled apps
| * | | | | Update - Only add one section for disabled appsJoas Schilling2015-10-211-6/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #19883 from owncloud/provide-iappcontainerThomas Müller2015-10-211-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Provide IAppContainer as dependency injection
| * | | | | Provide IAppContainer as dependency injectionMorris Jobke2015-10-201-0/+4
| | | | | |
* | | | | | Merge pull request #18184 from owncloud/ocs-merge-headersThomas Müller2015-10-213-37/+47
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merge headers of ocs results
| * | | | | fix PHPDocThomas Müller2015-09-211-0/+1
| | | | | |
| * | | | | Merge headers of ocs resultsThomas Müller2015-09-213-37/+46
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 18:46:46 +0000