Commit Graph

27448 Commits

Author SHA1 Message Date
Thomas Müller 44592ab584 Merge pull request #19383 from owncloud/simplify-upload-icon
simplify upload icon
2015-09-25 23:37:19 +02:00
Roeland Douma 196975620d Merge pull request #19366 from owncloud/fix-sidebar-spinner
Fix sidebar spinner
2015-09-25 21:18:39 +02:00
Hendrik Leppelsack 0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Roeland Douma 87e067f4c8 Merge pull request #19362 from owncloud/fix_capabilities_shareAPI
Reflect enabled shareAPI in capabilities
2015-09-25 20:35:32 +02:00
Roeland Jago Douma db02173627 Reflect enabled shareAPI in capabilities
If the shareAPI is disabled we not return the other sharing
capabilities.

This allows clients to properly check if sharing is even available.
2015-09-25 20:12:41 +02:00
Thomas Müller 0aaece7de7 Merge pull request #19346 from owncloud/drop-passwords-from-exception-log
Remove passwords from logged exception stack traces
2015-09-25 20:04:01 +02:00
Thomas Müller 8f2a14c5d6 Merge pull request #19297 from owncloud/fix_19119
Do not blindy copy expiration date on reshare
2015-09-25 14:36:07 +02:00
Thomas Müller f89b9b61a9 Merge pull request #19357 from owncloud/add-config.sample.php-for-enforce-home-folder-naming-rule
Add doc to config.sample for enforce LDAP home folder naming rule
2015-09-25 14:33:14 +02:00
Morris Jobke 60b87048c1 Add doc to config.sample for enforce LDAP home folder naming rule
* ref #16891
2015-09-25 14:32:05 +02:00
Robin Appelman b2a528e303 remove warning when trying to get a lock while in transaction 2015-09-25 14:16:50 +02:00
Thomas Müller 8432c73611 Merge pull request #19030 from owncloud/oparoz-smarter-logger
[jenkins] Dump Arrays, Objects and Exceptions to the log
2015-09-25 14:15:59 +02:00
Thomas Müller f56c8288ca Merge pull request #19354 from owncloud/fix_12727
Save the settings in the user management page
2015-09-25 14:05:27 +02:00
Thomas Müller 787c668b39 Merge pull request #19360 from owncloud/move-filter-method-into-config-object
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
Thomas Müller 68bf4440d3 Merge pull request #19293 from owncloud/individual-it-move_initTemplate
[jenkins] do not load unnecessary code in case of webdav
2015-09-25 13:49:51 +02:00
Thomas Müller 2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Roeland Jago Douma f6cd7362cd Save the settings in the user management page
Store the setting in the user managerment page (e.g. show e-mail
address).

Fixes #12727
2015-09-25 13:35:12 +02:00
Joas Schilling ab69a22606 Deduplicate constant 2015-09-25 13:17:23 +02:00
Thomas Müller 57b2778053 Merge pull request #19356 from owncloud/add-l10n-factory-to-interface
Add the L10N Factory to the container interface
2015-09-25 13:06:27 +02:00
Roeland Jago Douma 9a373cb5bb Do not blindy copy expiration date on reshare
If a file/folder is reshared we should not blindly copy the expiration
date of the parent share. User/Group shares do not have expiration dates
currently, and thus this is always set to null.

Fixes #19119

