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

30669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
2ec1c738d0 Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids 
Make sure we can store strings as per the interface
 2016-02-24 12:15:23 +01:00
Thomas Müller
4124d909b6 Merge pull request #22565 from owncloud/avoid-scanning-root-storage 
Avoids scanning the root storage
 2016-02-24 12:14:39 +01:00
Thomas Müller
fbc5a44f77 Merge pull request #22549 from owncloud/issue-20470-yellow-warning-for-user-and-group-errors 
Use the notification instead of the disruptive popup for settings/users errors
 2016-02-24 12:14:22 +01:00
Thomas Müller
0d715c1184 Merge pull request #20876 from owncloud/reproducing-test-for-20686 
Behat test for update of a shared file
 2016-02-23 16:08:14 +01:00
Thomas Müller
9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries 
Allow defining a limit and offset for getObjectIdsForTags
 2016-02-23 15:02:08 +01:00
Morris Jobke
45e247594a Add a test that reproduces #20686 
* user with a quota of 0 gets a file shared and can't update this file
  because the wrong quota is used to verify if the update is allowed
 2016-02-23 14:50:24 +01:00
Thomas Müller
fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search 
Case insensitive contact search
 2016-02-23 10:48:38 +01:00
Thomas Müller
3adb9392c5 Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ci 
Add verbose flag to occ commands of autotest*
 2016-02-23 10:47:55 +01:00
Thomas Müller
a3d1b2637d Merge pull request #22516 from owncloud/core-cumulativenotifications 
Accumulate notifications instead of blinking
 2016-02-23 10:36:34 +01:00
Thomas Müller
59acc53483 Merge pull request #22551 from owncloud/make-exceptions-easier-to-debug 
Throw normal exceptions instead of eating them
 2016-02-23 10:23:03 +01:00
Joas Schilling
5d1cabe0f6 Add verbose flag to occ commands of autotest* 2016-02-23 09:31:31 +01:00
Joas Schilling
3a65bdf4d5 Fix dav unit tests 2016-02-23 09:04:15 +01:00
Joas Schilling
fb8b34bdd0 Allow defining a limit and offset for getObjectIdsForTags 2016-02-23 09:04:15 +01:00
Joas Schilling
8754ea6c8a Make sure we don't quote column names twice 2016-02-23 08:50:52 +01:00
Thomas Müller
83d5080e78 Merge pull request #22581 from owncloud/fix_interface 
since 9.0 we have a additional parameter $position used for integrity…
 2016-02-22 20:20:33 +01:00
Thomas Müller
4dfdb2720c Case insensitive search in contacts - fixes #22575 2016-02-22 19:47:10 +01:00
Thomas Müller
4537eaac41 Add ILIKE support to querybuilder 2016-02-22 19:46:37 +01:00
Thomas Müller
d45314beda Merge pull request #22570 from owncloud/make-method-non-public 
Make FilesReportPlugin::processFilterRules non-public
 2016-02-22 18:39:10 +01:00
Bjoern Schiessle
33ec70d57e since 9.0 we have a additional parameter $position used for integrity checks 2016-02-22 18:25:01 +01:00
Vincent Petry
e37372e883 Remove unused update-notification style 2016-02-22 17:25:32 +01:00
Vincent Petry
27544144ce Fix unit tests affected by side effects 
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.

Since now we're restoring the clock properly, the other tests were fixed
to still work.
 2016-02-22 17:25:32 +01:00
Vincent Petry
8ea80e114a Accumulate notifications instead of blinking 
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
 2016-02-22 17:25:32 +01:00
Morris Jobke
8c77fdef3e Avoids scanning the root storage 
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.

Fixes #22501
 2016-02-22 16:43:47 +01:00
Joas Schilling
24c7f38a00 Make sure we can store strings as per the interface 2016-02-22 15:43:20 +01:00
Joas Schilling
a0d0edc754 Make non-public-method protected 2016-02-22 15:26:59 +01:00
Thomas Müller
6f29949bca Merge pull request #22527 from wern/master 
Moved set -e option to enable executable checks again
 2016-02-22 14:15:12 +01:00
