Commit Graph

21828 Commits

Author SHA1 Message Date
Vincent Petry c7ce3b84f0 Merge pull request #12806 from owncloud/display-backend-in-usermgnt
Show user backend in user management
2014-12-12 16:23:39 +01:00
Vincent Petry 4b57892c4e Merge pull request #12778 from owncloud/searchbytags2
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Morris Jobke 04aaa72810 Show user backend in user management
* add switch to settings to show user backend
* user classes for headers and rows to unify the show/hide statement
* add user backend to response of user create request
* proper markup in settings area
2014-12-12 14:19:29 +01:00
Thomas Müller 6b4502adeb Merge pull request #12812 from owncloud/remove-53-workaround
Remove conditional check for 5.3 compatibility
2014-12-12 13:16:49 +01:00
Joas Schilling 4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Vincent Petry ffd5e93f70 Merge pull request #12789 from owncloud/external-icon
fix and compress files_external icon
2014-12-12 12:46:57 +01:00
Lukas Reschke 5eaa2214b8 Remove conditional check for 5.3 compatibility 2014-12-12 12:25:59 +01:00
Vincent Petry b1bef5cc15 Merge pull request #12587 from owncloud/dav-logerrors
Log exceptions in DAV storage
2014-12-12 11:58:04 +01:00
Joas Schilling 7542883bf8 Merge pull request #12807 from owncloud/fix-timespan-language
Correctly inject the language into the subcall
2014-12-12 11:57:22 +01:00
Vincent Petry 3878c3782f Added searchByTag in cache jail wrapper 2014-12-12 11:48:42 +01:00
Robin Appelman 3bf0922b13 Merge pull request #12527 from owncloud/js-pluginsystem
Simple Plugin system for Javascript
2014-12-12 11:43:31 +01:00
Joas Schilling 46def69574 Specify list of activity parameters for sharing extension 2014-12-12 11:41:01 +01:00
Morris Jobke c451d99daa Merge pull request #12790 from owncloud/user-mngt-js-only
remove PHP generated user list and move all to the existing JS part
2014-12-12 11:32:47 +01:00
Vincent Petry 15ecb28d50 Make $userId mandatory for searchByTags
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Morris Jobke 3c21436287 Merge pull request #12805 from Gadzy/patch-1
Check for share by link enabled
2014-12-12 11:11:40 +01:00
Joas Schilling 811f9251d6 Correctly inject the language into the subcall 2014-12-12 11:00:07 +01:00
Gadzy ba3957fb8a Check for share by link enabled
Display "Shared by link" section only if sharing by link is enabled.
2014-12-12 10:23:51 +01:00
Jenkins for ownCloud 527dd8cdf4 [tx-robot] updated from transifex 2014-12-12 04:19:09 -05:00
Morris Jobke 3ab18f1f54 add comments to user list JS for better understanding 2014-12-12 09:59:42 +01:00
Morris Jobke fa5790c8af move loading of JS and CSS to template 2014-12-12 09:22:15 +01:00
Morris Jobke af1f34e813 remove PHP generated user list and move all to the existing JS part 2014-12-12 09:12:30 +01:00
Morris Jobke e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Jenkins for ownCloud 68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Morris Jobke c56fa64801 Merge pull request #12786 from owncloud/userfolder-setup
Ensure user mountpoints are setup when using getUserFolder
2014-12-11 23:51:49 +01:00
Vincent Petry 25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Jörn Friedrich Dreyer c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Jan-Christoph Borchardt c588ccf96a fix and compress files_external icon 2014-12-11 15:33:31 +01:00
Joas Schilling e3dfddb48a Add test for getSpecialParameterList() 2014-12-11 15:01:45 +01:00
Joas Schilling 1b18554aa7 Allow extensions to specify the list of special parameters 2014-12-11 14:56:46 +01:00
Robin Appelman 802c1b0b3a Ensure user mountpoints are setup when using getUserFolder 2014-12-11 14:34:30 +01:00
Morris Jobke 8fd90e04b6 Merge pull request #12781 from owncloud/jenkins-curl-open-basedir
[Jenkins only] curl open basedir
2014-12-11 14:15:24 +01:00
Joas Schilling 17d68e0638 Merge pull request #12780 from owncloud/make-datetimeformattertest-reliable
Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
2014-12-11 14:11:07 +01:00
Thomas Müller f5348d99e0 Merge pull request #12779 from owncloud/correctly-fall-back-plurals
Correctly fallback to english, if the plural case is not translated
2014-12-11 13:53:17 +01:00
Joas Schilling affeea8c72 Use a fixed timestamp so we dont switch days/years with the getTimestampAgo 2014-12-11 13:22:05 +01:00
Joas Schilling cbad5c998b Correctly fallback to english, if the plural case is not translated 2014-12-11 12:42:21 +01:00
Vincent Petry 745d8706b9 Add user parameter to tag manager 2014-12-11 12:22:28 +01:00
Jan-Christoph Borchardt b33d8a3d60 Merge pull request #12776 from owncloud/fix-go-ago
year go -> year ago
2014-12-11 11:48:23 +01:00
Thomas Müller c5e279e416 year go -> year ago 2014-12-11 11:30:00 +01:00
Thomas Müller acc9af8fc9 Merge pull request #12738 from owncloud/cleanup-build-dir
cleaning up the build directory
2014-12-11 08:31:54 +01:00
Jenkins for ownCloud dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Lukas Reschke 9ea205dc3d Check if open_basedir is set
The file:// protocol does not work with curl when an open_basedir is set.

This fixes https://github.com/owncloud/core/issues/12016
2014-12-11 00:09:55 +01:00
Lukas Reschke d84a1f6f3a Add IniGetWrapper to public interface 2014-12-11 00:09:55 +01:00
Morris Jobke bf9d4d425d update 3rdparty submodule 2014-12-10 22:36:20 +01:00
Morris Jobke 44aa94be3d Merge pull request #12742 from owncloud/fix-pear.php
Update 3rdparty to add PEAR.php back
2014-12-10 22:35:04 +01:00
Lukas Reschke 39b4888109 Merge pull request #12761 from owncloud/error-details2
improve update error page: remove box, make link visible, insert missing space, remove line break
2014-12-10 19:52:22 +01:00
Morris Jobke e2c51308df Merge pull request #12758 from owncloud/fix-config-doc-block
Add type of the variables to the docs
2014-12-10 17:22:36 +01:00
Thomas Müller 6143232da6 Merge pull request #12746 from owncloud/skip-longpath-test-again
skip testLongPath()
2014-12-10 17:22:04 +01:00
Thomas Müller 80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Vincent Petry 5101bc54fa Add login/logout to TestCase base class 2014-12-10 16:11:27 +01:00
Joas Schilling bef7392c4c Add type of the variables to the docs 2014-12-10 15:18:06 +01:00