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

26105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
f0b617b508 Use DI 
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
c80c9819dc Move core capabilities to new class 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063 Moved core apps to the capabilities manager 
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
7e6a2b71fd Added Capabilities Manager 
* This should allow the capabilities to be intergrated into the
appframework
* Unit tests
* Throw exception if closure does not return ICapability instance
 2015-08-10 10:45:08 +02:00
Robin McCorkell
214729a552 Merge pull request #14779 from owncloud/use-iterator-directory 
Use the new IteratorDirectory instead of the fakedir wrapper
 2015-08-07 22:16:47 +01:00
Morris Jobke
ca8f7fd69c Merge pull request #18124 from owncloud/share-permwrongvar 
Fix removal of share permissions when share disabled for user
 2015-08-07 18:42:35 +02:00
Jan-Christoph Borchardt
09ca2e0291 Merge pull request #18125 from owncloud/filelist-emptycontentduringmask 
Make sure to hide empty content message when mask is shown
 2015-08-07 18:33:46 +02:00
Lukas Reschke
77f71fbb08 Merge pull request #18120 from owncloud/appframework-isessio 
Add \OCP\ISession to AppFramework
 2015-08-07 18:03:51 +02:00
Vincent Petry
cf532247e0 Merge pull request #13949 from rullzer/no_negative_expire 
Do not allow invalid default expire days
 2015-08-07 17:33:30 +02:00
Vincent Petry
b3a1aef934 Merge pull request #13641 from owncloud/cache-storage-status 
Store storage availability in database
 2015-08-07 17:31:03 +02:00
Thomas Müller
404b5a2e4a Merge pull request #18118 from owncloud/allow-ocs-to-send-headers 
Adding header support to class OC_OCS_Result
 2015-08-07 16:21:58 +02:00
Vincent Petry
8e2369f72b Make sure to hide empty content message when mask is shown 2015-08-07 15:57:16 +02:00
Vincent Petry
143e4a81f0 Fix removal of share permissions when share disabled for user 2015-08-07 15:43:27 +02:00
Robin McCorkell
fcc03e588a Add \OCP\ISession to AppFramework 2015-08-07 12:29:57 +01:00
Thomas Müller
0595c05200 Adding header support to class OC_OCS_Result 2015-08-07 13:12:43 +02:00
Jan-Christoph Borchardt
43888bb9bf Merge pull request #18083 from owncloud/user-search-box 
use the main search box to filter users in user management
 2015-08-07 00:35:50 +02:00
blizzz
795f4ad4c0 Merge pull request #18091 from owncloud/add-backbonejs 
Add Backbone.js
 2015-08-07 00:30:15 +02:00
Vincent Petry
4c9f55a325 Merge pull request #17680 from owncloud/ftp-rmdir-file 
handle rmdir on files for ftp storages
 2015-08-06 18:05:28 +02:00
Björn Schießle
aeb4cdfb95 Merge pull request #18106 from owncloud/enc-jsnamespaceconflict 
Fix namespace conflict in OC.Encryption JS code
 2015-08-06 17:40:25 +02:00
Vincent Petry
a594b41fb0 Fix namespace conflict in OC.Encryption JS code 2015-08-06 15:53:38 +02:00
Vincent Petry
6c139674a4 Merge pull request #18030 from owncloud/dav-upload-updater 
go trough the updater when uploading over webdav
 2015-08-06 15:28:10 +02:00
Arthur Schiwon
ffaf5fed0e load backbone universally 2015-08-06 12:27:18 +02:00
Vincent Petry
78203ecc2f Merge pull request #18082 from owncloud/share-group-conflict 
Re-use the share entry we have for the shared storage instead of searching for it every time
 2015-08-06 12:21:59 +02:00