Thomas Müller
f3b13c7656 Merge pull request #22536 from owncloud/add-integration-tests-for-tags 
Add integration tests for tags plus fix permissions
 2016-02-22 14:14:51 +01:00
Thomas Müller
a70421ff2f Merge pull request #22552 from owncloud/fix-avconv-preview-parameters 
Move `-an` after the input arg because it is an output option
 2016-02-22 14:14:35 +01:00
Thomas Müller
3a20d84def Merge pull request #22554 from owncloud/fix_22550 
We should check for exceptions when trying to get the avatar
 2016-02-22 14:14:15 +01:00
Thomas Müller
7f2b3dbfd2 Merge pull request #22555 from owncloud/jenkins-19978 
Show username when writing "Insufficient storage" into owncloud.log
 2016-02-22 14:13:59 +01:00
Thomas Müller
3a0c4d11d9 Merge pull request #22561 from owncloud/ie-publicpagefooter 
Fix public page footer position in IE
 2016-02-22 14:13:42 +01:00
Vincent Petry
642190f333 Fix public page footer position in IE 
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
 2016-02-22 11:26:50 +01:00
Vincent Petry
43a4990f09 Merge pull request #22548 from owncloud/fix-pagination-in-ie 
Fixes pagination in IE
 2016-02-22 10:29:10 +01:00
Roeland Jago Douma
fe08b5e9d9 We should check for exceptions when trying to get the avatar 
Fixes #22550

* Updated phpdoc of avatatmanager
* Add unit test
 2016-02-22 10:14:14 +01:00
Pierre Jochem
1a8a667863 Solution for Proposal #19974 
Show username when writing into owncloud.log
 2016-02-22 10:02:45 +01:00
Lukas Reschke
6c96b3d07f Throw normal exceptions instead of eating them 
Partially addresses https://github.com/owncloud/core/issues/22550

Replaces https://github.com/owncloud/core/pull/20185
 2016-02-22 09:41:56 +01:00
Joas Schilling
2865ccfdc4 Move -an after the input arg because it is an output option 2016-02-22 09:40:46 +01:00
Joas Schilling
04da5a56dd Use the notification instead of the disruptive popup 2016-02-22 09:29:13 +01:00
Morris Jobke
3e59c04c7f Fixes pagination in IE 
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
 2016-02-22 08:55:20 +01:00
Thomas Müller
8a8209796d Merge pull request #22526 from owncloud/fix-english-texts 
Fix error in source language strings
 2016-02-21 00:03:22 +01:00
Lukas Reschke
3bd95cca6b Check if user has permission to create such a tag 
Fixes https://github.com/owncloud/core/issues/22512
 2016-02-19 20:45:20 +01:00
Lukas Reschke
c13259cf9e Add integration tests for tags 2016-02-19 20:45:20 +01:00
Lukas Reschke
357cdfd07f Merge pull request #22511 from owncloud/add-integration-tests-for-comments 
Add integration tests for comments
 2016-02-19 18:10:30 +01:00
Lukas Reschke
16be9af20a Add integration tests for comments 
This adds integration tests for the comments. Especially with regard to the permission handling, didn't find any problem in it.

Fixes https://github.com/owncloud/core/issues/22367
 2016-02-19 18:08:34 +01:00
Thomas Müller
32e4256945 Merge pull request #22529 from owncloud/tags-style 
improve tags interface styling
 2016-02-19 16:17:37 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500 
When (re-)sharing an incomming federated share set the corrent owner
 2016-02-19 16:07:43 +01:00
Thomas Müller
fb38625741 Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename 
Check delete permission before attemping copy+delete
 2016-02-19 16:06:55 +01:00
Thomas Müller
b5281b61ed Merge pull request #22410 from owncloud/fix_22119 
Do not copy skeleton on avatar access
 2016-02-19 16:06:40 +01:00
Jan-Christoph Borchardt
5d914d6980 improve tags interface styling 2016-02-19 15:40:10 +01:00
Andreas Schubert
12f2525d4f moved set -e after executable checking with which as old position off set -e stopped the script at this point without any error message 2016-02-19 15:16:04 +01:00