Vincent Petry
6c8c8a328a
No error code when app already enabled/disabled
2015-08-19 10:26:50 +02:00
Thomas Müller
0b37004808
Merge pull request #18076 from owncloud/fix-thumbnail-api-master
...
No need to url decode the file
2015-08-19 09:59:14 +02:00
Thomas Müller
9f6c33abe9
Merge pull request #18339 from owncloud/update-jquery-visibility
...
update jquery-visibility in files app
2015-08-19 09:54:05 +02:00
Morris Jobke
127b6e2f3f
Merge pull request #18374 from owncloud/router-apps
...
Only load app routes if the app has already been loaded [re-merge]
2015-08-19 09:52:09 +02:00
Thomas Müller
4c6dce220b
Merge pull request #18384 from owncloud/apps-command-returncode
...
Return error code on failure with occ app:enable/disable
2015-08-19 09:29:35 +02:00
Thomas Müller
d9172a1907
Merge pull request #14401 from owncloud/ux-s2s-ldap
...
allow login names to be used for s2s with LDAP users
2015-08-19 08:31:27 +02:00
Bernhard Posselt
69e72eeb37
Merge pull request #18390 from rullzer/fix_setupchecks
...
Move remaining setupchecks to new fomat
2015-08-18 17:10:58 +02:00
Bernhard Posselt
66d8476e9e
Merge pull request #14314 from owncloud/clean-up-ocs-code
...
Cleanup OCS code
2015-08-18 16:47:53 +02:00
Thomas Müller
99815c17d9
Merge pull request #18287 from owncloud/smb-1.0.3
...
update icewind/smb to 1.0.4
2015-08-18 16:35:20 +02:00
Vincent Petry
2411662095
Merge pull request #14825 from rullzer/avatarcontroller_node
...
AvatarController to all OCP functions/Node API
2015-08-18 16:24:23 +02:00
Morris Jobke
08aaa334cc
Merge pull request #18389 from owncloud/fix-17770
...
Fix extracting basename from path in sharing
2015-08-18 16:22:02 +02:00
Thomas Müller
d96afe956e
Merge pull request #18392 from owncloud/remote-nolog
...
Avoid logging normal exceptions in remote.php
2015-08-18 15:31:26 +02:00
Robin McCorkell
b4532028f9
Avoid logging normal exceptions in remote.php
...
When the instance needs an upgrade, or a file is not found, no logging
will occur to avoid filling up log files
2015-08-18 14:02:30 +01:00
Roeland Jago Douma
65cf4028cc
Move avatarcontroller towards Node Api
2015-08-18 14:48:19 +02:00
Roeland Jago Douma
8eefc5c4e1
Move remaining setupchecks to new fomat
2015-08-18 14:42:57 +02:00
Robin McCorkell
6e47661afd
Fix extracting basename from path in sharing
2015-08-18 13:41:47 +01:00
Morris Jobke
7b0f43efb6
Merge pull request #18381 from owncloud/public-share-fixdepsloading
...
Fix file actions menu in public page
2015-08-18 13:58:03 +02:00
Jan-Christoph Borchardt
12eec397e3
Merge pull request #17975 from owncloud/settings_admin_warning_levels
...
Settings admin warning levels
2015-08-18 13:38:08 +02:00
Vincent Petry
016cf11134
Return error code on failure with occ app:enable/disable
2015-08-18 12:48:03 +02:00
Vincent Petry
37a842a18e
Only show delete action in menu when delete permission exists
...
This reverts an older decision where we said the delete action must
always appear but be grayed out when the permission is missing.
The actions menu obsoletes that.
2015-08-18 11:35:40 +02:00
Vincent Petry
22b63ecd12
Load missing JS dep in public link page
2015-08-18 11:35:21 +02:00
Vincent Petry
ffff156965
Merge pull request #18310 from hasso/selection-string-fix
...
Fix the string counting a selected files/dirs
2015-08-18 10:43:17 +02:00
Robin McCorkell
1c26755686
Only load app routes if the app has already been loaded
2015-08-18 09:18:36 +01:00
Hasso Tepper
bbff530b65
Move decaration to the beginning of the block
2015-08-18 10:34:30 +03:00
Thomas Müller
03965053c3
Merge pull request #18364 from owncloud/config-sample-tyops
...
clean up typos in config.sample.php
2015-08-17 20:22:24 +02:00
Carla Schroder
05b738ac01
clean up typos in config.sample.php
2015-08-17 10:38:42 -07:00
Robin Appelman
5514a133de
update icewind/smb to 1.0.4
2015-08-17 16:31:29 +02:00
Hasso Tepper
97bc73ad49
Update unit test to reflect the string change
2015-08-17 15:31:44 +03:00
Hasso Tepper
72799ffba2
Move selectionVars into if statement
2015-08-17 15:28:55 +03:00
Robin McCorkell
675d852c7d
Merge pull request #17182 from owncloud/user_ini_upload_size
...
Update .user.ini when setting upload size limit
2015-08-17 13:27:47 +01:00
Thomas Müller
47e05c97a2
Merge pull request #18345 from owncloud/increase-setMailAddress-tests
...
[tests] more tests for UserController::setMailAddress
2015-08-17 12:45:50 +02:00
Thomas Müller
f50f43fd9c
Merge pull request #18343 from owncloud/degrade-log-about-missing-app
...
Degrade log message about missing app in appstore to debug
2015-08-17 12:17:41 +02:00
Morris Jobke
15da671349
[test] more tests for UserController::setMailAddress
...
* fixes #12885
2015-08-17 11:53:03 +02:00
Morris Jobke
24e20a51eb
Degrade log message about missing app in appstore to debug
...
* fixes #18154
2015-08-17 11:27:41 +02:00
Morris Jobke
01607c09b8
[Post setup checks] add proper CSS
2015-08-17 11:17:48 +02:00
Morris Jobke
51c3a3ddaf
update jquery-visibility in files app
...
* ref #12877
2015-08-17 09:39:21 +02:00
Robin McCorkell
f74416a0cb
Merge pull request #18331 from owncloud/fix-htaccess-whitespace
...
properly indent .htaccess
2015-08-16 21:15:27 +01:00
Morris Jobke
df81019a1e
properly indent .htaccess
2015-08-16 15:40:03 +02:00
Morris Jobke
5b7143885d
Merge pull request #18318 from owncloud/files-sidebar-fixtabs
...
Improve right sidebar tabs behavior
2015-08-16 12:53:50 +02:00
Thomas Müller
184b4e7d19
Merge pull request #18320 from owncloud/public_upload_capability
...
Add public upload to capability
2015-08-14 21:01:41 +02:00
Roeland Jago Douma
dce5d9b5d1
Add public upload to capability
2015-08-14 20:03:32 +02:00
Thomas Müller
72f829eb06
Merge pull request #18316 from owncloud/event-dispatcher
...
Event dispatcher
2015-08-14 19:51:23 +02:00
Thomas Müller
dfba425d68
Integration in files app to load scripts and styles on request
2015-08-14 18:04:17 +02:00
Vincent Petry
e2549fa660
Improve right sidebar tabs behavior
...
Tab heads are not rendered if only one tab.
The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
2015-08-14 16:51:04 +02:00
Thomas Müller
0b64268910
Adding EventDispatcher to IServerContainer
2015-08-14 15:40:15 +02:00
Hasso Tepper
69c550ce51
Fix the string counting a selected files/dirs
...
The old one contains untranslatable ' & ' if both files and dirs are
selected. The new code is especially designed to reuse strings from file
listing summary view (apps/files/js/filesummary.js), so no translation
is broken.
2015-08-14 14:50:25 +03:00
Lukas Reschke
a7e4785be9
Cleanup OCS code
...
This removes unused code from `OC_OCS` which nobody understood what it really was for anyways.
2015-08-14 13:42:56 +02:00
Thomas Müller
ddc7f668e5
Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-wrong-default
...
Fix default values of sharing capabilities
2015-08-14 12:23:06 +02:00
Robin Appelman
e76fc1cf38
remove travis files
2015-08-14 12:21:21 +02:00
Morris Jobke
4dbf666fdf
Merge pull request #18302 from owncloud/mark-ldap-password-as-sensitive
...
Mark ldap agent password as sensitive
2015-08-14 11:28:31 +02:00
