Commit Graph

26649 Commits

Author SHA1 Message Date
Robin Appelman e9e42fff61 Merge pull request #18809 from owncloud/fix-tags-fileinfomodel
Tags in FileInfo map must be an array
2015-09-03 14:08:00 +02:00
Robin Appelman 5234090ee2 Merge pull request #18803 from owncloud/toggle-svg
use SVG for toggle image on installation instead of PNG
2015-09-03 14:06:03 +02:00
Vincent Petry 73c61941e2 Tags in FileInfo map must be an array
Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
2015-09-03 13:01:14 +02:00
Jan-Christoph Borchardt 8684420d0a Merge pull request #18798 from owncloud/collapse-html-code
Collapse HTML code for federated code
2015-09-03 11:59:01 +02:00
Lukas Reschke ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Jan-Christoph Borchardt acc9fa49fc use SVG for toggle image instead of PNG, fix installation and personal settings toggle 2015-09-03 11:49:28 +02:00
Morris Jobke a1e13d95ad Merge pull request #18777 from owncloud/locking-default
enable transational locking by default
2015-09-03 11:33:10 +02:00
Morris Jobke c4096767cc Merge pull request #18780 from owncloud/isimage-fallback
fallback for isimage
2015-09-03 11:11:48 +02:00
Lukas Reschke 929fc8eea2 Merge pull request #18787 from owncloud/encode-tags-in-json
Encode HTML tags in JSON
2015-09-03 11:02:11 +02:00
Vincent Petry 3ea9f97c36 Fix sidebar thumbnail loading JS unit tests 2015-09-03 08:24:50 +02:00
Jenkins for ownCloud 189f4044dd [tx-robot] updated from transifex 2015-09-03 01:55:23 -04:00
Morris Jobke e7314b3ad8 Merge pull request #18764 from owncloud/login-template-accessibility
add title attribute for the login button
2015-09-03 00:45:14 +02:00
Lukas Reschke f9e90e92d4 Encode HTML tags in JSON
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
2015-09-03 00:44:46 +02:00
Jan-Christoph Borchardt d03db5ac0d Merge pull request #18682 from owncloud/quota-select-style
Makes settings quota select like multiselect.
2015-09-03 00:36:11 +02:00
Jan-Christoph Borchardt a55f81e774 use proper triangle for multiselect dropdowns as well 2015-09-03 00:35:09 +02:00
Raghu Nayyar 59cf11c612 Makes settings select like multiselect 2015-09-03 00:28:08 +02:00
Joas Schilling e2cc778947 Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletes
Revert "Soft fail when deleting and no entry found"
2015-09-02 19:53:18 +02:00
Joas Schilling 8f2110e5da Revert "Soft fail when deleting and no entry found" 2015-09-02 19:52:45 +02:00
Robin Appelman 068ff09cfe fallback for isimage 2015-09-02 19:22:46 +02:00
Robin Appelman 389c8077b0 update config sample 2015-09-02 17:31:02 +02:00
Robin Appelman 4880d7729b enable transational locking by default 2015-09-02 16:56:47 +02:00
Robin McCorkell f97359706a Merge pull request #18773 from owncloud/fix-useless-deletes
Soft fail when deleting and no entry found
2015-09-02 15:12:07 +01:00
Robin McCorkell c9c246a3f5 Soft fail when deleting and no entry found 2015-09-02 14:50:07 +01:00
Jenkins for ownCloud 772d39f006 [tx-robot] updated from transifex 2015-09-02 07:08:44 -04:00
Christoph Wurst ba9457264f add title attribute for the login button 2015-09-02 12:32:16 +02:00
Jan-Christoph Borchardt 4539377113 Merge pull request #18632 from owncloud/sidebad-image-preview
larger preview for images in the sidebar
2015-09-02 10:53:59 +02:00
Morris Jobke 0884211c0f Merge pull request #18752 from owncloud/proper-setup-check
use config.php value instead of version string for appstore detection
2015-09-02 10:36:19 +02:00
Robin Appelman e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Robin Appelman c6060f53cd allow handling thumbnail errors 2015-09-02 10:32:43 +02:00
Robin Appelman 0f6df2e0b6 Allow creating previewss that cover the specified dimensions 2015-09-02 10:32:39 +02:00
Morris Jobke c86cac6a2b use config.php value instead of version string 2015-09-02 08:16:27 +02:00
Morris Jobke 73b43db4f9 Merge pull request #18744 from owncloud/fix-ocs-router
Delay adding OCS prefix to route collection until all is loaded
2015-09-02 08:05:15 +02:00
Jenkins for ownCloud 310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04:00
Robin McCorkell e50b3bd87f Merge pull request #18707 from owncloud/autotest-xdebug
Allow easy XDEBUG debugging with autotest
2015-09-01 16:29:33 +01:00
Robin Appelman 9858a6f705 Merge pull request #18743 from owncloud/autoloader-check-log-path
Show the path as part of the exception for not allowed autoloading paths
2015-09-01 17:20:21 +02:00
Björn Schießle 39bd4ea8f2 Merge pull request #18234 from owncloud/ocs_api_for_sharees_list
Add OCS API for sharees list
2015-09-01 17:09:57 +02:00
Robin McCorkell 5b2529b448 Delay adding OCS prefix to route collection until all is loaded
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
2015-09-01 15:42:41 +01:00
Robin Appelman 01dcf7f32c Show the path as part of the exception for not allowed autoloading paths 2015-09-01 16:06:52 +02:00
Vincent Petry 87b3e28f06 Merge pull request #18730 from owncloud/appframework_proper_304
Properly return 304 in AppFramework
2015-09-01 15:39:59 +02:00
Lukas Reschke 01152676cd Merge pull request #18396 from owncloud/autoloader-check-path
verify the path in the autoloader
2015-09-01 15:07:32 +02:00
Robin Appelman e9b91b1798 verify the path in the autoloader 2015-09-01 15:03:28 +02:00
Vincent Petry 601c61fddf Merge pull request #12088 from AdamWill/google-opendir-root
[WIP] google: drop duplicate path trim from opendir()
2015-09-01 13:36:27 +02:00
Vincent Petry 0d4562c938 Merge pull request #18631 from owncloud/more_ocs_share_data
Return permissions and expiration on create share responses
2015-09-01 12:29:02 +02:00
Roeland Jago Douma f12caf930e Properly return 304
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
2015-09-01 11:04:41 +02:00
Vincent Petry 85b62c7d82 Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types
Sticky the notification types of files and sharing
2015-08-31 17:56:48 +02:00
Morris Jobke e367f1bfc1 Merge pull request #18715 from owncloud/language-code-english
add english language code translation
2015-08-31 17:45:39 +02:00
Morris Jobke eef707043c add english language code translation 2015-08-31 17:41:20 +02:00
Vincent Petry f8d8de5da6 Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable
Make root of key storage configurable
2015-08-31 15:58:30 +02:00
Robin Appelman 3e9533ae11 Merge pull request #18702 from owncloud/ext-emptymount
Allow an empty mount point
2015-08-31 15:28:41 +02:00
Robin McCorkell f6b1d3506f Allow easy XDEBUG debugging with autotest
Debugging scripts needs the environment variable XDEBUG_CONFIG to be
set, which initiates a connection to a listening debugger. But if that
env is set and one of the PHP setup steps occurs (e.g. occ install), the
debugging session is 'completed' and the debugger no longer listens
during the actual tests. This saves the XDEBUG_CONFIG env so it only
applies during the PHPUnit execution, so only the real tests trigger the
debugging.
2015-08-31 14:22:02 +01:00