aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0732-4/+40
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0694-252/+62
|
* Merge pull request #12636 from owncloud/fix-ie9-placeholderRaghu Nayyar2014-12-061-1/+8
|\ | | | | fix placeholder fake in IE8 & 9 that brokes group listing in user manage...
| * fix placeholder fake in IE8 & 9 that brokes group listing in user management ↵Morris Jobke2014-12-051-1/+8
| | | | | | | | - fixes #12525
* | Merge pull request #12646 from owncloud/remove-safe-magic-quotesRobin Appelman2014-12-053-25/+1
|\ \ | | | | | | Remove checks for safe mode and magic quotes
| * | Remove checks for safe mode and magic quotesLukas Reschke2014-12-053-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both are removed from 5.4.0 Safe Mode: http://php.net/manual/en/features.safe-mode.php > This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. Magic Quotes: http://php.net/manual/en/security.magicquotes.php > This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
* | | Merge pull request #12166 from helmutschneider/aws-2.7.5Lukas Reschke2014-12-0551-254/+710
|\ \ \ | | | | | | | | Upgrade AWS sdk to 2.7.5. Fixes #12023
| * | | Upgrade AWS sdk to 2.7.5Johan Björk2014-11-1351-254/+710
| | | |
* | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ | | | | | | | | | | Fix timestamp comparator return value
| * | | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-033887-91956/+151926
| |\ \ \ \
| * | | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
| | | | | |
* | | | | | Merge pull request #12477 from rjaeckel/masterLukas Reschke2014-12-051-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | restrict access to public files only
| * | | | | | blocked 3rdparty instead of l10nRobert Jäckel2014-11-271-1/+1
| | | | | | |
| * | | | | | restrict access to public files onlyRobert Jäckel2014-11-271-0/+2
| | | | | | | | | | | | | | | | | | | | | use mod_rewrite to pretend theese files are not existend for security purposes
* | | | | | | Merge pull request #12523 from owncloud/port-11747Vincent Petry2014-12-051-3/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Only store user credentials when SMB_OC storage is enabled
| * | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/smb_oc.php
* | | | | | | Merge pull request #12561 from oparoz/vectoriconMorris Jobke2014-12-055-43/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the bitmap and vector mime icons
| * | | | | | | PNG and SVG have been compressedOlivier Paroz2014-12-052-167/+37
| | | | | | | |
| * | | | | | | Improve the bitmap and vector mime iconsOlivier Paroz2014-12-025-56/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Vector files such as Illustrator files currently show the "image" icon. I propose to add a new type to mimetypeIcon() called "image/vector" and which would be used by SVG as well * We can use the current image-svg+xml icon, but would simply rename it to image-vector * The black and white "image" icon looks too much like a settings icon. A simple picture representation pasted over the file icon should work
* | | | | | | | Merge pull request #12583 from owncloud/trim-portMorris Jobke2014-12-053-10/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Trim port from domain
| * | | | | | | | Add test for IPv6 without portLukas Reschke2014-12-041-1/+2
| | | | | | | | |
| * | | | | | | | Add workaround for older instancesLukas Reschke2014-12-031-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be removed with oCAdd workaround for older instances To be removed with oC99
| * | | | | | | | Trim port from domainLukas Reschke2014-12-033-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500) To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
* | | | | | | | | Merge pull request #12622 from owncloud/disable-for-allJoas Schilling2014-12-051-3/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Disable when no sendmail is available
| * | | | | | | | | Disable when no sendmail is availableLukas Reschke2014-12-041-3/+6
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-05232-310/+124
| | | | | | | | | |
* | | | | | | | | | cache total user countArthur Schiwon2014-12-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/user_ldap.php
* | | | | | | | | | Forward port of #12493Arthur Schiwon2014-12-044-2/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add ldap-search command to occ Conflicts: apps/user_ldap/appinfo/register_command.php LDAP search filter creation changes: 1. do not prepend * wildcard to search terms. Will result in faster search, but you don't find "foobar" when looking for "bar" 2. advanced behaviour when search string contains a space and multiple search attributes are present. The search string is split into single words. The resulting filter requires that each word at least appears once in any search attribute. This is supposed to return better results in big LDAPs. trim search string before passing it on
* | | | | | | | | | Merge pull request #12619 from owncloud/use-also-original-heaMorris Jobke2014-12-042-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merge headers
| * | | | | | | | | | Fix unit testLukas Reschke2014-12-041-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge headersLukas Reschke2014-12-041-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
* | | | | | | | | | Merge pull request #12616 from owncloud/node-fileinfoMorris Jobke2014-12-047-74/+133
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | make \OC\Files\Node\Node implement the FileInfo interface
| * | | | | | | | | | make \OC\Files\Node\Node implement the FileInfo interfaceRobin Appelman2014-12-047-74/+133
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #12607 from owncloud/this-is-an-awesome-dayClark Tomlinson2014-12-043-27/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.4 is now required for master
| * | | | | | | | | | | PHP 5.4 is now required for masterLukas Reschke2014-12-043-27/+3
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :beers:
* | | | | | | | | | | Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-043-53/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Remove last traces of travis integration
| * | | | | | | | | | PHP < 5.4 is not supported anymore - see #12606Morris Jobke2014-12-041-8/+0
| | | | | | | | | | |
| * | | | | | | | | | Remove last traces of travis integrationMorris Jobke2014-12-043-47/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12609 from owncloud/remove-53-fixmeThomas Müller2014-12-041-18/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove workaround for 5.3
| * | | | | | | | | | Remove workaround for 5.3Lukas Reschke2014-12-041-18/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function is natively available with 5.4
* | | | | | | | | | Merge pull request #12533 from owncloud/app-dependencies-php-versionThomas Müller2014-12-0411-15/+378
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | App dependencies php version
| * | | | | | | | | | no nested xml tags on dependenciesThomas Müller2014-12-044-17/+13
| | | | | | | | | | |
| * | | | | | | | | | fix an issue where the types tag holds an empty stringThomas Müller2014-12-041-4/+8
| | | | | | | | | | |
| * | | | | | | | | | adding command dependencyThomas Müller2014-12-042-1/+17
| | | | | | | | | | |
| * | | | | | | | | | adjust dependency analyzer to use attributes properlyThomas Müller2014-12-042-18/+31
| | | | | | | | | | |
| * | | | | | | | | | switch to different parsing implementation to get xml attributes properly ↵Thomas Müller2014-12-046-56/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handled
| * | | | | | | | | | adding supported databasesThomas Müller2014-12-046-3/+72
| | | | | | | | | | |
| * | | | | | | | | | display missing dependencies in the apps management pageThomas Müller2014-12-042-0/+17
| | | | | | | | | | |
| * | | | | | | | | | introduce dependency analyzer to take care of app dependenciesThomas Müller2014-12-048-9/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some more unit tests on xml info parser
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 05:39:28 +0000