aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Additional changes to config.sample.php and typo fixesMorris Jobke2014-10-091-29/+32
|
* apply @carlaschroder's changes from owncloud/documentation#594Morris Jobke2014-10-091-160/+216
|
* Merge pull request #10527 from owncloud/fix-10526blizzz2014-10-092-8/+31
|\ | | | | properly cancel a Paginated Results operation in order to avoid protocol...
| * make scrutinizer happy, very minor changesArthur Schiwon2014-10-012-2/+2
| |
| * init a new paged search on read operations to satisfy OpenLDAPArthur Schiwon2014-09-301-0/+3
| |
| * abandond paged search only if PHP supports themArthur Schiwon2014-09-301-1/+1
| |
| * abandon ongoing paged search before starting a new oneArthur Schiwon2014-09-301-4/+3
| |
| * properly cancel a Paginated Results operation in order to avoid protocol ↵Arthur Schiwon2014-09-301-4/+25
| | | | | | | | errors, fixes #10526
* | Merge pull request #11493 from owncloud/revert-11161-fix-ldap-ingroup-for-9225Vincent Petry2014-10-091-25/+2
|\ \ | | | | | | Revert "[WIP] fix retrieval of group members and cache group members"
| * | Revert "[WIP] fix retrieval of group members and cache group members"Vincent Petry2014-10-091-25/+2
|/ /
* | Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225Vincent Petry2014-10-091-2/+25
|\ \ | | | | | | fix retrieval of group members and cache group members
| * | fix changed variable nameArthur Schiwon2014-10-011-1/+1
| | |
| * | fix retrievel of group members and cache group membersArthur Schiwon2014-09-181-2/+25
| | |
* | | Merge pull request #11474 from owncloud/fix_trash_permission_checkMorris Jobke2014-10-091-1/+1
|\ \ \ | | | | | | | | check if I can create a file at the location
| * | | check if I can create a file at the locationBjoern Schiessle2014-10-081-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-0958-249/+234
| | | |
* | | | Updated info.xml withMTRichards2014-10-081-16/+2
| | | | | | | | | | | | Added description in line with other apps.
* | | | Updated info.xml app descriptionMTRichards2014-10-081-1/+5
| | | | | | | | | | | | Added updates description
* | | | Forgot a '.'MTRichards2014-10-081-1/+1
| | | |
* | | | Updated info.xml app descriptionMTRichards2014-10-081-11/+2
| | | | | | | | | | | | Made app description paralell in structure to other app descriptions
* | | | Updated info.xml app descriptionMTRichards2014-10-081-1/+5
| | | | | | | | | | | | Added larger app description
* | | | Updated info.xml app descriptionMTRichards2014-10-081-3/+5
| | | | | | | | | | | | | | | | Added new app description Removed links to CE documentation
* | | | Updated info.xml with descriptionMTRichards2014-10-081-3/+3
| | | | | | | | | | | | Updated the description of the app for the app panel.
* | | | Merge pull request #11455 from owncloud/config-sample-cleanupMorris Jobke2014-10-081-237/+599
|\ \ \ \ | | | | | | | | | | Config sample cleanup
| * | | | Fixes in config.sample.phpMorris Jobke2014-10-081-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud -> ownCloud * add default value * proper comment style * fix line wrapping and minor typo * remove duplication * add Vincents proposals
| * | | | re-arrange the config options and sort them in a semantical wayMorris Jobke2014-10-081-172/+278
| | | | |
| * | | | unify style of config.sample.phpMorris Jobke2014-10-081-215/+455
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * use ' instead of " for config option * place default parameters where useful into sample * use proper comment block * limit line size to 80 characters
* | | | Merge pull request #11471 from brumsoel/masterMorris Jobke2014-10-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix file size comparator return value
| * | | | Fix file size comparator return valuebrumsoel2014-10-081-1/+1
| | | | |
* | | | | extract batchDelete(), better commentsJörn Friedrich Dreyer2014-10-081-31/+31
| | | | |
* | | | | files_extern: remove empty Body and ContentLength in Amazon S3 mountAndré Gaul2014-10-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10501 Conflicts: apps/files_external/lib/amazons3.php
* | | | | strict comparisonJörn Friedrich Dreyer2014-10-081-2/+2
| | | | |
* | | | | make some storage tests explain what went wrongJörn Friedrich Dreyer2014-10-081-6/+6
| | | | |
* | | | | fix amazon s3 issuesJörn Friedrich Dreyer2014-10-083-110/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder size and mtime is always unknown in s3 more s3 fixes make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings reduce number of http calls on remove and rmdir fix typo
* | | | | log exceptions when listing filesJörn Friedrich Dreyer2014-10-081-0/+3
| | | | |
* | | | | Merge pull request #11453 from owncloud/enc_visual_improvementsMorris Jobke2014-10-088-110/+125
|\ \ \ \ \ | | | | | | | | | | | | [encryption] some visual improvements
| * | | | | improved visual feedback if user enabled recovery keyBjoern Schiessle2014-10-073-19/+15
| | | | | |
| * | | | | improved visual feedback if recovery key password gets changedBjoern Schiessle2014-10-073-9/+32
| | | | | |
| * | | | | improved visual feedback if recovery key gets enabled/disabledBjoern Schiessle2014-10-073-50/+41
| | | | | |
| * | | | | make sure that the notification gets shown again after a second tryBjoern Schiessle2014-10-071-32/+37
| | | | | |
* | | | | | Merge pull request #11460 from owncloud/fix-10880Morris Jobke2014-10-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | implement case-insensitive search for groups in sharing dialog
| * | | | | | fix for issue #10880michag862014-10-071-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11477 from owncloud/improve-heading-whitespaceMorris Jobke2014-10-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | increase whitespace below headings in settings
| * | | | | increase whitespace below headings in settingsJan-Christoph Borchardt2014-10-081-1/+1
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-0815-64/+70
|/ / / /
* | | | Revert "fix for issue #10880"Vincent Petry2014-10-071-1/+1
| | | | | | | | | | | | | | | | This reverts commit 0df070a8e4f6718e3cd86aa4d5a5fc62c53f6eee.
* | | | Merge pull request #11428 from michag86/patch-1Morris Jobke2014-10-071-3/+6
|\ \ \ \ | | | | | | | | | | fix for issue #10483
| * | | | restrict $div to local scopemichag862014-10-071-1/+1
| | | | |
| * | | | variable for found avatar divmichag862014-10-071-4/+5
| | | | |
| * | | | fix for issue #10483michag862014-10-061-2/+4
| | | | |