Commit Graph

26091 Commits

Author SHA1 Message Date
Vincent Petry d0f73d78f3 Remove horizontal scroll caused by right sidebar 2015-08-07 01:22:43 +02:00
Vincent Petry ad90ba27cd Styling fixes + hightlight in files sidebar
Sidebar scrolls with contents
Highlight currently show file
2015-08-07 01:22:43 +02:00
Vincent Petry ff614a7dbd More fixes to the right sidebar
Sidebar now works in all file list views.
Moved owner to share tab.
2015-08-07 01:22:43 +02:00
Vincent Petry 12e5f310dd Improved right sidebar
Added owner info.
Added animation, but causes scrollbal.
Default file action now when clicking on name directly.
Fixed icon.
Added empty share tab.
2015-08-07 01:22:42 +02:00
Vincent Petry 9854e71d2c Basic work for right sidebar
Adds right sidebar with registrable panels (still WIP)
2015-08-07 01:22:42 +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
Bjoern Schiessle dc5e89e624 also block certificate management in the back-end if external storages are disabled for the user 2015-08-04 18:33:19 +02:00
Bjoern Schiessle 573177d176 only add the possibility to import ssl root certificates to the personal
setting if the user can mount external storages
2015-08-04 18:08:04 +02:00
Thomas Müller 728780aee8 Merge pull request #18024 from owncloud/phpseclib-2.0
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
Morris Jobke 151bad07df Merge pull request #18050 from owncloud/php7-catch-type-error
[PHP 7] Change type hint to also accept Errors
2015-08-04 15:14:56 +02:00
Lukas Reschke 3cd54cda24 Rebase upon newest master 2015-08-04 15:09:06 +02:00
Thomas Müller d0d6782615 Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2
[PHP7] Remove pointless unit test
2015-08-04 12:11:19 +02:00
Thomas Müller acd9b7576d Remove pointless unit test 2015-08-04 12:03:03 +02:00
Lukas Reschke c6a181d00b [PHP 7] Change type hint to also accept Errors
PHP 7 changed the exception types and thus our error handler needs to be able to catch this.

Without this in some cases just a white page is shown instead of an error message.
2015-08-04 11:54:05 +02:00
Thomas Müller 3ecf7fce79 Fix unit test within OCSController 2015-08-03 22:19:04 +02:00
Thomas Müller fa0105d678 Merge pull request #18037 from owncloud/shared-propagate-check-recipient
fix infinite loops with propagating etags on reshares
2015-08-03 21:17:58 +02:00