wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26435 commits 157 branches 562 tags 714 MiB
Commit graph

26435 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
170259e840 Fix files select bar width when app sidebar is visible 2015-08-18 11:30:00 +02:00
Vincent Petry
730f1d199a Fix spinner when deleting all files in a folder 2015-08-18 11:14:41 +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
Morris Jobke
e350a8bfd0 fixing the unit tests 2015-08-17 16:36:00 +02:00
Robin Appelman
5514a133de update icewind/smb to 1.0.4 2015-08-17 16:31:29 +02:00
Vincent Petry
009c008ed8 Fix file drag and drop JS error 2015-08-17 16:09: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
Joas Schilling
49ba7dc05d Mark ldap agent password as sensitive 2015-08-14 09:07:07 +02:00
Bernhard Posselt
4e327d058c Merge pull request #18090 from owncloud/keep-ocs-status-code-in-sync 
[OCS] With V2 we should ensure that the status codes are kept in sync
 2015-08-14 08:59:08 +02:00
Lukas Reschke
df2ce8a075 Remove search box $_POST since it is unused 2015-08-14 01:31:32 +02:00
Lukas Reschke
8313a3fcb3 Add mitigation against BREACH 
While BREACH requires the following three factors to be effectively exploitable we should add another mitigation:

1. Application must support HTTP compression
2. Response most reflect user-controlled input
3. Response should contain sensitive data

Especially part 2 is with ownCloud not really given since user-input is usually only echoed if a CSRF token has been passed.

To reduce the risk even further it is however sensible to encrypt the CSRF token with a shared secret. Since this will change on every request an attack such as BREACH is not feasible anymore against the CSRF token at least.
 2015-08-14 01:31:32 +02:00
Morris Jobke
1f96fb3352 Merge pull request #18279 from owncloud/fix-ldap-proxy-everyonecount 
also don't count group members when more than 1 ldap configs are active
 2015-08-13 17:18:09 +02:00
Jan-Christoph Borchardt
4e53b5922d Merge pull request #18178 from owncloud/files-sidebar-actions 
Sidebar file actions
 2015-08-13 17:17:10 +02:00
Robin Appelman
00deffdd47 update icewind/smb to 1.0.3 2015-08-13 16:28:44 +02:00
Morris Jobke
af7ffe5492 Merge pull request #18262 from owncloud/add-basic-tests-for-scanners 
Add a basic unit test which notifies us about incompatible extending
 2015-08-13 15:36:17 +02:00
Arthur Schiwon
571e99b152 also don't count group members when more than 1 ldap configs are active 2015-08-13 14:44:17 +02:00
Joas Schilling
20d8576d3d Fix config map provider for tests 2015-08-13 13:07:49 +02:00
Joas Schilling
70504920e7 Fix default values of sharing capabilities 
The problem is the UI used a different default than the capabilities.
So when you never touched the config, the setting in admins said "disabled"
while the capabilities said "enabled".
 2015-08-13 12:46:52 +02:00
Joas Schilling
acc452ae74 Add a basic unit test which notifies us about incompatible extending 2015-08-13 11:38:10 +02:00