2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
dcee528482
Don't send activity to non-admins when assigning invisible tags ( #25192 )
2016-06-20 22:06:34 +02:00
ef5217d6e8
Merge pull request #25173 from owncloud/fix_conversion_issues
...
Fix conversion issues
2016-06-20 17:15:45 +02:00
88b9f5a357
Merge pull request #25162 from owncloud/password-login-forbidden-hint
...
Password login forbidden hint
2016-06-20 17:05:20 +02:00
bb24e40bf4
Fix conversion issues
...
Change to phpdoc type for automatic conversion
2016-06-20 14:51:36 +02:00
548b8848ee
no need to mention ownCloud explicitely
2016-06-20 14:46:13 +02:00
61a3daa55d
Merge pull request #165 from nextcloud/fix-owncloud-references-federated
...
fix references to ownCloud in the federated files sharing app
2016-06-20 14:40:33 +02:00
9eaccaf2b1
s/ownCloud/Nextcloud
2016-06-20 14:20:48 +02:00
22fd33137f
Merge pull request #162 from nextcloud/fix-owncloud-reference
...
Fix references
2016-06-20 14:19:30 +02:00
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00
19b531fd14
fix more strings
2016-06-20 13:14:24 +02:00
9107fd6cd6
fix federation strings
2016-06-20 13:13:37 +02:00
416466b700
fix l10n
2016-06-20 13:13:37 +02:00
9327ded595
fix l10n
2016-06-20 13:13:37 +02:00
ca4fd9d25b
fix l10n
2016-06-20 13:13:37 +02:00
e7e0dc608b
fix strings
2016-06-20 13:13:37 +02:00
f9fd7093c0
don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway
2016-06-20 11:21:27 +02:00
09261fca86
Merge pull request #25010 from owncloud/gdrive-fix-tests
...
Fix GDrive test rename overwrite folder
2016-06-20 11:02:24 +02:00
fa533e72cd
Merge pull request #25161 from owncloud/fixgetsharefolder
...
Make getShareFolder use given view instead of static FS
2016-06-20 10:26:03 +02:00
e3ddbeb755
Merge pull request #25120 from owncloud/settings_fix_checkbox_newline
...
files_external: Keep checkbox and its label on one line
2016-06-20 10:00:25 +02:00
bd13353c4d
[tx-robot] updated from transifex
2016-06-20 01:54:50 -04:00
d65c56d7de
[tx-robot] updated from transifex
2016-06-18 01:58:51 -04:00
111bd8e57d
files_external: Keep checkbox and its label on one line #20032 #22655
...
Else the checkbox and the decription end up on different lines in my Chrome on OS X
2016-06-17 16:19:38 +02:00
2340660a5b
PasswordLoginForbidden must extend NotAuthenticated
...
The auth code from Sabre will forward NotAuthenticated exceptions but
in the case of a generic exception, it is packaged as "service not
available".
2016-06-17 15:50:24 +02:00
5a8cfab68f
throw PasswordLoginForbidden on DAV
2016-06-17 11:30:24 +02:00
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
82b50d126c
add PasswordLoginForbiddenException
2016-06-17 11:02:07 +02:00
a13caa0ea2
Delay files_sharing's registerMountProviders
...
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
2016-06-17 11:00:09 +02:00
2fe67ecc3c
Changed global variable to local
2016-06-17 07:35:23 +00:00
cc532bb14a
[tx-robot] updated from transifex
2016-06-17 02:00:01 -04:00
1a35dea8a6
Merge pull request #24965 from owncloud/streams-0.4.1
...
update icewind/streams to 0.4.1
2016-06-16 17:50:39 +02:00
0b7685d326
Move birthday calendar generation to a live migration job ( #25135 )
2016-06-16 16:14:28 +02:00
d6cf310dfc
Merge pull request #25104 from owncloud/dropbox-catchratelimit
...
Convert Dropbox Forbidden exception to StorageNotAvailableException
2016-06-16 16:03:20 +02:00
d7f98fcdef
Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder
...
disable cleanFolder for the federated share storage
2016-06-16 13:21:51 +02:00
51b067d603
Fix failing JS unit tests
...
* fixes #124
2016-06-16 11:00:58 +02:00
d9be370b86
Merge pull request #83 from nextcloud/file-drop-highlight
...
File drop highlight
2016-06-15 17:36:16 +02:00
d38950998c
Merge pull request #113 from nextcloud/fix-more-button
...
fix padding of 3-dot button on mobile
2016-06-15 17:32:04 +02:00
9f0f003fe9
fix padding of 3-dot button on mobile
2016-06-15 15:15:56 +02:00
10f8d643dc
store icons in class
2016-06-15 14:42:39 +02:00
8dea26094b
update icewind/streams to 0.4.1
2016-06-15 13:44:02 +02:00
5315a479f3
fixes responsive/mobile view
2016-06-15 13:11:25 +02:00
aecdcf737f
dragging over folder will highlight folder only
2016-06-15 11:28:53 +02:00
3e9353dd69
Merge pull request #25082 from owncloud/fix-sessionless-clients
...
Fix sessionless clients
2016-06-15 10:45:55 +02:00
02e8021b1a
Update start-swift-ceph.sh ( #25109 )
...
fix failing https://ci.owncloud.org/job/server-master-linux-externals/database=sqlite,external=swift-ceph,label=SLAVE/
2016-06-15 10:17:59 +02:00
6214420974
restrict dropZone to app-content div
2016-06-15 09:45:36 +02:00
be4a29d75f
[tx-robot] updated from transifex
2016-06-15 05:54:49 +00:00
203a07e7f3
change folder icon when dragging over a directory
2016-06-15 01:03:59 +02:00
e325209291
Convert Dropbox Forbidden exception to StorageNotAvailableException
2016-06-14 17:38:32 +02:00
Lukas Reschke
Robin Appelman
Vincent Petry
Juan Pablo Villafáñez
Bjoern Schiessle
Morris Jobke
Jenkins for ownCloud
Markus Goetz
Christoph Wurst
Sergio Bertolín
Thomas Müller
Marius Blüm
Jan-Christoph Borchardt
Vincent Chan
Robin Appelman
Jürgen Weigert