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

23996 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
1bd141b655 Merge pull request #15158 from owncloud/fix-failing-master 
Fix failing master unit tests
 2015-03-24 17:54:11 +01:00
Joas Schilling
8c33f05e93 Merge the two tests into one 2015-03-24 17:26:38 +01:00
Joas Schilling
7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke
2370af62ea Merge pull request #14998 from rullzer/ocs_api_new_url 
OCS API should return fancy OC url
 2015-03-24 17:04:31 +01:00
Lukas Reschke
5a9c9b86f8 Merge pull request #15153 from owncloud/uniquename-node 
Add `getNonExistingName()` to the node api
 2015-03-24 15:51:12 +01:00
Morris Jobke
5e9e2b700d Merge pull request #15112 from owncloud/security-warning-section 
consolidate all admin warnings and notices into one section
 2015-03-24 15:46:04 +01:00
Morris Jobke
1e26d731b9 Merge pull request #15156 from owncloud/file-summary-align 
correctly align file list summary when the list has the favorite feature
 2015-03-24 15:44:19 +01:00
Jan-Christoph Borchardt
7ea061e6f0 correctly align file list summary when the list has the favorite feature 2015-03-24 15:26:17 +01:00
Morris Jobke
968fca8b55 Merge pull request #15048 from owncloud/avatar-crop-square 
round width and height when cropping avatar
 2015-03-24 15:23:14 +01:00
Jan-Christoph Borchardt
6d384e5f7c consolidate all admin warnings and notices into one section 2015-03-24 15:21:49 +01:00
Jan-Christoph Borchardt
fcac7d8c13 double padding to account for Deleted files entry, issue with Firefox 2015-03-24 15:14:20 +01:00
Morris Jobke
965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share 
"Integrity constraint violation" when sharing the same item twice with the same user
 2015-03-24 15:05:58 +01:00
Robin Appelman
d11f01fa0f Add getNonExistingName() to the node api 2015-03-24 15:00:36 +01:00
Daniel Hansson
cc2092a511 Merge pull request #15151 from owncloud/use-local-time 
Don't use hardcoded date and time
 2015-03-24 14:31:36 +01:00
Vincent Petry
331f0196e0 Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption 
Remove range header exception for encryption
 2015-03-24 14:29:01 +01:00
Morris Jobke
a039768685 Merge pull request #15127 from owncloud/admin-tips-jenkins 
add Tips & tricks section to admin settings
 2015-03-24 14:18:33 +01:00
Morris Jobke
92791bb8ba Merge pull request #15126 from owncloud/sabre-storagenotavailable 
Soft fail in CustomPropertiesBackend whenever storage not available
 2015-03-24 14:01:47 +01:00
Joas Schilling
5e71d1558a Merge pull request #15149 from owncloud/fix-enable-for-group 
Correctly get array of groups and send OCP\IGroup objects to enable meth...
 2015-03-24 13:50:56 +01:00
Daniel Hansson
8ee1fa98df Don't use hardcoded date and time 
Use local time instead. http://momentjs.com/
 2015-03-24 13:41:55 +01:00
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
dratini0
d4e5ef4f38 Removed simplified X-accel-redirect even further 2015-03-23 17:51:12 +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
dratini0
c432b52c74 Changed the disputed while loop to a single if. 2015-03-23 16:12:03 +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