summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-fil...Thomas Müller2015-10-221-18/+1
|\ \ \ \ \ \
| * | | | | | 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 linkVincent Petry2015-10-212-11/+129
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19791 from owncloud/provisioning_api_adding_integration_t...Thomas Müller2015-10-223-106/+361
|\ \ \ \ \ \
| * | | | | | using canonize in assertEquals for arraysSergio Bertolin2015-10-211-15/+5
| * | | | | | Added more tests and fixed a problem with asort which was returning false pos...Sergio Bertolin2015-10-203-106/+371
* | | | | | | Merge pull request #19952 from owncloud/share-dialogue-testsThomas Müller2015-10-221-0/+78
|\ \ \ \ \ \ \
| * | | | | | | 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.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] losen testRoeland Jago Douma2015-10-211-1/+14
* | | | | | | | Merge pull request #19920 from owncloud/pear-core-minimal-1.0.1Thomas Müller2015-10-211-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | 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['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.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 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.0Vincent Petry2015-10-211-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgradeThomas Müller2015-10-213-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix unit testRoeland Jago Douma2015-10-212-16/+94
| * | | | | | | | Legacy OC_SubAdmin is now just a wrapperRoeland Jago Douma2015-10-211-79/+57
| * | | | | | | | New \OC\SubAdmin classRoeland Jago Douma2015-10-214-95/+633
| |/ / / / / / /
* | | | | | | | Merge pull request #19936 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the core version from shipped.jsonThomas Müller2015-10-211-1/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininter...Thomas Müller2015-10-212-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Disable app icon preview in apps page for IEVincent Petry2015-10-212-2/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #19924 from owncloud/issue-19891-update-lists-disabled-app...Thomas Müller2015-10-211-6/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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 injectionMorris Jobke2015-10-201-0/+4
* | | | | | | Merge pull request #18184 from owncloud/ocs-merge-headersThomas Müller2015-10-213-37/+47
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix PHPDocThomas Müller2015-09-211-0/+1
| * | | | | | Merge headers of ocs resultsThomas Müller2015-09-213-37/+46
* | | | | | | Merge pull request #19909 from owncloud/fix-memcached-warningThomas Müller2015-10-211-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix memcached/memcache module checkRobin McCorkell2015-10-201-2/+2
* | | | | | | Merge pull request #19892 from owncloud/bump_password_compat_1.0.4Thomas Müller2015-10-211-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Bump 3rdparty for password_compatRoeland Jago Douma2015-10-201-0/+0
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-21140-232/+172
| |_|_|_|/ |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 20:06:50 +0000