summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-1848-456/+732
* update appstore api urlFrank Karlitschek2014-07-172-2/+2
* Merge pull request #9691 from owncloud/kill-too-long-index-masterThomas Müller2014-07-171-12/+0
|\
| * Revert "add share index"Thomas Müller2014-07-171-12/+0
|/
* Merge pull request #9710 from owncloud/fix-failing-unit-test-on-MapperTestUti...Thomas Müller2014-07-171-4/+5
|\
| * kill unused require of MapperTestUtility.phpThomas Müller2014-07-171-4/+5
* | Merge pull request #9705 from owncloud/ie8-userspagefixblizzz2014-07-175-6/+11
|\ \ | |/ |/|
| * Fixed JS and CSS issues in users pageVincent Petry2014-07-175-6/+11
* | Merge pull request #9668 from owncloud/enc_fix_folder_moveVincent Petry2014-07-173-26/+83
|\ \
| * | check that the file proxies are enabled after each testBjoern Schiessle2014-07-171-0/+2
| * | update keys recursively if a folder was movedBjoern Schiessle2014-07-172-26/+81
* | | Merge pull request #9696 from owncloud/fix-appframework-test-namespaces-masterThomas Müller2014-07-171-1/+1
|\ \ \ | |/ / |/| |
| * | fixing namespace of MapperTestUtilityThomas Müller2014-07-171-1/+1
|/ /
* | Merge pull request #9694 from owncloud/fix-failing-testsThomas Müller2014-07-171-1/+1
|\ \
| * | fix syntaxMorris Jobke2014-07-171-1/+1
|/ /
* | Merge pull request #9682 from owncloud/mappedlocal-renameVincent Petry2014-07-171-2/+17
|\ \
| * | Fix renaming files in the root folder of a MappedLocal storageRobin Appelman2014-07-161-2/+17
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-17222-2821/+2675
* | Merge pull request #9517 from brantje/Add-webapp-meta-tagsMorris Jobke2014-07-161-0/+4
|\ \
| * | Changed to 1 lineSander2014-07-081-3/+1
| * | Added suggestions from @jancborchardt in #9517Sander2014-07-081-3/+3
| * | Update layout.user.phpSander2014-07-081-1/+1
| * | Add webapp supportSander2014-07-081-0/+6
* | | Merge pull request #9654 from owncloud/enctest-fileproxydisabledfixBjörn Schießle2014-07-161-0/+2
|\ \ \
| * | | Reenable proxies if a test failed to restore itVincent Petry2014-07-151-0/+2
* | | | Merge pull request #9653 from owncloud/fix-9590Vincent Petry2014-07-163-14/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix CSS coding styleMorris Jobke2014-07-161-5/+6
| * | | Fix #9590. Fix #9612.Stephane V2014-07-153-14/+26
* | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstreamicewind19912014-07-162-4/+22
|\ \ \ \
| * | | | files: storage: rename should check parent directories of old and new filesTigran Mkrtchyan2014-07-102-4/+22
* | | | | Merge pull request #9662 from owncloud/enc_error_handling_masterBjörn Schießle2014-07-165-25/+74
|\ \ \ \ \
| * | | | | introduce some encryption exceptions and catch additional error casesBjoern Schiessle2014-07-164-25/+73
| * | | | | make sure that the crypt library is loadedBjoern Schiessle2014-07-161-0/+1
* | | | | | Merge pull request #9647 from owncloud/files_external_multiuser_testsRobin McCorkell2014-07-161-0/+37
|\ \ \ \ \ \
| * | | | | | Add unit test for multi-user configuration loadingRobin McCorkell2014-07-151-0/+37
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #9664 from owncloud/enc-removelegacytestsMorris Jobke2014-07-161-84/+0
|\ \ \ \ \ \
| * | | | | | Removed legacy encryption testsVincent Petry2014-07-161-84/+0
* | | | | | | Merge pull request #9661 from owncloud/share-ownerdisplaynamefixMorris Jobke2014-07-162-1/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Correctly return the owner display name for children of sharesVincent Petry2014-07-162-1/+20
| | |/ / / / | |/| | | |
* / | | | | Port of #9584Stephan Peijnik2014-07-162-2/+23
|/ / / / /
* | | | | Merge pull request #9640 from owncloud/fix_9627Björn Schießle2014-07-161-1/+1
|\ \ \ \ \
| * | | | | make sure that 'OC_Theme' exists before checking if the method existsBjoern Schiessle2014-07-151-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-16473-3097/+2186
* | | | | | Merge pull request #9644 from owncloud/fix_user_apiThomas Müller2014-07-152-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use UserSession service to resolve user idJörn Friedrich Dreyer2014-07-151-1/+1
| * | | | | use correct IUser in interfaceJörn Friedrich Dreyer2014-07-151-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_resultsblizzz2014-07-151-33/+22
|\ \ \ \ \
| * | | | | mkae getRelativePath of file search results overwriteable in subclassesJörn Friedrich Dreyer2014-07-141-2/+1
| * | | | | return relative pathJörn Friedrich Dreyer2014-07-141-27/+15
| * | | | | use fileinfo object in search resultsJörn Friedrich Dreyer2014-07-091-9/+11