Commit Graph

14300 Commits

Author SHA1 Message Date
Joas Schilling e0b5949a9f
Add request time 2016-08-01 17:19:05 +02:00
Joas Schilling 2cfd67e13b
Add remote address 2016-08-01 17:19:05 +02:00
Joas Schilling 1091cbb778
Add Request URL 2016-08-01 17:19:05 +02:00
Joas Schilling 477e79c2f2
User agent check 2016-08-01 17:19:05 +02:00
Joas Schilling 8a753342ee
Add file mime type 2016-08-01 17:19:04 +02:00
Joas Schilling 136a1a4223
Add file size as check 2016-08-01 17:19:04 +02:00
Joas Schilling c6bf641ebe
Add system tag check 2016-08-01 17:19:04 +02:00
Joas Schilling 306d725bc3
Add the systemtag js files 2016-08-01 17:19:04 +02:00
Joas Schilling 6430164a09
Make sure each plugin is only added once 2016-08-01 17:19:01 +02:00
Björn Schießle 368e1c3f2b Merge pull request #685 from nextcloud/validate-theming-input
Validate the input of the theming options
2016-08-01 11:24:22 +02:00
Nextcloud bot 8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Jan-Christoph Borchardt ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Lukas Reschke f0b30d7260 Merge pull request #674 from nextcloud/action-menu-position
remove extra file size padding to fix action menu position
2016-08-01 09:40:48 +02:00
Joas Schilling 13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Nextcloud bot 50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
blizzz 7bb9502d23 Merge pull request #595 from nextcloud/fix_slow_test
Close session fast when doing a test to prevent blocking the next requests
2016-07-31 17:29:22 +02:00
Nextcloud bot 2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Jan-Christoph Borchardt 41519810e1 remove extra file size padding to fix action menu position 2016-07-30 18:30:07 +02:00
Julius Haertl 217b52085d
Fix javascript tests for sidebar animation 2016-07-30 16:30:05 +02:00
Nextcloud bot 2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Jan-Christoph Borchardt 696ff90cbe Merge pull request #625 from nextcloud/video-container-size
up the minimum size of the public share video a bit, use 16/9 ratio
2016-07-29 15:36:30 +02:00
Jan-Christoph Borchardt 748745d381 up the minimum size of the public share video a bit, use 16/9 ratio, fix #603 2016-07-29 10:47:00 +02:00
Thomas Müller 6f34c37cfb
Adding quota plugin to new dav endpoint (#25615)
* Adding quota plugin to new dav endpoint

* Added integrated test failing in old endpoint

* Added 0B quota test
2016-07-29 10:03:46 +02:00
Nextcloud bot 937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Joas Schilling 5306b4feba
Fix tests 2016-07-28 17:49:08 +02:00
Joas Schilling 2de4112176
Update routes.php 2016-07-28 17:49:08 +02:00
Joas Schilling 2f574f60ec
Remove useless check 2016-07-28 17:49:08 +02:00
Joas Schilling ba558664cf
Use the methods on the Response object 2016-07-28 17:49:08 +02:00
Joas Schilling eec6986d7c
Use public API preferable 2016-07-28 17:49:08 +02:00
Joas Schilling 7efadf7b6b
Move classes to PSR-4 2016-07-28 17:49:08 +02:00
Morris Jobke a1f02086e5 Merge pull request #636 from nextcloud/theming-fix
fix background id selector for the first run wizard
2016-07-28 17:42:46 +02:00
Morris Jobke 83c64f3485 Merge pull request #590 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName
Fix undefined OfflineUser::composeAndStoreDisplayName()
2016-07-28 17:41:02 +02:00
Lukas Reschke bf7afcdace Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonlogin
Prevent setting email and triggering events at login time (#25553)
2016-07-28 17:09:59 +02:00
Bjoern Schiessle 14ca7c9cdc
fix background id selector for the first run wizard 2016-07-28 16:32:39 +02:00
Morris Jobke 1e4266b076 Merge pull request #583 from nextcloud/issue-577-add-l10n
Add L10N support
2016-07-28 16:12:45 +02:00
Bjoern Schiessle ee1be23b37
fix unit tests 2016-07-28 13:30:55 +02:00
Bjoern Schiessle be365b4975
re-use background color from theme in the firstrunwizard 2016-07-28 12:16:39 +02:00
Bjoern Schiessle 583f86d90a
apply theme to the firstrunwizard 2016-07-28 12:15:33 +02:00
Jan-Christoph Borchardt 9ebd0914b7 Merge pull request #415 from nextcloud/theming-colorize-checkboxes
Colorize checkboxes depending on theming color
2016-07-28 11:12:39 +02:00
blizzz 73311091bf Merge pull request #519 from GitHubUser4234/master
New LDAPProvider for user_ldap
2016-07-28 10:14:34 +02:00
Lukas Reschke abdf8c2c84 Merge pull request #494 from nextcloud/systemtag-management
Add a simple Admin UI to manage systemtags
2016-07-28 09:36:33 +02:00
root bd65a17203 Nextcloud license header for new files 2016-07-28 15:13:00 +08:00
Nextcloud bot ffa25ff74d
[tx-robot] updated from transifex 2016-07-28 00:11:51 +00:00
Julius Haertl 217b02aaa0
Theming: Cleanup and remove opacity from checkbox/radiobutton 2016-07-27 20:21:53 +02:00
Julius Haertl cc457cd665
Theming: Generate colorized radio buttons dynamically 2016-07-27 20:00:23 +02:00
Julius Haertl 7ff19e342e
Theming: Colorize radio buttons and append new styles on preview 2016-07-27 20:00:23 +02:00
Julius Haertl acd1172998
Theming: Clean up css generation and fix tests 2016-07-27 19:54:54 +02:00
Julius Haertl d07f04e4f7
Theming: Colorize checkboxes depending on luminance 2016-07-27 19:45:57 +02:00
Julius Haertl 0acfbd5b47
Theming: Preview for colorized checkboxes 2016-07-27 19:45:57 +02:00
Julius Haertl 9ebe0c8d64
Colorize checkboxes depending on theming color 2016-07-27 19:45:57 +02:00
Morris Jobke 638f852ed8 Merge pull request #571 from nextcloud/no-missing-preview
Don't try to load previews when we know there is none
2016-07-27 15:48:40 +02:00
Joas Schilling 5bb35577db
Add a simple Admin UI to manage systemtags 2016-07-27 15:29:25 +02:00
Joas Schilling 62219c7b2d
Add L10N support 2016-07-27 14:56:21 +02:00
Joas Schilling e6f4ba5929 Merge pull request #601 from nextcloud/fix-workflowengine-loading
Fix loading icon for workflowengine
2016-07-27 14:04:54 +02:00
Morris Jobke e0beaf6643
Fix loading icon for workflowengine 2016-07-27 13:19:20 +02:00
Robin Appelman c662e4b983 fix js test 2016-07-27 12:59:43 +02:00
Robin Appelman 6368506e57 only load sidebar previews when we know it's available 2016-07-27 12:59:43 +02:00
Robin Appelman 03c17ff614 dont load filelist previews if we know we dont have one 2016-07-27 12:59:43 +02:00
Robin Appelman 1fef5d3d06 add dav property to check if a file has a preview available 2016-07-27 12:59:39 +02:00
Joas Schilling 29a9cb7f1a
Allow to reuse the template 2016-07-27 12:29:49 +02:00
Joas Schilling d47b7bd4b2
Fix default value of operator 2016-07-27 12:29:30 +02:00
Juan Pablo Villafáñez 12442f3270
Close session fast when doing a test to prevent blocking the next
requests
2016-07-27 11:41:34 +02:00
Vincent Petry 77df09d58a
Prevent setting email and triggering events at login time (#25553)
Whenever an LDAP user also has an email address defined in LDAP, the
LDAP code will try and update the email address of the locally known
user. This happens at login time or every time the user's LDAP
attributes are processed.

There is code listening to the email setting hook which updates the
system address book, which also will trigger FS setup due to avatars
and other things.

This fix only sets the email address when really necessary.
2016-07-27 11:28:33 +02:00
Thomas Müller 1177c70b9d
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 2016-07-27 11:17:53 +02:00
Joas Schilling a3d1cd4ad2
Fix morris comments 2016-07-27 10:38:03 +02:00
Joas Schilling 681eebcfe6
Remove php side of check registration 2016-07-27 10:21:26 +02:00
Joas Schilling 7588f648a1
Generate the checks list in JS 2016-07-27 10:21:26 +02:00
Joas Schilling 318d68a9a9 Merge pull request #565 from nextcloud/workflowengine
Add workflowengine
2016-07-27 10:07:20 +02:00
root 2719dcabed Merge branch 'master' of https://github.com/nextcloud/server 2016-07-27 15:17:29 +08:00
root 1c64ee67af comments amended 2016-07-27 15:16:57 +08:00
root 32fb6beac3 final changes 2016-07-27 15:10:35 +08:00
Nextcloud bot 95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
blizzz f88109be75 Merge pull request #349 from nextcloud/ldab-groupOfUniqueNames
add groupOfUniqueNames as valid group object class
2016-07-26 23:32:47 +02:00
Jan-Christoph Borchardt b709d59a1e Add app icons for Comments and Tags (#579)
* add icon for Comments app

* add icon for Tags app
2016-07-26 19:42:54 +02:00
Morris Jobke 0e5114ddd7
Move template to workflowengine app 2016-07-26 14:35:01 +02:00
Morris Jobke 8c31ac57ce
create an operation based on the correct model 2016-07-26 12:03:16 +02:00
Morris Jobke 2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
Joas Schilling cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position
Fix theme logo position and shape
2016-07-26 10:46:13 +02:00
Morris Jobke 3b6bba09d4 Merge pull request #557 from nextcloud/fix-css-scope-files-external
Add proper scope to files external CSS
2016-07-26 08:58:38 +02:00
Julius Haertl d58ff68531
Theming: Fix preview and center alignment of logo 2016-07-25 18:54:13 +02:00
Morris Jobke 8fd7edb2c8
Add proper scope to files external CSS
* for select2
2016-07-25 17:55:05 +02:00
William Bargent 352e24e703 Merge pull request #292 from nextcloud/recent-files
Add "Recent" file listing
2016-07-25 15:25:02 +01:00
Morris Jobke 88cbde6a66 Merge pull request #550 from nextcloud/ldap-integration-test-autoloader
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 12:54:50 +02:00
Arthur Schiwon 686cb599b6
fix autoloading in LPAP integration tests, resolves #544 2016-07-25 11:05:59 +02:00
root 1fb080df2b Merge branch 'master' of https://github.com/nextcloud/server 2016-07-25 16:56:14 +08:00
Robin Appelman f18338d932 fix test 2016-07-25 10:41:53 +02:00
Morris Jobke 59b87fade5
Fix error message while restoring all files
* use $_POST['files'] only of ssinlge files are restored
* fixes #528
2016-07-25 09:24:32 +02:00
Nextcloud bot 7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Jan-Christoph Borchardt dd1a5b9ac3 Fix search box overlapping on mobile (#450)
* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests
2016-07-22 15:38:37 +02:00
Robin Appelman 2139a031e7 block user sorting in recent files 2016-07-22 15:20:55 +02:00
Robin Appelman 81e103074e use limit instead of since when listing recent files 2016-07-22 15:20:55 +02:00
Robin Appelman a4ba3eadd0 fix test 2016-07-22 15:20:55 +02:00
Robin Appelman 2e3114cc28 Add recent file listing 2016-07-22 15:20:51 +02:00
Lukas Reschke 8457c617e0
Adjust tests 2016-07-22 14:58:30 +02:00
Robin Appelman b94ff97a77 add recent files api endpoint 2016-07-22 14:48:51 +02:00
Joas Schilling 7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman 6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Jos Poortvliet 183d4d8e99 Update themingcontroller.php 2016-07-22 12:25:58 +02:00
Joas Schilling 194c385c7a Merge pull request #517 from nextcloud/fix-typo
Fix typo in docs
2016-07-22 11:41:20 +02:00
root c1b37e4ccb Merge branch 'master' of https://github.com/nextcloud/server 2016-07-22 16:47:27 +08:00
root 02ec8b1726 New LDAPProvider for user_ldap 2016-07-22 16:46:29 +08:00
Joas Schilling 03cb588ea9 Merge pull request #500 from nextcloud/bump_version
Bump version
2016-07-22 10:03:42 +02:00
Joas Schilling 398d1591ca
Use app name from stable9 2016-07-22 09:55:46 +02:00
Nextcloud bot 4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke febf95ffb4 Merge pull request #496 from nextcloud/fix-config-generation
Make the changes from doc fix persistant
2016-07-21 23:37:22 +02:00
Joas Schilling 0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling 813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling 86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Joas Schilling 1902105b5f
Change the app name 2016-07-21 12:57:05 +02:00
Morris Jobke dc5608d15a Merge pull request #477 from nextcloud/fix-layout-public-upload
move closing div to the right place
2016-07-21 09:28:35 +02:00
Lukas Reschke e55c1542fa
Use proper branding
Stable9 has this already
2016-07-21 02:24:36 +02:00
Nextcloud bot b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Lukas Reschke c385423d10 Merge pull request #479 from nextcloud/add-bruteforce-throttler
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke ba4f12baa0
Implement brute force protection
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
Lukas Reschke 020a2a6958 Merge pull request #476 from nextcloud/port-same-site-cookies
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Lukas Reschke a17ba2f488 Merge pull request #466 from nextcloud/escape-special-characters
Escape special characters (#25429)
2016-07-20 21:24:19 +02:00
Morris Jobke e08278494d Merge pull request #471 from nextcloud/storage-fopenspecialchars
Added storage tests for fopen with special chars
2016-07-20 20:56:59 +02:00
Roeland Douma 9f219f55f2 Merge pull request #467 from nextcloud/use-clipboard-api
Use clipboard api
2016-07-20 20:11:08 +02:00
Roeland Douma 26cf51403e Merge pull request #464 from nextcloud/master-change-load-order
[master] Change load order of auth backends so that we can throw an exception …
2016-07-20 20:08:22 +02:00
Roeland Douma ffc345b141 Merge pull request #468 from nextcloud/stringid-fix
Cast share id to string (#25402)
2016-07-20 20:06:46 +02:00
Lukas Reschke a299fa38a9
[master] Port Same-Site Cookies to master
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
Bjoern Schiessle 1ab1e000e8
move closing div to the right place 2016-07-20 18:34:32 +02:00
Morris Jobke e2abe70514 Merge pull request #470 from nextcloud/sftp-renameoverwritedir
Fix overwriting folders on rename with SFTP
2016-07-20 18:31:06 +02:00
Morris Jobke 1264e9644f Merge pull request #402 from nextcloud/smb-notifications
smb update notifications
2016-07-20 16:19:21 +02:00
Vincent Petry 631af42b3a
Added storage tests for fopen with special chars
This makes it possible to test special chars with unit tests.
There is already a test for directories but there was none for file
names.
2016-07-20 15:13:24 +02:00
Vincent Petry d372836efc
Fix overwriting folders on rename with SFTP
This aligns the behavior with other storages and also fixes the failing
unit test testRenameOverWriteDirectory
2016-07-20 15:12:27 +02:00
Vincent Petry e5c4f53eea
Cast share id to string (#25402) 2016-07-20 15:10:10 +02:00
Thomas Müller 4d67429cf0
Use an icon to set the email instead of a button with string 2016-07-20 15:07:46 +02:00
Thomas Müller daaa3ded8d
Add clipboard button to public share link 2016-07-20 15:07:41 +02:00
Aaron Wood 7c0de08cc4
Escape special characters (#25429)
* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Use correct method in the AbstractMapping class

* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches

* Don't escape hardcoded wildcard
2016-07-20 14:46:47 +02:00
Juan Pablo Villafañez c376eb9f90
Fix file permissions for SMB (read-only folders will be writeable) (#25301)
* Fix file permissions for SMB (read-only folders will be writeable)

* Read-only folders won't be deletable

* Added comment for the read-only behaviour for folders
2016-07-20 14:45:42 +02:00
Thomas Müller e795f7b106
Change load order of auth backends so that we can throw an exception in OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25476) 2016-07-20 14:40:52 +02:00
Joas Schilling 45c99c226b
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-20 13:03:27 +02:00
Morris Jobke 0a6d95b126 Merge pull request #394 from nextcloud/tags-for-everything
SystemTags for everything not just files
2016-07-19 10:47:12 +02:00
Nextcloud bot 4a963c21ff
[tx-robot] updated from transifex 2016-07-19 00:09:00 +00:00
Björn Schießle f7d26e4aa5 Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
Nextcloud bot b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Björn Schießle ea470f8777 Merge pull request #405 from nextcloud/theming-fixes
Theming fixes
2016-07-18 15:59:47 +02:00
Morris Jobke b1a9f12b77 Merge pull request #428 from nextcloud/setupfromtoken_sharemanager
Move SetupFromToken to ShareManager
2016-07-18 15:49:51 +02:00
Roeland Jago Douma 773250be24
Cleanup coding style 2016-07-18 13:35:35 +02:00
Roeland Jago Douma 1c5e082ee1
Add eventdispatcher to public link view 2016-07-18 13:35:35 +02:00
Roeland Jago Douma ea3035aa0e
Move JS inclusion to Controller
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
Joas Schilling 89a32a2f84 Merge pull request #412 from nextcloud/theming-foreground-color
Theming: invert foreground color on bright backgrounds
2016-07-18 12:43:11 +02:00
Roeland Jago Douma ff54141639
Move SetupFromToken to ShareManager 2016-07-18 10:53:49 +02:00
Joas Schilling 54708f97a1
Fix non-existing exception class 2016-07-18 10:26:42 +02:00
Joas Schilling 7c039bcbf6
Allow apps to register SystemTags plugins 2016-07-18 10:26:42 +02:00
Joas Schilling c2b077e185
Fix doc blocks 2016-07-18 10:26:42 +02:00
Joas Schilling 8e13ff2c86
Fix TODO and bring in abstraction (similar to comments) 2016-07-18 10:26:36 +02:00
Morris Jobke 40328114f9 Merge pull request #379 from nextcloud/create_federated_share_on_mount
Create federated share on mount
2016-07-18 09:22:48 +02:00
Nextcloud bot 91c281c4b4
[tx-robot] updated from transifex 2016-07-17 00:09:26 +00:00
Julius Haertl 48ac845266
Theming: Fix image paths for caret icon 2016-07-16 09:18:34 +02:00
Nextcloud bot d6907fe84d
[tx-robot] updated from transifex 2016-07-16 00:09:18 +00:00
Julius Haertl 3f47138d27
Theming: Fix spaces in settings-admin.js 2016-07-15 14:45:05 +02:00
Julius Haertl 639be661c4
Theming: Add tests for inverted colors 2016-07-15 14:16:41 +02:00
Julius Haertl 387550be88
Theming: Implement swapping the foreground color for bright colors 2016-07-15 14:16:41 +02:00
Roeland Jago Douma db559e33be
Fix PHPUnit 5.4 warnings in files_sharing tests 2016-07-15 12:22:53 +02:00
Joas Schilling ec6f696978
Add unit tests 2016-07-15 11:54:47 +02:00
Morris Jobke ab6db739fa Merge pull request #407 from nextcloud/dav_phpunit_fixes
Fix PHPUnit 5.4 warnings in DAV app
2016-07-15 11:14:15 +02:00
Roeland Jago Douma 2fcb24166f
Fix PHPUnit 5.4 warnings in DAV app
* getMock is deprecated
2016-07-15 09:52:46 +02:00
Joas Schilling f35b696a2d
Also load the theming app on CLI 2016-07-15 09:17:30 +02:00
Joas Schilling 2c988ecbf4
Use the themed Defaults everywhere 2016-07-15 09:17:30 +02:00
Joas Schilling e8d6621a24
Better handling of empty slogan 2016-07-15 08:49:16 +02:00
Roeland Jago Douma 059b7435ab
PasswordLoginForbidden is not a FATAL exception
It is just a 'Sabre\DAV\Exception\NotAuthenticated' exception
with some special meaning.

So just log it as DEBUG and not as FATAL.
2016-07-14 22:53:12 +02:00
Bjoern Schiessle f8a531c06c
don't convert link share to federated share if outgoing federated shares are forbidden 2016-07-14 20:48:45 +02:00
Bjoern Schiessle c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 56d3100f44
adjust copyright notices 2016-07-14 16:39:48 +02:00
Bjoern Schiessle dc53788711
remove unused parameter 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 55b990b544
allow to mount public link from Nextclouds <= 9 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 5bbba490c4
move some stuff over to the federatedfilesharing app 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 2f23054b01
s/ownCloud/Nextcloud 2016-07-14 16:39:48 +02:00
Bjoern Schiessle 33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id 2016-07-14 16:39:48 +02:00
Robin Appelman e34ee9099d add files_external:notify command 2016-07-14 16:00:57 +02:00
Lukas Reschke 813b58ab94 Merge pull request #398 from nextcloud/issue-388-fix-hidden-file-list-master
Fix hidden file list master
2016-07-14 15:37:42 +02:00
Robin Appelman e1fa314b18 add notify support to smb storage 2016-07-14 14:46:01 +02:00
Bjoern Schiessle 1394b0afb9
replace 'ownCloud' with 'Nextcloud' 2016-07-14 11:22:35 +02:00
Björn Schießle a0ae16aa1a
add unit tests 2016-07-14 11:22:35 +02:00
Björn Schießle f5d0b464a7
create a real federated share if a user add a public link to his ownCloud
this way the owner sees all mounted public links and control them individually
2016-07-14 11:22:35 +02:00
Joas Schilling 76736731eb
Allow shares with create permissions only aswell 2016-07-14 10:27:29 +02:00
Nextcloud bot a6c23a1f8b
[tx-robot] updated from transifex 2016-07-14 00:09:19 +00:00
Robin Appelman 29eeeb2273 Save the files external mount id in the mount cache table 2016-07-13 16:34:08 +02:00
Morris Jobke 2b86f1e677
Remove unneeded usage of tipsy
* tooltip is already initialized
2016-07-13 09:57:49 +02:00
Nextcloud bot afef11f84a
[tx-robot] updated from transifex 2016-07-13 00:09:46 +00:00
Roeland Jago Douma f9e0e3d972
Fix Warnings Provisioning API
* OC_OCS_Result is deprecated
* getMock is deprecated in phpunit 5.4
2016-07-12 08:53:12 +02:00
Nextcloud bot e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Joas Schilling 77071d07cf Merge pull request #371 from nextcloud/implement-get-title
Implement "getTitle"
2016-07-11 21:57:52 +02:00
Lukas Reschke 0fd770765f
Implement "getTitle"
Fixes https://github.com/nextcloud/server/issues/341
2016-07-11 19:36:26 +02:00
oparoz eceb0db4d2 Fix tests 2016-07-11 14:23:43 +02:00
oparoz 839ee5eac1 Make theming work with pretty URLs
In some envs the rewrite rules for pretty URLs apply to all CSS files, so let's not end the route name with that etension.
Fixes #315
2016-07-11 14:08:25 +02:00
Morris Jobke d15fd5cb96 Change occurence of ownCloud (#352) 2016-07-11 13:49:19 +02:00
Lukas Reschke 0c1cf5f7eb Merge pull request #347 from nextcloud/drop-windows-foo
Remove unneeded checks if it runs on a Windows machine
2016-07-11 13:16:03 +02:00
Bugsbane 92f7722b43 Add new "Recent files" icon to files app (#356)
* Added new "nav-icon-recent" CSS class

Added the class "nav-icon-recent" to display the new "recent files" file list view to be added by @icewind1991 in PR https://github.com/nextcloud/server/pull/292

It's now placed after nav-icon-files which was where @jancborchardt was suggesting iirc.

* Add new "Recent files" clock icon

Add the new icon for "Recent files" file list view in the files app by @icewind1991, as discussed in PR https://github.com/nextcloud/server/pull/292

Icon is already compressed/cleaned by scour rather than svgo as svgo seems to corrupt it.

* Alter colour of "Recent" icon from grey to black

Change colour of the "recently used files" icon from grey to black, to match other icons in the files app.

* Replace recent icon with black, optimized version

Just updates the colour of the icon for "Recent files" from a grey version, to a black optimised version.
2016-07-11 10:54:04 +02:00
Nextcloud bot 67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot 4aae157087
[tx-robot] updated from transifex 2016-07-10 00:09:23 +00:00
Nextcloud bot c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Robin Appelman 81d4d85803 add groupOfUniqueNames as valid group object class 2016-07-08 18:13:22 +02:00
Morris Jobke c2d88a08b7
Remove unneeded checks if it runs on a Windows machine
* the setup check is still there
2016-07-08 15:55:17 +02:00
Robin Appelman 6da066e7be
Fix test using private propertries 2016-07-08 12:36:25 +02:00
Robin Appelman d0e6fdba4d
combine if statements 2016-07-08 12:36:15 +02:00
Robin Appelman 039f730700
handle errors while getting fileinfo 2016-07-08 12:36:07 +02:00
Robin Appelman 4de7476f58
Allow null 2016-07-08 12:35:58 +02:00
Robin Appelman f98cb9efa0
Fix type hinting 2016-07-08 12:35:50 +02:00
Robin Appelman 31ea10b04e
add missing var 2016-07-08 12:35:43 +02:00
Robin Appelman 951ff0897c
hint global handlebars 2016-07-08 12:35:33 +02:00
Robin Appelman f0b9eba9c2
dont overwrite a variable with a different type 2016-07-08 12:35:23 +02:00
Robin Appelman 8f84c99e3f
Fix undefined properties 2016-07-08 12:35:16 +02:00
Nextcloud bot a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke 2a1a3957b6 Merge pull request #333 from nextcloud/sync-master
Sync master
2016-07-07 19:29:43 +02:00
Morris Jobke f5ed016170 Merge pull request #312 from nextcloud/files-other-lists-goto
Add "goto" links for files in non-default file lists
2016-07-07 15:48:38 +02:00
Morris Jobke beae00a5e5 Simplify test code and don't show anything if no date is set 2016-07-07 15:10:04 +02:00
Morris Jobke 43b26b9506 add unit tests 2016-07-07 15:10:04 +02:00
Morris Jobke 059cc1f22e Update header during update callback 2016-07-07 15:10:03 +02:00
Morris Jobke c809db86f5 Not set expiration date is represented as 0 2016-07-07 15:10:03 +02:00
Morris Jobke ab3c8d4de9 add "Never" if expiration date is not set 2016-07-07 15:10:03 +02:00
Morris Jobke b5dea82e45 Add expiration date to share by link view 2016-07-07 15:10:03 +02:00
Juan Pablo Villafáñez 6d680bdebf Change png icons to svg 2016-07-07 15:09:28 +02:00
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke 5ace43f438 Revert "[tx-robot] updated from transifex"
This reverts commit 3731b2a006.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
2016-07-07 11:04:08 +02:00
Nextcloud bot 4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Jenkins for ownCloud 38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Nextcloud bot da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Vincent Petry cf6fe95cbf Merge pull request #25325 from owncloud/filelist-prependslash
Filelist change dir auto-prepend slash
2016-07-06 12:44:03 +02:00
Vincent Petry 1f9d728538 Ignore invalid paths in the JS file list (#25368) 2016-07-06 11:55:02 +02:00
Carlos Damken d58e6b59d3 Upgrading the log level From Debug to INFO to be consistent with files_trashbin (#25367) 2016-07-06 10:33:31 +02:00
Jenkins for ownCloud 6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
Robin Appelman d623763aac Add "goto" links for files in non-default file lists 2016-07-05 22:22:55 +02:00
Bugsbane 29ffe0b790 Replace tag svg with optimized version
Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
2016-07-05 06:52:10 -04:00
Bugsbane 515df6db59 Update system tags icon
Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
2016-07-05 06:16:25 -04:00
Vincent Petry b77fcc19d4 Merge pull request #25344 from owncloud/fix-ldap-check-user
check if renamed user is still valid by reapplying the ldap filter
2016-07-05 11:29:55 +02:00
Björn Schießle 3ffe424985 Merge pull request #309 from Faldon/master
Changed the creation of the update notification link
2016-07-05 10:27:48 +02:00
Thomas Müller d2d99a91a0 fix swift primary object store test (#25281)
* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
Jenkins for ownCloud 34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Thomas Pulzer cf7afabf62 Added escaping html code when building link to documentation. 2016-07-05 06:59:11 +02:00
Thomas Pulzer 52336b2038 Changed the creation of the update notification link to generate the js object from concated string. 2016-07-04 22:57:10 +02:00
Marius Blüm 0481a3eadf Merge pull request #306 from nextcloud/sidebar-preview-text
Add large sidebar previews for text files
2016-07-04 21:36:51 +02:00
Morris Jobke dd337597b3 for text use max-height to trim whitespace 2016-07-04 17:38:26 +02:00
Vincent Petry 8d866dfba4 Merge pull request #25314 from owncloud/files_external-backends-config
show configuration options for authentication backends
2016-07-04 16:10:03 +02:00
Morris Jobke 2e5e0c157d adjust padding of text preview 2016-07-04 15:38:16 +02:00
felixboehm e901ec4941 check if renamed user is still valid by reapplying the ldap filter (#25338) 2016-07-04 14:20:08 +02:00
Jörn Friedrich Dreyer d2d2a75529 Cap LDAP user cache (#25323) 2016-07-04 13:57:15 +02:00
Lukas Reschke 77082c20a7 Merge pull request #305 from Faldon/master
Changing name of default logfile
2016-07-04 13:25:00 +02:00
Robin Appelman a4d75a60a9 Add large sidebar previews for text files 2016-07-04 12:54:12 +02:00
Robin Appelman 860b7c36ec Factor out handling sidebar previews 2016-07-04 12:04:32 +02:00
Thomas Pulzer 90b7f74da7 Changed name of default logfile from owncloud.log to nextcloud.log. 2016-07-04 11:50:32 +02:00
Bjoern Schiessle 4a4cac611f we don't need to check permissions twice 2016-07-04 10:48:15 +02:00
Jenkins for ownCloud 9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Björn Schießle 5b4cea4b36 Merge pull request #275 from nextcloud/master-sync-upstream
[Master] Sync upstream
2016-07-01 18:31:51 +02:00
Vincent Petry ba95297c5c Merge pull request #25262 from owncloud/fed-sharing-error
Only save federated share after remote server is notified
2016-07-01 16:20:39 +02:00
Lukas Reschke 76c73d5ec3 Match on 405 2016-07-01 15:19:21 +02:00
Lukas Reschke 4ac9eaab03 Match for /../ 2016-07-01 15:01:48 +02:00
Thomas Citharel 7d95cde37d Add all properties while creating a subscription (#25318)
Fixes #24469
2016-07-01 13:42:35 +02:00
Lukas Reschke 5b65591d84 Do not allow directory traversal using "../"
We should not allow directory traversals using "../" here.

To test access the following URL once with and then without this patch:

http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
2016-07-01 13:36:05 +02:00
Lukas Reschke 179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Vincent Petry 4acb06923d Filelist change dir auto-prepend slash
Prepend a slash to directories in case it was missing since many places
assume that it's there.
2016-07-01 11:10:37 +02:00
Jenkins for ownCloud 2d2d2267f7 [tx-robot] updated from transifex 2016-07-01 01:57:04 -04:00
Robin Appelman 9fb92b56ec show configuration options for authentication backends while listing storage
Fixes #22447
2016-06-30 15:50:14 +02:00
Robin Appelman f982d104f3 hide hidden parameters from list backend/auth parameters 2016-06-30 15:44:42 +02:00
Björn Schießle 8e002b6155 Merge pull request #255 from nextcloud/dav-permission-check
add some additonal permission checks to the webdav backend
2016-06-30 14:41:23 +02:00
Bjoern Schiessle 26e14529be fix error message 2016-06-30 13:50:31 +02:00
Lukas Reschke 149218ead9 Fix tests 2016-06-30 13:46:08 +02:00
Lukas Reschke c771368c4e Add proper throws PHP docs 2016-06-30 13:19:50 +02:00
Lukas Reschke 1e7f0f7341 Add required $message parameter 2016-06-30 13:17:53 +02:00
Bjoern Schiessle 1b74cf72fb check permissions before rollback 2016-06-30 11:27:25 +02:00
Bjoern Schiessle 3571207bd9 add some additonal permission checks to the webdav backend 2016-06-30 11:16:49 +02:00
Vincent Petry 5cfbb9624f Prevent infinite loop in search auto-nextpage
When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
2016-06-30 11:10:48 +02:00
Jenkins for ownCloud 1b9fa4dd5f [tx-robot] updated from transifex 2016-06-30 01:55:56 -04:00
Morris Jobke 409672d981 Fix update notification text
* thanks to ungesundes_halbwissen @ transifex
2016-06-29 16:05:51 +02:00
Vincent Petry c8fbe39801 Merge pull request #25288 from owncloud/fix-versionrevertperms
Hide revert button when no permission to revert
2016-06-29 12:51:39 +02:00
Björn Schießle 5ace6b53f3 get only vcards which match both the address book id and the vcard uri (#25294) 2016-06-29 12:13:59 +02:00
Jenkins for ownCloud 2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Bjoern Schiessle 5f6944954b get only vcard which match both the address book id and the vcard uri 2016-06-28 16:11:06 +02:00
Vincent Petry f22af90c09 Hide revert button when no permission to revert 2016-06-28 13:00:58 +02:00
Morris Jobke b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Jenkins for ownCloud 894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Marius Blüm 52f6d97e4e Merge pull request #235 from nextcloud/fix-app-code
Add app:check-code for already compatible apps
2016-06-27 23:02:32 +02:00
Robin Appelman 2a72eff9ee Fix getting the certificate bundle for dav external storage (#25274)
* Fix getting the certificate bundle for dav external storages

* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
Robin Appelman 88ef163276 handle unavailable fed shares while testing for availability (#25277)
* More explicit http status codes

* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
Georg Ehrke 3c399be6ec fix a ImageExportPlugin Test (#25215) 2016-06-27 21:26:56 +02:00
Lukas Reschke e0445856b9 Merge pull request #59 from nextcloud/theming-app
Theming app
2016-06-27 21:14:40 +02:00
Lukas Reschke cd74ad55e4 Only save when value changed or enter is pressed 2016-06-27 20:46:12 +02:00
Lukas Reschke a08c4a2b13 Add tooltip 2016-06-27 20:36:23 +02:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke cee2f5dc65 Merge pull request #233 from nextcloud/allow-users-to-change-global-credentials
Allow regular users to specify global credentials password
2016-06-27 17:03:19 +02:00
Morris Jobke 5961d5aae4 Add app:check-code for already compatible apps
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
2016-06-27 16:50:10 +02:00
Robin Appelman 646c90cc4a Log reason why we removed the fed share 2016-06-27 16:38:47 +02:00
Lukas Reschke 341dabf300 Merge pull request #190 from nextcloud/add-wnd-1
Add "Login credentials" and "User Provided"
2016-06-27 16:15:31 +02:00
Vincent Petry f8fa031e9f Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyload
Quickfix: do not lazy load auth mechanisms for ext storages
2016-06-27 14:57:29 +02:00
Robin Appelman 8d32e1d35b Handle exceptions thrown while trying to notify remote server of a fed share 2016-06-27 14:28:12 +02:00
Vincent Petry 1d4c61af47 Merge pull request #25237 from owncloud/search-filelistnextpageresults
Prerender file list pages to include search results
2016-06-27 13:46:25 +02:00
Lukas Reschke 1cd255af56
Allow regular users to specify global credentials password
While the UI is existent the feature simply doesn't work because admin privileges are required for the controller. This adds proper permission checks and also unit tests.

To test this:
1. Enable external storage
2. Login as non-admin user
3. Go to personal page and try to change global credentials
2016-06-27 12:29:27 +02:00
Vincent Petry 199c8e304c Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Vincent Petry 0d3de20b02 Quickfix: do not lazy load auth mechanisms for ext storages
Some auth mechanisms like SessionCredentials need to register hooks
early, so they cannot be lazy loaded.
2016-06-27 10:50:10 +02:00
Lukas Reschke f7f86d61c4 Add comment to "getMailHeaderColor" 2016-06-27 10:48:28 +02:00
Lukas Reschke 51646bb3f6 Use stream instead of rename 2016-06-27 10:47:44 +02:00
Lukas Reschke 0a5c5d9b03 Replace OC_Defaults with \OC::$server->getThemingDefaults() 2016-06-27 10:34:08 +02:00
Jan-Christoph Borchardt 261396019d design and layout fixes for Theming app 2016-06-27 10:26:24 +02:00
Bjoern Schiessle 24144b16d0 make sure that the preview gets updated every time a new image gets uploaded 2016-06-27 10:26:24 +02:00
Bjoern Schiessle 79269427d7 scale preview image 2016-06-27 10:26:24 +02:00
Lukas Reschke 433e8ea123 Disable drop zone
Otherwise dropping something somewhere can by mistake upload the file and make it available
2016-06-27 10:26:23 +02:00
Lukas Reschke a0e92b5fb0 Fix indentation 2016-06-27 10:26:23 +02:00
Lukas Reschke 27b699bdbc Migrate logic to dynamic controller
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Bjoern Schiessle cc321bc140 add some visual feedback if the operation was succesful or not 2016-06-27 10:26:22 +02:00
Bjoern Schiessle 10f6ca20bc write theme settings to database 2016-06-27 10:26:22 +02:00
Jan-Christoph Borchardt 363b76faee basic information architecture for the theming app 2016-06-27 10:26:22 +02:00
Bjoern Schiessle 20d250a674 initial commit for the theming app 2016-06-27 10:26:22 +02:00
Vincent Petry f65787ffdc Merge pull request #25247 from owncloud/fed-unshare-fail
Remove a fed share from the local table before trying to notify the remote server
2016-06-27 09:58:13 +02:00
Jenkins for ownCloud ee90bef50a [tx-robot] updated from transifex 2016-06-27 01:55:57 -04:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud 52eab2a61a [tx-robot] updated from transifex 2016-06-26 01:55:53 -04:00
Jenkins for ownCloud 3d65979f0a [tx-robot] updated from transifex 2016-06-25 01:56:48 -04:00
Christoph Wurst c295523ae2 Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelists
Fix search result link for file results outside default list
2016-06-24 17:12:02 +02:00
Christoph Wurst e9a0a6d83a Merge pull request #25257 from owncloud/comments-showerroronsave
Show error message when posting an invalid comment
2016-06-24 17:11:20 +02:00
Vincent Petry b4cf297758 Prerender file list pages to include search results
When filtering the file list, if a result is on an unrendered page,
make sure to call _nextPage() to prerender the pages in order to
display all matching results.
2016-06-24 13:55:14 +02:00
Vincent Petry 39b533d0d8
Hide search results after switching directory
When clicking on a folder result in the search result list, the result
box for "results in another folder" must disappear.
2016-06-24 11:32:14 +02:00
Vincent Petry bf3ee69d86
Fix search result link for file results outside default list
When outside the "All files" list, the search result link must properly
redirect to the "All files" list.
2016-06-24 11:31:29 +02:00
Vincent Petry 04e3da0cf5 Merge pull request #25171 from owncloud/files_external-list-all
Add option to `occ files_external:list` to show all configured mounts
2016-06-24 10:18:14 +02:00
Vincent Petry 56ad4cdfec
Show error message when posting an invalid comment
When an internal server error occurs while creating or updating a
comment, display a proper error notification in the UI.
2016-06-24 10:17:12 +02:00
Vincent Petry 955635c7aa Add explicit delete permission to link shares
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.

This fix makes sure we include delete permissions in the share
permissions, which now become 15.

In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Jenkins for ownCloud 29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Vincent Petry 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
Robin Appelman 040c541138 Remove a fed share from the local table before trying to notify the remote server 2016-06-23 14:19:55 +02:00
Robin Appelman bac1a3a623 Add option to `occ files_external:list` to show all configured mounts 2016-06-23 13:12:03 +02:00
Vincent Petry 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
Vincent Chan 0552933770 changes emptycontent icon to drag-accept on file-drag 2016-06-23 11:25:03 +02:00
Vincent Petry ae50e7236f Merge pull request #25225 from owncloud/enc-revertversionsize
Rollback version must also adjust cached size
2016-06-22 16:39:49 +02:00
Vincent Petry 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
Vincent Petry fa3dc909a4
Rollback version must also adjust cached size 2016-06-22 14:16:16 +02:00
Robin Appelman eed1c52aec Hide more default options in occ files_external:list 2016-06-22 13:34:55 +02:00
Vincent Petry ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests 2016-06-22 10:29:40 +02:00
Joas Schilling 3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable 2016-06-22 10:29:40 +02:00
Jenkins for ownCloud b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Jörn Friedrich Dreyer 704a993e37 Fix null pointer exception in user_ldap (#25062) 2016-06-21 16:30:48 +02:00
Vincent Petry 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
Georg Ehrke 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
Lukas Reschke 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 176fb191b7 from https://github.com/owncloud/core/pull/22432.

This was taken from owncloud/core which is AGPL licensed.
2016-06-21 14:58:35 +02:00
Robin Appelman 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 c2c6caee93 from https://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-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
2016-06-21 14:16:45 +02:00
Thomas Müller f2f1eab7f4 fix broken unit test (#25198) 2016-06-21 13:55:11 +02:00
Vincent Petry ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Robin Appelman bb465a7ab4 Catch exceptions while creating shared mounts (#25077) 2016-06-20 22:11:05 +02:00
Vincent Petry dcee528482 Don't send activity to non-admins when assigning invisible tags (#25192) 2016-06-20 22:06:34 +02:00
Vincent Petry ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues
Fix conversion issues
2016-06-20 17:15:45 +02:00
Vincent Petry 88b9f5a357 Merge pull request #25162 from owncloud/password-login-forbidden-hint
Password login forbidden hint
2016-06-20 17:05:20 +02:00
Juan Pablo Villafáñez bb24e40bf4 Fix conversion issues
Change to phpdoc type for automatic conversion
2016-06-20 14:51:36 +02:00
Bjoern Schiessle 548b8848ee
no need to mention ownCloud explicitely 2016-06-20 14:46:13 +02:00
Björn Schießle 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
Bjoern Schiessle 9eaccaf2b1
s/ownCloud/Nextcloud 2016-06-20 14:20:48 +02:00