Arthur Schiwon
67bb5712e4 make available as OC.Backbone to avoid conflicts 2015-08-06 12:08:42 +02:00
Jörn Friedrich Dreyer
52085cc1ef Merge pull request #16961 from owncloud/hardening-ldap 
Hardening home folder retrieval in user_ldap
 2015-08-06 11:32:43 +02:00
Arthur Schiwon
cc4a2a4727 adjust gitignore for backbone.js 2015-08-06 11:22:15 +02:00
Arthur Schiwon
1aaef6fde7 files and sharing will require backbonejs 2015-08-06 11:09:47 +02:00
Bernhard Posselt
6f9f20b3fe Merge pull request #17810 from owncloud/better-enc-warnings 
Condense doc warnings into small section that gets showed to the user…
 2015-08-06 10:43:20 +02:00
Arthur Schiwon
6787774a32 integration tests for hardening user home retrieval 2015-08-06 09:31:07 +02:00
Arthur Schiwon
dc04afbe29 add backbone.js 2015-08-06 00:00:40 +02:00
Thomas Müller
923a22a11e Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-failure 
[OCS] Error handling - fix in status code mapper
 2015-08-05 23:57:46 +02:00
Morris Jobke
7f44b0fd18 Merge pull request #18077 from owncloud/fix_18055 
Set proper mimetype for directories
 2015-08-05 23:38:02 +02:00
Thomas Müller
db1416346c Following the spec: 
"`statuscode`: The OCS status code of the response, everything except 100 MUST be handled as failure."
 2015-08-05 17:49:44 +02:00
Robin Appelman
0f5af5482e use the main search box to filter users in user management 2015-08-05 17:29:20 +02:00
Bernhard Posselt
7cb0934fa2 Merge pull request #18035 from owncloud/ocs-2.0 
Adding ocs/v2.php with status code mapper
 2015-08-05 17:28:08 +02:00
Thomas Müller
314fc11e1b Merge pull request #18057 from owncloud/import_root_certificates 
disable "ssl root certificate" settings if user can't mount external storages
 2015-08-05 17:18:46 +02:00
Robin Appelman
859da8f0b3 just pass the share instead of searching for it 2015-08-05 15:41:29 +02:00
Robin Appelman
085acaf6ba add unit tests for share target conflict with group shares 2015-08-05 15:41:03 +02:00
Thomas Müller
6e8e411abf Merge pull request #18068 from owncloud/update-pear 
[PHP7] Update pear-core-minimal
 2015-08-05 15:39:38 +02:00
Thomas Müller
6060514d71 Update submodule after merge in 3rdparty 2015-08-05 14:04:19 +02:00
Roeland Jago Douma
bc91c5c2de Set proper mimetype for directories 2015-08-05 13:54:09 +02:00
Thomas Müller
a70f145d71 Merge pull request #17961 from owncloud/make_knowledgebase_configurable 
make knowledge base url configurable
 2015-08-05 11:54:58 +02:00
Thomas Müller
7243fc1228 Merge pull request #18062 from owncloud/use-full-namespace 
Use absolute namespace
 2015-08-05 11:50:33 +02:00
Thomas Müller
5683d68921 remove old pear classes 2015-08-05 11:44:01 +02:00
Thomas Müller
544f38785f "pear/pear-core-minimal": "v1.10.0alpha2" 2015-08-05 11:42:46 +02:00
Thomas Müller
6c46430cdb Return 200 not null - we should return consistent types 2015-08-05 11:23:29 +02:00
Thomas Müller
475adcf6ea Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttoken 
Use StringUtils::equals on CSRF token and add unit tests
 2015-08-05 11:17:50 +02:00
Lukas Reschke
99224905d8 Use absolute namespace 2015-08-05 10:30:39 +02:00
Lukas Reschke
90a11efecd Remove "use" statement 
Ref https://bugs.php.net/bug.php?id=66773
 2015-08-05 09:31:21 +02:00
Lukas Reschke
4efa7c09b1 Use StringUtils::equals on CSRF token and add unit tests 2015-08-04 18:34:33 +02:00