summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|\ | | | | [OC 7] IE8 styling fixes
| * Fixed IE8 style issues in files appVincent Petry2014-07-181-0/+14
| | | | | | | | | | | | - fixed missing scrollbar in personal page - fixed controls bar transparency: opaque white in IE8 - fixed files table borders in IE8
* | 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.
| * | 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
|\ \ \ | |/ / |/| | LDAP Active Directory Primary Groups support depends on bcmath module
| * | 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
|\ \ \ | | | | | | | | SFTP: login() must be called after getServerPublicHostKey().
| * | | 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
| * | | | Revert "add share index"Thomas Müller2014-07-171-12/+0
|/ / / / | | | | | | | | | | | | This reverts commit e19b3a8794a2cadc86b0f3b01a516814b600026b.
* | | | Merge pull request #9710 from ↵Thomas Müller2014-07-171-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/fix-failing-unit-test-on-MapperTestUtility.php-master kill unused require of MapperTestUtility.php
| * | | | 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 page
| * | | | Fixed JS and CSS issues in users pageVincent Petry2014-07-175-6/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | - Renamed "delete" to "deleteEntry" to make IE8 happy. - Added missing "svg" class for the "+" button - Added height to "+" button but was unable to properly align it
* | | | Merge pull request #9668 from owncloud/enc_fix_folder_moveVincent Petry2014-07-173-26/+83
|\ \ \ \ | | | | | | | | | | [encryption] update keys recursively if a folder was moved
| * | | | 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 MapperTestUtility
| * | | | fixing namespace of MapperTestUtilityThomas Müller2014-07-171-1/+1
|/ / / / | | | | | | | | | | | | and rename file to be lowercase
* | | | Merge pull request #9694 from owncloud/fix-failing-testsThomas Müller2014-07-171-1/+1
|\ \ \ \ | | | | | | | | | | fix syntax
| * | | | 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 storage
| * | | | 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
|\ \ \ \ | | | | | | | | | | Add webapp support
| * | | | 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 it
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | external storage table layout fixes
| * | | | | fix CSS coding styleMorris Jobke2014-07-161-5/+6
| | | | | |
| * | | | | Fix #9590. Fix #9612.Stephane V2014-07-153-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters. The rows of the table are now always visible until the end (the trash icon is accessible). (Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
* | | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstreamicewind19912014-07-162-4/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | storage: do not check file mode on rename
| * | | | | | files: storage: rename should check parent directories of old and new filesTigran Mkrtchyan2014-07-102-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as described by POSIX.1-2008 (see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | | | | | Merge pull request #9662 from owncloud/enc_error_handling_masterBjörn Schießle2014-07-165-25/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [encryption] improved error handling
| * | | | | | | 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 loading
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [OC8] Removed legacy encryption tests
| * | | | | | | | 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 shares
| * | | | | | | | Correctly return the owner display name for children of sharesVincent Petry2014-07-162-1/+20
| | |/ / / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 18:35:42 +0000