* Added testcase
2015-09-25 13:06:05 +02:00
Individual IT Services db84791bb0 Todo for myself to eliminate double code
This will be in a new PR
2015-09-25 15:43:12 +05:45
Individual IT Services 2e42f99d00 add $prepend option to addStyle() & addVendorStyle() 2015-09-25 15:41:55 +05:45
Hendrik Leppelsack 2ee36dc4de restyle checkboxes in sidebar 2015-09-25 11:54:26 +02:00
Joas Schilling 1694f21387 Add the method to the mock 2015-09-25 11:16:26 +02:00
Joas Schilling faba02564a Move the filtering of sensitive data to the config class 2015-09-25 11:08:33 +02:00
Raghu Nayyar bf73665a35 Merge pull request #19329 from owncloud/checkbox-class
Add .checkbox class for new checkbox style
2015-09-25 14:02:39 +05:30
Joas Schilling e91e36f8df Add the L10N Factory to the container interface 2015-09-25 09:05:12 +02:00
Jan-Christoph Borchardt 0c32eab904 fix name autocomplete not showing on mobile, fix #18551 2015-09-25 18:09:43 +12:00
Hendrik Leppelsack 604f5783fd fix multiselect 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack c23cac3322 fix login 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack dba9211d5d fix filecomparator 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack 28d3c1cc0b fix filelist checkboxes 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack ec005fc5d0 add .checkbox class for new checkbox style 2015-09-25 00:51:39 +02:00
Jan-Christoph Borchardt 0566af3a12 increase visibility of slideshow controls, fix @owncloud/gallery#51 2015-09-25 09:58:02 +12:00
Jan-Christoph Borchardt a5e9301ec0 simplify upload icon 2015-09-25 09:13:23 +12:00
Thomas Müller e7bc2a10e3 Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
fix issue with version rollback and thumbnails
2015-09-24 21:06:27 +02:00
Morris Jobke db8e7ce8b9 Remove passwords from logged exception stack traces
* fixed #16318
* create logException in ILogger
* add unit tests
2015-09-24 20:01:30 +02:00
Lukas Reschke 320a4eb149 Merge pull request #19349 from owncloud/revert-18692-patch-2
Revert "Update apps.css (Scroll more smoothly for Webkit browser)"
2015-09-24 19:30:43 +02:00
Jan-Christoph Borchardt 43eeb290c1 Revert "Update apps.css (Scroll more smoothly for Webkit browser)" 2015-09-24 18:42:23 +02:00
Thomas Müller 866f84189b Adding 3rdparty ref 2015-09-24 18:26:11 +02:00
Thomas Müller ebdd6d96ce Merge pull request #19306 from owncloud/app-code-check-version
[App Code Check] add check for version and mandatory fields
2015-09-24 17:38:48 +02:00
Olivier Paroz f140084a8d Use a 3rd party normalizer for the logger 2015-09-24 17:13:39 +02:00
Morris Jobke 03bf2f786a public, remote and default_enable are not deprecated 2015-09-24 16:47:00 +02:00
Thomas Müller 846b826867 Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller 30377e958f Merge pull request #18834 from owncloud/delay-listen-owner-changes
Delay listening to owner changes untill we use a share for that owner
2015-09-24 15:06:27 +02:00
Thomas Müller d7a923671f Merge pull request #19305 from owncloud/share-hasusershares
Fix ShareItemModel.hasUserShares to only check shares of current item
2015-09-24 14:57:23 +02:00
Thomas Müller bf4c144c6f Merge pull request #19335 from owncloud/phil-davis-view-typos
Comment typos in tests/lib/files/view.php
2015-09-24 14:54:21 +02:00
Thomas Müller 5ee46c8500 Merge pull request #19337 from owncloud/fix-shipped-check-for-apps
Correctly check whether an app is shipped
2015-09-24 14:51:59 +02:00
Thomas Müller 383f381489 Merge pull request #19340 from owncloud/enc_fix_user_check
only check if the user exists if a user was added as parameter
2015-09-24 14:51:38 +02:00
Thomas Müller 594a31d260 Merge pull request #19341 from owncloud/enc_all_improved_messages
no need to list users if all users already had a key-pair
2015-09-24 14:51:18 +02:00
Thomas Müller c11bfa9177 Merge pull request #19342 from owncloud/fix-15836
LDAP Wizard: enable/disable test login name button depending on wheth…
2015-09-24 14:50:57 +02:00