cc2aec11af
Merge pull request #25238 from owncloud/files-trashlistnamecorruption
...
Fix trashed file name corruption when rerendering trashbin list
2016-06-23 15:36:14 +02:00
040c541138
Remove a fed share from the local table before trying to notify the remote server
2016-06-23 14:19:55 +02:00
bac1a3a623
Add option to `occ files_external:list` to show all configured mounts
2016-06-23 13:12:03 +02:00
508c580e67
Fix trashed file name corruption when rerendering trashbin list
...
The trashbin code does some gymnastics with the file data at render
time. This fix makes sure that the modifications done on the file data
are only local to the rendering code and doesn't affect the actual file
data from the file list.
2016-06-23 11:51:23 +02:00
0552933770
changes emptycontent icon to drag-accept on file-drag
2016-06-23 11:25:03 +02:00
ae50e7236f
Merge pull request #25225 from owncloud/enc-revertversionsize
...
Rollback version must also adjust cached size
2016-06-22 16:39:49 +02:00
d5f4328842
Merge pull request #25223 from owncloud/external-list-default-options
...
Hide more default options in occ files_external:list
2016-06-22 15:53:20 +02:00
fa3dc909a4
Rollback version must also adjust cached size
2016-06-22 14:16:16 +02:00
eed1c52aec
Hide more default options in occ files_external:list
2016-06-22 13:34:55 +02:00
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
704a993e37
Fix null pointer exception in user_ldap ( #25062 )
2016-06-21 16:30:48 +02:00
755c86e3a2
Merge pull request #24505 from owncloud/ceph-wait-for-http
...
Don't rely on the notify socket but on the service responding
2016-06-21 16:21:11 +02:00
1452b74de7
Contacts API: replace raw image data with url ( #25081 )
...
* add uri to AddressBookImpl array
* Introduce ImageExportPlugin for CardDav
* add plugin to v1 routes
* replace binary contact photo with link
* update tests
* Adding unit tests
2016-06-21 15:25:44 +02:00
d5dd30c3a0
Add "Login credentials" and "User Provided"
...
This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7https://github.com/owncloud/core/pull/22432 .
This was taken from owncloud/core which is AGPL licensed.
2016-06-21 14:58:35 +02:00
6affbdc6e7
Add "Global Auth" option to external storage
...
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93https://github.com/owncloud/core/pull/22468 .
This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.
2016-06-21 14:16:45 +02:00
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
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
bac96e7ffc
Wait for port being accessible in addition to the notify socket
2016-06-17 13:29: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
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
937d21ed29
properly fix folder upload to use delegatedEvent
2016-06-14 11:51:03 +02:00
864c3a8fbb
fixes direct upload to folder
2016-06-14 09:58:03 +02:00
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
2016-06-14 01:06:25 +02:00
433cea30c3
adds visual indication for file drag and drop
2016-06-13 23:00:56 +02:00
2abd663419
update jQuery File Upload Plugin (9.12.5) to support dragleave
2016-06-13 22:26:49 +02:00
465807490d
create session token only for clients that support cookies
2016-06-13 19:44:05 +02:00
990ac34aaa
Use proper namespaces - fixes #25078 ( #25079 )
2016-06-13 19:32:54 +02:00
331d88bcab
create session token on all APIs
2016-06-13 15:38:34 +02:00
3840466f9a
[tx-robot] updated from transifex
2016-06-13 12:21:11 +00:00
01f8434a75
Merge pull request #57 from nextcloud/fdrop-template
...
smaller files drop fixes
2016-06-13 00:14:34 +02:00
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
ca43c49709
smaller files drop fixes
...
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
14fde6650c
Merge pull request #25003 from owncloud/fix_ocs_path_response
...
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
e991b23d9d
log events from versions app
2016-06-10 15:39:04 +02:00
86f12cc3e7
listen to trash bin and group manager hooks
2016-06-10 15:38:57 +02:00
aa831252b3
Add basic audit component to logger
...
Logs already:
- Share events
- Authentication events
- User management events
- File action events
2016-06-10 15:38:25 +02:00
c51bdd1809
Fix GDrive test rename overwrite folder
2016-06-10 14:53:37 +02:00
54e2ac5713
Add text about uploaded files
2016-06-10 14:47:40 +02:00
57b999fde7
Merge pull request #24990 from owncloud/fix_24868
...
Wrap publicwebdav in sharePermission mask
2016-06-10 14:33:06 +02:00
68c3b23e04
Merge pull request #24080 from owncloud/support-calendar-class-property
...
Extract CLASS property from calendar object and store it in the database
2016-06-10 11:22:11 +02:00
1abe5b0408
Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember
...
Use array_merge when reading cached groups members
2016-06-10 11:06:41 +02:00
67c3a97401
Merge pull request #25046 from owncloud/fix-the-realm
...
Use the correct realm for basic authentication
2016-06-10 10:41:46 +02:00
543545505d
Merge pull request #25043 from owncloud/webdav-download-mimetype
...
DAV now returns file name with Content-Disposition header
2016-06-10 09:55:59 +02:00
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
c49402d266
Add some error handling
2016-06-09 21:44:54 +02:00
a636e4ff28
Downstream 2016-06-09
...
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
c268ad1597
Add PHP unit test
2016-06-09 18:29:13 +02:00
Vincent Petry
Robin Appelman
Vincent Chan
Joas Schilling
Jenkins for ownCloud
Jörn Friedrich Dreyer
Georg Ehrke
Lukas Reschke
Thomas Müller
Robin Appelman
Juan Pablo Villafáñez
Bjoern Schiessle
Morris Jobke
Markus Goetz
Thomas Müller
Christoph Wurst
Sergio Bertolín
Marius Blüm
Jan-Christoph Borchardt
Jürgen Weigert
Arthur Schiwon
Lukas Reschke
