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

30476 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
df7280a3c7 Queries on the cards table by uri require the addressbook as well - fixes #22284 2016-02-15 14:29:24 +01:00
Thomas Müller
46b39c3465 Merge pull request #22337 from owncloud/new_reshare_no_initiator 
On backend hickups don't crash OCS output
 2016-02-15 12:02:52 +01:00
Thomas Müller
fd21bfd9e8 Merge pull request #22358 from owncloud/fix-22278 
Fix race condition when switching filter mode. Fixes #22278
 2016-02-15 12:02:35 +01:00
Thomas Müller
40188c87a1 Merge pull request #22379 from owncloud/limit-scrutinizer-scope 
Limit scope of scrutinizer to actual application code
 2016-02-15 12:02:21 +01:00
Thomas Müller
7b858d7c4a Merge pull request #22381 from owncloud/remove-not-needed-variable 
Remove not needed variable
 2016-02-15 12:02:03 +01:00
Thomas Müller
be65ba4089 Merge pull request #22383 from owncloud/better-sharee-translations 
Do not use string concatination for translations
 2016-02-15 11:16:16 +01:00
Thomas Müller
2054dbd4c8 Merge pull request #22350 from owncloud/fix_22304 
WebUI feedback when sharing
 2016-02-15 10:45:42 +01:00
Joas Schilling
c8ddbc385c Do not use string concatination for translations 2016-02-15 09:20:15 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Thomas Müller
db79799eb8 Merge pull request #22380 from owncloud/make-scrutinizer-happy 
Fix typo in PHPDoc
 2016-02-15 07:01:41 +01:00
Thomas Müller
6cfe8caadb Merge pull request #22375 from owncloud/fix_22352 
Search tags in UI case insensitive
 2016-02-15 06:59:15 +01:00
Thomas Müller
e5681bf9a1 Merge pull request #22378 from owncloud/drop-unreachable-code 
Remove unreachable code in priavte/api.php
 2016-02-15 06:55:16 +01:00
Morris Jobke
6cd3fa2ed7 Remove not needed variable 2016-02-14 21:44:53 +01:00
Morris Jobke
da06447c3b Fix typo in PHPDoc 2016-02-14 21:34:40 +01:00
Morris Jobke
25655edfa6 Limit scope of scrutinizer to actual application code 2016-02-14 21:18:56 +01:00
Morris Jobke
083240482a Remove unreachable code in priavte/api.php 2016-02-14 21:12:29 +01:00
Roeland Jago Douma
33ef240b39 Search tags case insensitive 
fixes: #22352

* Added unit tests
 2016-02-14 20:41:39 +01:00
Thomas Müller
ac367b97f0 Merge pull request #22369 from owncloud/fix-bmp-support 
Fix BMP support
 2016-02-14 11:38:40 +01:00
Morris Jobke
e60e0fe22c Fix BMP support 
* fixes #16461
 2016-02-14 09:30:27 +01:00
Jenkins for ownCloud
7061416016 [tx-robot] updated from transifex 2016-02-14 01:55:37 -05:00
Thomas Müller
296519f44a Merge pull request #22357 from owncloud/tags-hideonrename 
Properly hide tag name on rename
 2016-02-13 18:25:13 +01:00
Thomas Müller
11707dffce Merge pull request #22351 from owncloud/fix_22277 
show remote server on federated share auto-complete
 2016-02-13 18:25:04 +01:00
Thomas Müller
198d234068 Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-enabled 
Add note if integrity check is disabled
 2016-02-13 18:24:26 +01:00
Thomas Müller
0b4895bc7c Merge pull request #22343 from owncloud/check-if-admin-user 
Check if admin user
 2016-02-13 18:24:17 +01:00
Thomas Müller
248c571c56 Merge pull request #22331 from owncloud/dav-nonexisting-part 
fix getNodeForPath for non existing part files
 2016-02-13 18:24:00 +01:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Arthur Schiwon
