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

9618 commits

Author SHA1 Message Date
Joas Schilling
d6939d67da Remove duplicated definition of APIController 2015-01-26 10:20:01 +01:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Bjoern Schiessle
73a058e301 by default send mail for new server-to-server share 2015-01-23 21:59:07 +01:00
Joas Schilling
7e6d2c73d2 Ignore favorites that are not available when creating the favorites list 
Also correctly return the exception for all cases when adding/removing favos
 2015-01-23 10:11:14 +01:00
Jenkins for ownCloud
bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Jenkins for ownCloud
5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Morris Jobke
c931eafc1f Merge pull request #13517 from owncloud/keymanager-storage 
Bypass the view when storing encryption keys
 2015-01-22 00:41:48 +01:00
Morris Jobke
4dac664002 Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins 
[ignore] delete all server-to-server shares if a user gets deleted
 2015-01-22 00:37:39 +01:00
Lukas Reschke
762949afd9 Make naming of encryption app consistent 
Fixes https://github.com/owncloud/core/issues/13580
 2015-01-21 23:29:09 +01:00
Bjoern Schiessle
7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Thomas Müller
8ba42abbe4 Merge pull request #13432 from owncloud/animate_gifs_public_sharing 
show animated gifs on public sharing page
 2015-01-21 17:09:46 +01:00
Thomas Müller
9921308c62 Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog 
External share dialog must properly read entered password
 2015-01-21 16:51:56 +01:00
Vincent Petry
c48307027c Fixed external cache test namespace 2015-01-21 15:52:56 +01:00
Vincent Petry
9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Vincent Petry
f3d696599a Add unit test for external share JS dialog 
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
 2015-01-21 11:26:54 +01:00
Vincent Petry
23ea45760f External share dialog must properly read entered password 2015-01-21 11:26:36 +01:00
Jenkins for ownCloud
b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Lukas Reschke
2ed2a7c7a8 Merge pull request #13520 from owncloud/fix-comparison-op 
this must be larger then (>), since buggy behaviour occurs when the para...
 2015-01-20 20:15:04 +01:00
Arthur Schiwon
9cb1ef5675 this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-20 17:50:53 +01:00
Robin Appelman
750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +01:00
Thomas Müller
87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Morris Jobke
870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth 
Prioritise Basic Auth header over Cookie
 2015-01-19 22:23:02 +01:00
Georg Ehrke
374ddbff55 show animated gifs on public sharing page 2015-01-19 16:20:06 +01:00
Morris Jobke
2229290cca fix typo of blog -> changed to block 
* fixes #13460
 2015-01-19 15:57:53 +01:00
Thomas Müller
1810ea2d33 Merge pull request #13461 from owncloud/remove-strip-slashes 
Remove stripslashes() from newfolder.php
 2015-01-19 14:47:34 +01:00
Lukas Reschke
003fc183a2 Remove stripslashes() from newfolder.php 2015-01-19 14:12:36 +01:00
Morris Jobke
cd4c7fd11f Merge pull request #13377 from owncloud/trashbin_storage_wrapper 
[trashbin] replace hook with storage wrapper
 2015-01-19 13:17:52 +01:00
Thomas Müller
d75af7ddd2 Merge pull request #13362 from owncloud/fix-11442 
LDAP Wizared: update user or group count only, when the multiselect is closed
 2015-01-19 12:22:24 +01:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Morris Jobke
aff22b3225 Merge pull request #13276 from Sugaroverdose/fix_#11348 
fix safari rename button positioning #11348
 2015-01-18 21:42:06 +01:00
Lukas Reschke
48126c3f54 Merge pull request #13433 from owncloud/favoritesl10n 
fix unlocalized favorites browser title and alttext
 2015-01-18 20:36:19 +01:00
Thomas Müller
3d6f4ac24e Merge pull request #13457 from owncloud/enc-skippartfiles 
Skip stray part files during initial encryption
 2015-01-19 14:40:21 +01:00
Vincent Petry
7a1ab3bb5e Add class attribute types in encryption Util class 2015-01-19 13:01:52 +01:00
Vincent Petry
7c3c26ab94 Skip stray part files during initial encryption 2015-01-19 13:01:37 +01:00
Jenkins for ownCloud
31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Volkan Gezer
d253ef51a5 fix unlocalized favorites browser title and alttext 2015-01-17 16:52:36 +01:00
Lukas Reschke
dfbc405a45 Prioritise Basic Auth header over Cookie 
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.

This patch adds a workaround the following way:

1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth

Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.

This requires proper testing also considering LDAP / Shibboleth and whatever instances.
 2015-01-17 13:29:07 +01:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Sugaroverdose
141908bd9c Add ie8 text-overflow: ellipsis support 
minimum browser window width ≈ 1280px
 2015-01-17 01:43:42 +03:00
Sugaroverdose
b2879d3a99 use some magic to make 'popular browsers' work 
as expected with inline-block span
 2015-01-16 23:36:35 +03:00
Morris Jobke
48ad4ba9a0 Fixes shifted rename field 2015-01-16 17:32:18 +01:00
Jan-Christoph Borchardt
b81c89d400 compress icons of LDAP and WebDAV-Auth 2015-01-16 14:43:27 +01:00
Jan-Christoph Borchardt
7624b395f2 add icon for Provisioning API 2015-01-16 14:43:14 +01:00
Morris Jobke
1c4668f808 Merge pull request #13399 from owncloud/trashbin-fixpreviewroute 
Fix preview route for trashbin
 2015-01-16 13:48:02 +01:00
Sergei Shuykov
4d2ae71bf2 fix_#11348 Safari rename button positioning 2015-01-16 14:43:34 +03:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Vincent Petry
a76f0a0ba7 Fix preview route for trashbin 2015-01-15 18:45:24 +01:00