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

23698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
302c19067a Merge pull request #15145 from owncloud/fix-15097-master 
Properly catch whether a share is `null`
 2015-03-24 13:37:47 +01:00
Jan-Christoph Borchardt
83580d08eb Merge pull request #15143 from owncloud/24h-time-format 
Use 24h format instead of 12h format
 2015-03-24 13:30:52 +01:00
Vincent Petry
46475bf580 Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list 
Do not walk over the users directory, but over the list of tagged objects
 2015-03-24 13:26:59 +01:00
jknockaert
a1b68b5a48 Remove range header exception for encryption 
revert #10422
 2015-03-24 13:19:49 +01:00
Morris Jobke
c8af615c01 Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list 
Issue/15138 feedback for empty apps list
 2015-03-24 13:02:56 +01:00
Joas Schilling
b262c30fa9 Correctly get array of groups and send OCP\IGroup objects to enable method 2015-03-24 12:56:42 +01:00
Robin Appelman
d46b7d73e7 when the path doesnt exist show a proper error page 2015-03-24 12:21:25 +01:00
Morris Jobke
e07a2fd8a2 Merge pull request #15012 from Volker-E/master 
fixing #15011 by adding ARIA roles where distinct
 2015-03-24 12:07:26 +01:00
Joas Schilling
17fbffceeb Use the same style when no search result was found 2015-03-24 11:29:29 +01:00
Joas Schilling
f2be172ae8 Do not duplicate the empty content css 2015-03-24 11:29:29 +01:00
Joas Schilling
c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Lukas Reschke
e2453d78c0 Properly catch whether a share is null 
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.

To test this perform the following steps:

* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.

This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.

Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.

Fixes https://github.com/owncloud/core/issues/15097
 2015-03-24 11:21:58 +01:00
Daniel Hansson
946a7c3a83 Use 24h format instead of 12h format 
Use correct time format in WebUI
 2015-03-24 11:20:20 +01:00
Vincent Petry
ce5d2ab7db Revert "Change to 24H format instead of 12H format" 
This reverts commit 8279dde97a.
 2015-03-24 11:08:53 +01:00
Jenkins for ownCloud
9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
Daniel Hansson
8279dde97a Change to 24H format instead of 12H format 
Update how the time shows in WebUI.

My first PR to core, woha. :)
 2015-03-23 22:05:44 +01:00
Morris Jobke
10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold 
unbold share email sent notification
 2015-03-23 18:57:20 +01:00
Thomas Müller
e8d12c1809 Merge pull request #15075 from owncloud/fix-15056-master 
remove unneeded status element from json response on /categories
 2015-03-23 18:30:40 +01:00
Jan-Christoph Borchardt
c2ccaf000a add Tips & tricks section to admin settings 2015-03-23 18:19:13 +01:00
blizzz
8906158d3b Merge pull request #15123 from owncloud/fix_14098 
offset needs to be considered in computed limit
 2015-03-23 17:50:24 +01:00
Vincent Petry
eb894e6625 Soft fail in CustomPropertiesBackend whenever storage not available 
When a storage is not available, it will not fail the whole call any
more but still return a usable file list.
 2015-03-23 17:41:32 +01:00
Lukas Reschke
02c0fe8d43 Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox 
Show message if upload of folder isn't allowed
 2015-03-23 17:18:46 +01:00
Morris Jobke
0adcb99110 Merge pull request #14862 from owncloud/introduce-shipped.json-master 
shipped apps are now defined in core/shipped.json - the shipped tag in i...
 2015-03-23 17:17:33 +01:00
Jan-Christoph Borchardt
fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Arthur Schiwon
7520d0fb3d offset needs to be considered in computed limit 2015-03-23 16:51:40 +01:00
Jan-Christoph Borchardt
c93e4c806a Merge pull request #15114 from owncloud/sharing-labels 
combine labels with inputs in sharing dialog, fix #14796
 2015-03-23 16:46:53 +01:00
Morris Jobke
7f2b06dfa0 Merge pull request #15120 from owncloud/ldap-occ-fix-warnings 
fix PHP warnings when using occ with some LDAP commands
 2015-03-23 16:29:27 +01:00
Jan-Christoph Borchardt
fe5597b76e Merge pull request #15118 from owncloud/user-mgmt-groups 
fix long group names overlapping in the sidebar, fix #12649
 2015-03-23 16:15:24 +01:00
Thomas Müller
79f012d262 remove unneeded status element from json response on /categories - fixes 15056 2015-03-23 15:20:06 +01:00
Arthur Schiwon
468fc675a4 fix PHP warnings when using occ with some LDAP commands 2015-03-23 15:19:41 +01:00
Thomas Müller
33cd60ab9a adding enterprise apps to shipped.json 2015-03-23 15:11:16 +01:00
Joas Schilling
1a26263123 Do not walk over the users directory, but over the list of tagged objects 
Way quicker
 2015-03-23 15:10:58 +01:00
Jan-Christoph Borchardt
23396a52cd fix long group names overlapping in the sidebar, fix #12649 2015-03-23 14:57:07 +01:00
Jan-Christoph Borchardt
5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Clark Tomlinson
0e4ba618cf Merge pull request #14383 from jknockaert/newbranch 
make encryption stream wrapper seekable
 2015-03-23 09:22:36 -04:00
Morris Jobke
98e770b68e Merge pull request #15107 from owncloud/user-mgmt-header 
fix first user mgmt header jumping around, fix #8873
 2015-03-23 14:22:16 +01:00
Thomas Müller
f64ddad29d Merge pull request #15108 from owncloud/issue/15049-iran-timezone 
The iran timezone removed the DST handling which breaks the timezone lib
 2015-03-23 14:21:47 +01:00
Joas Schilling
1686653fdd The iran timezone removed the DST handling which breaks the timezone lib 2015-03-23 14:08:47 +01:00
Morris Jobke
5ec547a05f Merge pull request #15103 from owncloud/link-personal 
link back to top on Personal page
 2015-03-23 14:03:57 +01:00
Jan-Christoph Borchardt
7079b1b434 fix first user mgmt header jumping around, fix #8873 2015-03-23 13:46:05 +01:00
Jan-Christoph Borchardt
f899d77ba5 fix capitalization in Personal settings 2015-03-23 13:42:33 +01:00
Jan-Christoph Borchardt
731c90a033 link back to top on Personal page, fix #14519 2015-03-23 13:41:40 +01:00
Jenkins for ownCloud
a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Morris Jobke
21bc8e0c81 Merge pull request #15088 from oparoz/3d-support 
Introducing 3D images support (media type)
 2015-03-22 23:14:02 +01:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Roeland Jago Douma
bdde2156da Added extra unit test 2015-03-21 09:47:07 +01:00
Roeland Jago Douma
9ce8e1ddc7 OCS API should return fancy OC url 
* Also use the URLGenerator
 2015-03-21 09:47:06 +01:00
Volker E
599ee5ce4e fixing #15023, getting comments out of HTML output 2015-03-21 07:10:46 +01:00
Jenkins for ownCloud
e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Olivier Paroz
f3fe46685b Introducing 3D images support (media type) 
So that people with 3D images can at least see a 2D picture
Full 3D support is possible via an app
 2015-03-20 22:11:42 +01:00