62aac81c45 Fix race condition when switching filter mode. Fixes #22278 2016-02-12 21:51:06 +01:00
Vincent Petry
649d40f4d8 Properly hide tag name on rename 2016-02-12 21:27:28 +01:00
Thomas Müller
b5bf32bc34 Merge pull request #22354 from owncloud/only-register-when-available 
Only register admin page when update is available
 2016-02-12 19:39:56 +01:00
Lukas Reschke
ab5768f7dd Only register admin page when update is available 
Fixes https://github.com/owncloud/core/issues/22353
 2016-02-12 18:45:42 +01:00
Thomas Müller
0c8021e945 Merge pull request #21832 from owncloud/reduce-user-object-issues 
Always set up a config object within the user object
 2016-02-12 16:51:08 +01:00
Morris Jobke
5fe55de6d8 Always set up a config object within the user object 
* the new getEmailAddress and setEmailAddress relies on this anyway
 2016-02-12 16:33:37 +01:00
Thomas Müller
55e55dd91d Merge pull request #22349 from owncloud/icon-updates 
icon fixes: comments, delete
 2016-02-12 16:28:49 +01:00
Thomas Müller
761e9cf3a4 Merge pull request #21837 from owncloud/recipients-error-message 
First try for shareWithField error message
 2016-02-12 16:09:37 +01:00
Thomas Müller
ad9dea8edf Merge pull request #22292 from owncloud/smb-handle-forbidden 
handle forbidden exceptions in smb backend
 2016-02-12 16:09:05 +01:00
Bjoern Schiessle
862e28f006 show remote server on auto complete 2016-02-12 15:52:51 +01:00
Bjoern Schiessle
11abf2487c add remote server to the result 2016-02-12 15:52:51 +01:00
Lukas Reschke
29ce56ed07 Check if admin user 
We should not add the JS for not admin users.
 2016-02-12 14:37:50 +01:00
Roeland Jago Douma
92c131b481 Updated unit tests 2016-02-12 14:31:00 +01:00
Jan-Christoph Borchardt
03e8f1d290 add proper comment icon and add it to icons.css 2016-02-12 14:08:44 +01:00
Jan-Christoph Borchardt
4a24c732d4 add white delete icon 2016-02-12 14:05:05 +01:00
Roeland Jago Douma
51b55d5320 Provide proper feedback when creating a share in the webUI 
Fixes #22304

Creating a share is not instant (especially not for federated shares) so
we should show that something is happening in the webUI properly.
 2016-02-12 14:01:15 +01:00
Thomas Müller
b3323a51c9 Merge pull request #22294 from owncloud/carddav-report-list-groups-2 
Adding a custom webdav property which holds the list of contacts groups
 2016-02-12 13:22:05 +01:00
Thomas Müller
cb1051dae4 Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298 
Calculate the share statuses in js from the OCS Response
 2016-02-12 11:12:14 +01:00
Lukas Reschke
4b90429178 Add note if integrity check is disabled 
Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled.

This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch)  it displays now: `Appcode checker has been disabled. Integrity cannot be verified.`

This is not displayed anywhere else in the UI except these URL used for us for debugging purposes.
 2016-02-12 11:11:39 +01:00
Thomas Müller
207c09c511 Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link 
Do not getShare in deleteShare, it's already there when deleting
 2016-02-12 11:11:26 +01:00
Thomas Müller
e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares 
Do not allow invisible link shares
 2016-02-12 11:10:58 +01:00
Roeland Jago Douma
479c458428 The owner and recipient can also be null 
If we have backend hickups it can be that we are unable to retrive the
owner and recipient user as well. In such cases just return the UID.
 2016-02-12 10:45:33 +01:00
Roeland Jago Douma
0a33cdee0c If the initiator no longer exists return UID 
It can happen that the share initiator is deleted. Because of the new
resharing behaviour this share then still exists. We just can fetch the
displayname properly.
 2016-02-12 10:45:33 +01:00
Roeland Jago Douma
b786523bb7 Clear error when removing text 2016-02-12 10:25:42 +01:00