wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21017 commits 157 branches 562 tags 714 MiB
Commit graph

21017 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
3431d547a9 fix performance issues 2014-10-10 12:16:26 +02:00
Arthur Schiwon
f31d4caf57 coding style, no effective code changes 2014-10-10 11:49:45 +02:00
Vincent Petry
660e9c4012 Merge pull request #11501 from Ansud/master 
Urlencode file name before passing it to cURL
 2014-10-10 10:57:59 +02:00
Jenkins for ownCloud
2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Morris Jobke
e5eeefbc16 Merge pull request #11486 from owncloud/config-update 
Config update
 2014-10-10 01:47:04 +02:00
Morris Jobke
090bf44ab6 Additional changes to config.sample.php and typo fixes 2014-10-09 19:23:03 +02:00
Morris Jobke
7238cb601c apply @carlaschroder's changes from owncloud/documentation#594 2014-10-09 19:23:03 +02:00
Bjoern Schiessle
8e077cf1a4 make sure that we always delete oldest first 2014-10-09 19:15:58 +02:00
Vincent Petry
9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount 
Update etag of parent dir when adding/removing ext storage mount points
 2014-10-09 18:18:36 +02:00
Arthur Schiwon
6f83b537fe remove debug output 2014-10-09 17:56:27 +02:00
Vincent Petry
c82e310e20 Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp 
Clear enabled apps cache after loading authentication app
 2014-10-09 17:20:05 +02:00
Arthur Schiwon
2cf0102797 fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck 2014-10-09 17:17:50 +02:00
Morris Jobke
0de60c51a1 Merge pull request #11498 from owncloud/detectDomainForDocumentation 
Add support for keys in the info.xml
 2014-10-09 16:57:15 +02:00
Lukas Reschke
16cd749065 Add support for keys in the info.xml 
This allows to have links to different doc base URLs

a.
 2014-10-09 15:48:30 +02:00
Tony Zelenoff
2d03019c91 Urlencode file name before passing it to cURL 
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.

Signed-off-by: Tony Zelenoff <antonz@parallels.com>
 2014-10-09 17:15:12 +04:00
Vincent Petry
59f9107dd9 Log warning when no uid was found for user 
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
 2014-10-09 14:58:53 +02:00
Vincent Petry
36d22825e0 Clear enabled apps cache after loading authentication app 
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
 2014-10-09 14:34:41 +02:00
blizzz
cc717c27d6 Merge pull request #10527 from owncloud/fix-10526 
properly cancel a Paginated Results operation in order to avoid protocol...
 2014-10-09 12:40:13 +02:00
Arthur Schiwon
9f036e776e bump version 2014-10-09 11:15:56 +02:00
Vincent Petry
0474a20ab9 Merge pull request #11493 from owncloud/revert-11161-fix-ldap-ingroup-for-9225 
Revert "[WIP] fix retrieval of group members and cache group members"
 2014-10-09 11:07:18 +02:00
Vincent Petry
f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Vincent Petry
3791de64ed Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225 
fix retrieval of group members and cache group members
 2014-10-09 10:19:58 +02:00
Morris Jobke
b11cf6f838 Merge pull request #11474 from owncloud/fix_trash_permission_check 
check if I can create a file at the location
 2014-10-09 08:59:48 +02:00
Jenkins for ownCloud
295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
MTRichards
c7f936cdcb Updated info.xml with 
Added description in line with other apps.
 2014-10-08 21:27:40 -04:00
MTRichards
f511977832 Updated info.xml app description 
Added updates description
 2014-10-08 21:24:54 -04:00
MTRichards
511ad6e106 Forgot a '.' 2014-10-08 21:08:20 -04:00
MTRichards
3a2d50b76f Updated info.xml app description 
Made app description paralell in structure to other app descriptions
 2014-10-08 21:07:12 -04:00
MTRichards
fc0ae29be5 Updated info.xml app description 
Added larger app description
 2014-10-08 20:49:22 -04:00
MTRichards
d532683e20 Updated info.xml app description 
Added new app description
Removed links to CE documentation
 2014-10-08 20:48:00 -04:00
MTRichards
48980fbc46 Updated info.xml with description 
Updated the description of the app for the app panel.
 2014-10-08 20:44:09 -04:00
Morris Jobke
23e120511a Merge pull request #11455 from owncloud/config-sample-cleanup 
Config sample cleanup
 2014-10-08 21:37:30 +02:00
Morris Jobke
c60bda54c5 Fixes in config.sample.php 
* owncloud -> ownCloud
* add default value
* proper comment style
* fix line wrapping and minor typo
* remove duplication
* add Vincents proposals
 2014-10-08 21:36:37 +02:00
Morris Jobke
7f328e8b16 re-arrange the config options and sort them in a semantical way 2014-10-08 21:36:37 +02:00
Morris Jobke
8ed883bc33 unify style of config.sample.php 
* use ' instead of " for config option
* place default parameters where useful into sample
* use proper comment block
* limit line size to 80 characters
 2014-10-08 21:36:37 +02:00
Morris Jobke
2f1605cfc3 Merge pull request #11471 from brumsoel/master 
Fix file size comparator return value
 2014-10-08 20:39:13 +02:00
Jörn Friedrich Dreyer
f664a31dec extract batchDelete(), better comments 2014-10-08 18:50:02 +02:00
André Gaul
0d0c9d0bb3 files_extern: remove empty Body and ContentLength in Amazon S3 mount 
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
 2014-10-08 18:49:59 +02:00
Jörn Friedrich Dreyer
3427976bb6 strict comparison 2014-10-08 18:49:55 +02:00
Jörn Friedrich Dreyer
27bb968ffa make some storage tests explain what went wrong 2014-10-08 18:49:52 +02:00
Jörn Friedrich Dreyer
aa3ad898a9 fix amazon s3 issues 
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
 2014-10-08 18:49:47 +02:00
Jörn Friedrich Dreyer
18e3856092 log exceptions when listing files 2014-10-08 18:49:43 +02:00
Arthur Schiwon
02985c9ec5 smaller corrections to make scruitinizer happier, no effective changes 2014-10-08 16:20:52 +02:00
Vincent Petry
bb424802c8 Prevent button click when enter key is pressed in LDAP wizard 
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
 2014-10-08 15:09:02 +02:00
Arthur Schiwon
ab3535855f more beautiful white spaces 2014-10-08 15:04:29 +02:00
Arthur Schiwon
39aa5868ac rename internal var name to avoid collision 2014-10-08 14:55:47 +02:00
Morris Jobke
6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements 
[encryption] some visual improvements
 2014-10-08 14:36:24 +02:00
Vincent Petry
26e242a8a4 Added PHP docs for etag propagator 2014-10-08 14:22:18 +02:00
Robin Appelman
bcf654127f More phpdoc 2014-10-08 14:22:17 +02:00
Robin Appelman
1030f0a763 Hookup the etag propagator 2014-10-08 14:22:17 +02:00