1cb4f1080a
Merge pull request #19288 from RealRancor/restruct_config_sample_master
...
Restructure config.sample.php of master
2015-10-13 10:18:35 +02:00
06aaa059d1
Squash collection shares
...
If folder1 is shared to user2 and user3. And folder1/folder2 is shared
to user4 and user5 then getting all the users with access to
folder1/folder2 should only list user2 and user 3 once.
Previously this was done twice since we request the info two times.
This fix makes sure that we only append unique results to the array.
* Added test
2015-10-13 10:05:49 +02:00
b2ae4cab52
Restructure config.sample.php of master
2015-10-13 09:38:28 +02:00
585e9cb0e9
Return path instead of itemsource
...
Fixes #19678
Errors should contain paths and not internal ids
2015-10-13 09:00:33 +02:00
1f146d678c
[tx-robot] updated from transifex
2015-10-13 01:55:06 -04:00
b9e515bfeb
Merge pull request #19723 from owncloud/strip-directory
...
Strip directory from scriptName
2015-10-13 00:58:06 +02:00
a743ceb8d5
Merge pull request #19719 from owncloud/edit-icon
...
add specific edit icon
2015-10-13 00:54:25 +02:00
e03f0542e4
Strip directory from scriptName
...
`\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
2015-10-12 23:39:16 +02:00
81cd823c2a
add specific edit icon
2015-10-13 09:42:32 +13:00
3444d62063
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
...
This reverts commit 0738ddfb76
2015-10-12 16:21:27 +02:00
47475f3b4c
Debounce cancel upload message
2015-10-12 15:11:52 +02:00
64a8d01694
Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypes
...
Do not update mime types for folders with extension
2015-10-12 15:08:19 +02:00
eb445103e9
Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounce
...
Revert "Debounce cancel upload message"
2015-10-12 14:56:23 +02:00
5108f48c97
Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionposition
...
Revert "Move trashbin specific CSS that modifies sidebar"
2015-10-12 14:55:51 +02:00
8a35034b4c
Merge pull request #19704 from owncloud/fix_17997
...
also detect files in a .part folder as part file
2015-10-12 14:34:57 +02:00
0738ddfb76
Revert "Move trashbin specific CSS that modifies sidebar"
2015-10-12 13:59:29 +02:00
8185eaa6dd
also detect files in a .part folder as part file
2015-10-12 13:59:16 +02:00
0036c637fc
Merge pull request #19657 from owncloud/setup-transport
...
Setup sendmail transport
2015-10-12 13:44:26 +02:00
4b1f2eb37e
Merge pull request #19702 from owncloud/trash-deletesectionposition
...
Move trashbin specific CSS that modifies sidebar
2015-10-12 16:18:06 +05:30
783971422c
Move trashbin specific CSS that modifies sidebar
...
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
2015-10-12 11:39:04 +02:00
aedb7a7e70
Revert "Debounce cancel upload message"
2015-10-12 11:30:15 +02:00
6b71efb2b1
Make trashbin's "Restore" an inline action
2015-10-12 11:27:23 +02:00
179c0be158
Merge pull request #19628 from owncloud/files-canceluploaddebounce
...
Debounce cancel upload message
2015-10-12 10:54:58 +02:00
e16ac12f5a
[tx-robot] updated from transifex
2015-10-12 01:54:59 -04:00
d29d018cc7
[tx-robot] updated from transifex
2015-10-11 01:54:58 -04:00
f49c1039c4
refs #18241 Make the 'please reload this page' a clickable link
2015-10-10 14:14:01 -04:00
188acd5e4e
[tx-robot] updated from transifex
2015-10-10 01:55:32 -04:00
e3a148584a
adjust fetchList with a single requested attribute accordingly
2015-10-09 20:07:35 +02:00
8098c06e70
Do not update mime types for folders with extension
...
Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
2015-10-09 18:16:36 +02:00
5b1706e8d8
Merge pull request #19585 from owncloud/enc_improve_introduction
...
improved initial explanation/warning if the admin enabled encryptrion
2015-10-09 15:57:44 +02:00
a587a667b9
Merge pull request #19670 from owncloud/objectstore_filesystem_tests
...
adjust filesystem tests to objectstore
2015-10-09 15:41:09 +02:00
d127b3f0d2
adjust tests
2015-10-09 14:30:49 +02:00
2fddb1367a
fix primary group retrieval
2015-10-09 14:12:59 +02:00
8cbf76755e
Merge pull request #19643 from owncloud/public-download-spinner
...
Set download cookie on public download
2015-10-09 14:10:29 +02:00
4cb5970947
Always pass in ILogger
2015-10-09 14:08:22 +02:00
bd21e5925c
Clean code
2015-10-09 13:46:59 +02:00
38143d670b
Catch exceptions during app upgrade - fixes #16240
2015-10-09 13:44:30 +02:00
a42dd117e2
Merge pull request #19654 from owncloud/db-locking-no-scan-transaction
...
Dont use a transaction in the scanner while using db based locking
2015-10-09 12:38:54 +02:00
c8640cdcb0
adjust filesystem tests to objectstore
2015-10-09 12:35:37 +02:00
18ad60380c
Merge pull request #18586 from owncloud/ie8-uploadavatar
...
Fix uploading avatar and root certs in IE8
2015-10-09 11:30:53 +02:00
14591d9df7
Use injected request
2015-10-09 11:19:06 +02:00
bf579a153f
fix IE8 user agent detection
2015-10-09 11:19:06 +02:00
c7aef6c368
Fix uploading avatar and root certs in IE8
2015-10-09 11:19:05 +02:00
5cb83937fa
[tx-robot] updated from transifex
2015-10-09 01:55:02 -04:00
020bb33150
Merge pull request #19034 from owncloud/http-request-warning
...
Prevent warning decoding content
2015-10-08 21:51:47 +02:00
3130438fcc
Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores
...
make mkdir recursive, add phpdoc to api
2015-10-08 21:28:53 +02:00
a876efda50
treat dn as any other attribute when building the search() return array
2015-10-08 21:18:34 +02:00
ef4278cfa9
Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabled
...
Don't perform checks for outdated TLS libs when no internet connection
2015-10-08 21:09:30 +02:00
dd2e887a8d
adjust handling changed return array structure from search() and fetchList()
2015-10-08 20:32:15 +02:00
12181aa6de
Don't perform checks for outdated TLS libs when no internet connection
...
This change makes the check return a positive result when:
- The instance has been configured to not use the internet
AND/OR
- S2S AND the appstore is disabled
2015-10-08 18:26:03 +02:00
Thomas Müller
Roeland Jago Douma
RealRancor
Jenkins for ownCloud
Lukas Reschke
Jan-Christoph Borchardt
Vincent Petry
Björn Schießle
Bjoern Schiessle
Raghu Nayyar
Robin Appelman
Colin Hutchinson
Arthur Schiwon
Jörn Friedrich Dreyer
Morris Jobke