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

22632 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lukas Reschke
744cf713f7 Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description 
replace line breaks in the app description by spaces - fixes #13315
 2015-01-17 01:03:41 +01: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
Robin McCorkell
08d118eab7 Merge pull request #13421 from owncloud/fix-rename 
Fixes shifted rename field
 2015-01-16 19:15:48 +00:00
Morris Jobke
1b81339dfd Drop the hide and show of new users in user list 
* causes the first load after the initial load to hide some users in the viewport
  and showing them again, but with a scrolled up viewport
* causes higher load for nearly never visible effects
* fixes #12962
 2015-01-16 18:11:31 +01:00
Vincent Petry
40931a8b0d Fix getItemSharedWithUser for groups 
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
 2015-01-16 18:11:13 +01:00
Morris Jobke
48ad4ba9a0 Fixes shifted rename field 2015-01-16 17:32:18 +01:00
Morris Jobke
3465604cf9 Merge pull request #13418 from owncloud/app-icons 
add icon for Provisioning API
 2015-01-16 15:22:44 +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
Morris Jobke
9526acbcc4 Merge pull request #13413 from owncloud/apps-cancelloadonswitch 
Cancel app list load when switching categories
 2015-01-16 13:42:40 +01:00
Morris Jobke
0f0204ee35 Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfile 
Disable part files for OC ext storage backend + s2s backend
 2015-01-16 13:38:59 +01:00
Morris Jobke
27c31de8df Merge pull request #13412 from owncloud/app-management-sort 
sorting enabled and disabled apps alphabetically - fixes #13404
 2015-01-16 13:17:41 +01:00
Sergei Shuykov
4d2ae71bf2 fix_#11348 Safari rename button positioning 2015-01-16 14:43:34 +03:00
Vincent Petry
6e20a408b4 Cancel app list load when switching categories 2015-01-16 12:23:02 +01:00
Thomas Müller
d3cd2b3e0f sorting enabled and disabled apps alphabetically - fixes #13404 2015-01-16 12:07:08 +01:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Frank Karlitschek
696d9dc98e Merge pull request #13406 from owncloud/fix-php-doc 
Fix PHPDoc
 2015-01-15 20:35:30 -05:00
Lukas Reschke
a1e92d61b3 Fix PHPDoc 2015-01-15 22:50:42 +01:00
Thomas Müller
051f626617 Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkins 
Mask table and column names with backticks and add lastInsertID() workar...
 2015-01-15 22:41:57 +01:00
Thomas Müller
0ebcc2d4f9 Merge pull request #13394 from owncloud/cache-remove-folder 
Remove children from the cache in one query
 2015-01-15 22:33:06 +01:00
Lukas Reschke
2426729ad4 Merge pull request #13395 from owncloud/show-readonly-mail 
Show mail address & display name if it is read only
 2015-01-15 22:08:23 +01:00
Lukas Reschke
1b671afa17 Merge pull request #13323 from owncloud/move-search 
Move search to core/search
 2015-01-15 20:41:57 +01:00
Lukas Reschke
9b4d5b502f Merge pull request #13397 from owncloud/files-greyhighlightondownload 
Fix for sticky grey highlight / selection in file list
 2015-01-15 20:32:42 +01:00
Robin Appelman
0a3e0a1665 Additional unit test for recursive remove 2015-01-15 18:47:05 +01:00
Vincent Petry
a76f0a0ba7 Fix preview route for trashbin 2015-01-15 18:45:24 +01:00
Vincent Petry
7f24e77cfc Disallow ctrl click to select when selection not allowed 2015-01-15 18:16:27 +01:00
Vincent Petry
d40301492d Auto-blur when clicking on file to download 2015-01-15 18:08:36 +01:00
Vincent Petry
7d81299014 Fixed thumbnal z-index for when no checkbox is there 
In file lists with no selection checkbox, the CSS selector is different.
The thumbnail also needs position:absolute and a z-index to be displayed
above the row's grey highlight.
 2015-01-15 17:53:23 +01:00
Morris Jobke
022b698475 Show mail address & display name if it is read only 
* gives the user the chance to verify it's mail address
  and display name
* ref #12823
* fixes #13393
 2015-01-15 17:51:54 +01:00
Robin Appelman
2248e465af Remove children from the cache in one query 2015-01-15 17:26:12 +01:00
Morris Jobke
36ced1f002 Merge pull request #13388 from owncloud/type-hint-url-params 
Add PHPDoc for `urlParams`
 2015-01-15 16:00:48 +01:00
Morris Jobke
3ce71b73c8 Merge pull request #13387 from owncloud/fix-urlparameters 
always set url parameters when they are available in the app dispatch
 2015-01-15 15:33:55 +01:00
Bernhard Posselt
bb0c88a577 always set url parameters when they are available in the app dispatch 
prefer url parameters passed into the main method. If they are not present, use the containers urlParameters

add space
 2015-01-15 15:22:52 +01:00
Joas Schilling
6769adcd0d Mask table and column names with backticks and add lastInsertID() workaround 2015-01-15 14:43:06 +01:00
Lukas Reschke
0da08bdb2c Add PHPDoc for urlParams 2015-01-15 14:42:44 +01:00
Arthur Schiwon
56ba07aa5c coding style 2015-01-15 12:25:36 +01:00
Thomas Müller
2fbe8bbcba Merge pull request #13370 from Sugaroverdose/fix_#13322 
Force browser to redraw favorite icon on src change
 2015-01-15 11:20:22 +01:00
Morris Jobke
9b7c1a0093 Merge pull request #13347 from owncloud/share-scanpermissionsfromsource 
Use source storage permissions when scanning shared storage
 2015-01-15 11:15:15 +01:00
Morris Jobke
8666d1d855 Merge pull request #13375 from owncloud/previews 
Note in config.sample.php that certain previews are not available in ms ...
 2015-01-15 11:07:36 +01:00
Carla Schroder
2a5cbd7eca Note in config.sample.php that certain previews are not available in ms windows 2015-01-15 11:07:14 +01:00
Sugaroverdose
b2de3b3d8d Force browser to redraw favorite icon 
on src change
 2015-01-15 12:26:55 +03:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Robin McCorkell
9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key 
HHVM: Do not use key() on array as the result depends on the internal array pointer.
 2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Morris Jobke
925a680a24 Merge pull request #13354 from owncloud/hhvm-redis 
HHVM: Prevent E_WARNING messages by Redis test in console output.
 2015-01-15 00:23:12 +01:00