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

14078 commits

Author SHA1 Message Date
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 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

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
Morris Jobke
22fd33137f Merge pull request #162 from nextcloud/fix-owncloud-reference 
Fix references
 2016-06-20 14:19:30 +02:00
Vincent Petry
c1770d746d Merge pull request #25159 from owncloud/share-app-initorder 
Delay files_sharing's registerMountProviders
 2016-06-20 13:31:36 +02:00
Morris Jobke
e95c15e53a
fix more strings 2016-06-20 13:14:24 +02:00
Morris Jobke
19b531fd14
fix more strings 2016-06-20 13:14:24 +02:00
Morris Jobke
9107fd6cd6
fix federation strings 2016-06-20 13:13:37 +02:00
Morris Jobke
416466b700
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke
9327ded595
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke
ca4fd9d25b
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke
e7e0dc608b
fix strings 2016-06-20 13:13:37 +02:00
Bjoern Schiessle
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
Vincent Petry
09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests 
Fix GDrive test rename overwrite folder
 2016-06-20 11:02:24 +02:00
Vincent Petry
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
Vincent Petry
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
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
d65c56d7de [tx-robot] updated from transifex 2016-06-18 01:58:51 -04:00
Markus Goetz
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
Vincent Petry
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
Thomas Müller
bac96e7ffc
Wait for port being accessible in addition to the notify socket 2016-06-17 13:29:24 +02:00
Christoph Wurst
5a8cfab68f
throw PasswordLoginForbidden on DAV 2016-06-17 11:30:24 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS 2016-06-17 11:11:59 +02:00
Christoph Wurst
82b50d126c
add PasswordLoginForbiddenException 2016-06-17 11:02:07 +02:00
Vincent Petry
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