summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-2220-42/+48
* Merge pull request #9750 from owncloud/issue/9745Vincent Petry2014-07-211-7/+9
|\
| * Correctly use groups parameter only when its not emptyJoas Schilling2014-07-211-7/+9
* | Merge pull request #9757 from owncloud/issue/9756Joas Schilling2014-07-211-2/+3
|\ \
| * | Add language parameter to public API for getL10N()Joas Schilling2014-07-211-2/+3
* | | use the minimum of configured session_livetime and session.gc_maxlifetime for...Matthias Rieber2014-07-211-1/+1
* | | Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-masterMorris Jobke2014-07-211-1/+1
|\ \ \ | |/ / |/| |
| * | perm -> permissionsThomas Müller2014-07-211-1/+1
* | | Merge pull request #9751 from owncloud/issue/9748Vincent Petry2014-07-212-5/+6
|\ \ \ | |/ / |/| |
| * | Do not force isAdmin as true and so the list is filtered correctlyJoas Schilling2014-07-211-3/+1
| * | Fix username for subadmins and only send subadmin groupsJoas Schilling2014-07-211-2/+5
| |/
* | Merge pull request #9406 from philfry/masterVincent Petry2014-07-211-0/+1
|\ \ | |/ |/|
| * silently discard the response body, needed for apache/mod_dav and maybe other...Philippe Kueck2014-07-031-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2126-65/+76
* | Merge pull request #9741 from owncloud/fix-repair-innodb-9737-masterMorris Jobke2014-07-201-3/+5
|\ \
| * | check if $tables is an arrayThomas Müller2014-07-191-3/+5
* | | Merge pull request #9672 from owncloud/mysql-affectedrowsAndreas Fischer2014-07-203-1/+75
|\ \ \
| * | | Added test of OCS privatedata to trigger key duplicationVincent Petry2014-07-171-0/+25
| * | | Document why we have to check with defined() first.Andreas Fischer2014-07-161-0/+2
| * | | Make MySQL return "number of found rows" instead of number of "affected rows".Andreas Fischer2014-07-162-1/+48
* | | | Merge pull request #9732 from owncloud/fix-9716Morris Jobke2014-07-201-1/+3
|\ \ \ \
| * | | | $.unique works only for DOM elementsArthur Schiwon2014-07-181-1/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-2038-110/+153
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1946-308/+518
|/ / /
* | | Merge pull request #9700 from owncloud/ie8-fixesVincent Petry2014-07-181-0/+14
|\ \ \
| * | | Fixed IE8 style issues in files appVincent Petry2014-07-181-0/+14
* | | | Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connectionVincent Petry2014-07-181-3/+9
|\ \ \ \
| * | | | Pass existing Net_SFTP object into Net_SFTP_Stream.Andreas Fischer2014-07-181-3/+9
* | | | | Merge pull request #9576 from owncloud/bcmath-checkblizzz2014-07-182-0/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make tests deal with missing bcmathArthur Schiwon2014-07-112-1/+30
| * | | | warn and continue gracefully if bcmath is not installedArthur Schiwon2014-07-101-0/+6
* | | | | Merge pull request #9718 from owncloud/sftp-early-loginblizzz2014-07-181-5/+5
|\ \ \ \ \
| * | | | | login() must be called after getServerPublicHostKey().Andreas Fischer2014-07-121-5/+5
* | | | | | [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
| |/ / / / /