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

20714 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Morris Jobke
6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements 
[encryption] some visual improvements
 2014-10-08 14:36:24 +02:00
Morris Jobke
789437633f Merge pull request #11460 from owncloud/fix-10880 
implement case-insensitive search for groups in sharing dialog
 2014-10-08 14:08:06 +02:00
Morris Jobke
063ca4f39b Merge pull request #11477 from owncloud/improve-heading-whitespace 
increase whitespace below headings in settings
 2014-10-08 13:48:25 +02:00
Jan-Christoph Borchardt
60ce555047 increase whitespace below headings in settings 2014-10-08 12:46:24 +02:00
Bjoern Schiessle
5b5e9d148e check if I can create a file at the location 2014-10-08 10:56:06 +02:00
Jenkins for ownCloud
a9c9b5edf4 [tx-robot] updated from transifex 2014-10-08 01:54:49 -04:00
brumsoel
40174b6b10 Fix file size comparator return value 2014-10-08 01:17:45 +02:00
michag86
ca58ac50a2 fix for issue #10880 2014-10-07 16:07:48 +02:00
Vincent Petry
d7db006315 Revert "fix for issue #10880" 
This reverts commit 0df070a8e4.
 2014-10-07 15:54:25 +02:00
Morris Jobke
432cd4a5c2 Merge pull request #11428 from michag86/patch-1 
fix for issue #10483
 2014-10-07 15:00:31 +02:00
Morris Jobke
814bce4cac Merge pull request #11451 from owncloud/reduce-bottom-padding 
reduce bottom padding in filelist, fix perceived glitching, fix #11213
 2014-10-07 14:45:21 +02:00
michag86
0df070a8e4 fix for issue #10880 2014-10-07 14:30:14 +02:00
Bjoern Schiessle
b060123155 improved visual feedback if user enabled recovery key 2014-10-07 12:52:01 +02:00
Bjoern Schiessle
794d3ef949 improved visual feedback if recovery key password gets changed 2014-10-07 12:32:09 +02:00
Bjoern Schiessle
5fa1cbc4e5 improved visual feedback if recovery key gets enabled/disabled 2014-10-07 12:32:09 +02:00
Bjoern Schiessle
94a9ff1cd8 make sure that the notification gets shown again after a second try 2014-10-07 12:02:58 +02:00
michag86
0039099f51 restrict $div to local scope 2014-10-07 11:09:07 +02:00
Vincent Petry
396a71b005 Merge pull request #11378 from owncloud/sort-indicator-style 
fix position and style of sort indicator
 2014-10-07 11:06:37 +02:00
michag86
f4a2ddbe31 variable for found avatar div 2014-10-07 10:44:36 +02:00
Jan-Christoph Borchardt
2b8066bff3 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 10:44:01 +02:00
Morris Jobke
6323d5fb3a Merge pull request #11437 from owncloud/add-import-filter 
Add CssImportFilter. More elegant fix for documents#348
 2014-10-07 08:28:08 +02:00
Jenkins for ownCloud
01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Victor Dubiniuk
b6087ea79b Add CssImportFilter. More elegant fix for documents#348 2014-10-06 19:39:02 +03:00
Morris Jobke
a6293a38f2 Merge pull request #11390 from Nemesiz/master 
Preview large TXT files fix
 2014-10-06 14:25:27 +02:00
Morris Jobke
e5b4e54141 Merge pull request #11392 from owncloud/fix_version_previews 
we also encrypt/decrypt files in the versions folder
 2014-10-06 13:03:48 +02:00
Bjoern Schiessle
9147219377 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 12:02:08 +02:00