summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | [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
* | | | | | | | | Merge pull request #9628 from edozzo/masterblizzz2014-07-151-2/+12
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Strinct comparsion fixDeLtAfOx2014-07-151-2/+2
| * | | | | | | | Userlist: async load doesnt fill checked group/subadmin arrayDeLtAfOx2014-07-151-2/+12
* | | | | | | | | Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-thisicewind19912014-07-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update info.xmlLukas Reschke2014-07-151-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8987 from owncloud/lastindexid-debugVincent Petry2014-07-153-8/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - Added test to trigger index id errorVincent Petry2014-07-143-8/+51
* | | | | | | | | | Merge pull request #9561 from libasys/patch-3icewind19912014-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update share.phplibasys2014-07-101-1/+1
| * | | | | | | | | | Update share.phplibasys2014-07-101-1/+1
* | | | | | | | | | | Merge pull request #9621 from owncloud/fix_logger_implementationThomas Müller2014-07-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix logger implementation and testJörn Friedrich Dreyer2014-07-152-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | throw exception if file is to large for trash binBjoern Schiessle2014-07-153-6/+46
* | | | | | | | | | Merge pull request #9633 from owncloud/correct-icon-licenseThomas Müller2014-07-157-38/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unused 3rdparty clock and lock iconsJan-Christoph Borchardt2014-07-156-37/+0
| * | | | | | | | | | correct icon license, we use Elementary icons, not Silk anymoreJan-Christoph Borchardt2014-07-151-1/+1
* | | | | | | | | | | Merge pull request #9570 from PhilJung/masterblizzz2014-07-152-1/+153
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 12:19:07 +0000