Commit Graph

14829 Commits

Author SHA1 Message Date
Roeland Jago Douma b4ebf03bef
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 13:25:59 +02:00
Lukas Reschke 9e6634814e
Add support for CSP nonces
CSP nonces are a feature available with CSP v2. Basically instead of saying "JS resources from the same domain are ok to be served" we now say "Ressources from everywhere are allowed as long as they add a `nonce` attribute to the script tag with the right nonce.

At the moment the nonce is basically just a `<?php p(base64_encode($_['requesttoken'])) ?>`, we have to decode the requesttoken since `:` is not an allowed value in the nonce. So if somebody does on their own include JS files (instead of using the `addScript` public API, they now must also include that attribute.)

IE does currently not implement CSP v2, thus there is a whitelist included that delivers the new CSP v2 policy to newer browsers. Check http://caniuse.com/#feat=contentsecuritypolicy2 for the current browser support list. An alternative approach would be to just add `'unsafe-inline'` as well as `'unsafe-inline'` is ignored by CSPv2 when a nonce is set. But this would make this security feature unusable at all in IE. Not worth it at the moment IMO.

Implementing this offers the following advantages:

1. **Security:** As we host resources from the same domain by design we don't have to worry about 'self' anymore being in the whitelist
2. **Performance:** We can move oc.js again to inline JS. This makes the loading way quicker as we don't have to load on every load of a new web page a blocking dynamically non-cached JavaScript file.

If you want to toy with CSP see also https://csp-evaluator.withgoogle.com/

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-24 12:27:50 +02:00
Roeland Jago Douma f589f1a1d6
Move files_sharing Controllers => Controller
lib/Controller is the default location for controllers. So lets put them
all in there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 11:46:25 +02:00
Roeland Jago Douma 6604e76e94
Fix middleware tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
Roeland Jago Douma ea07bbc562
Move Share20OCS to ShareAPIController
It was already a controller just still residing in its old location.

* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
Lukas Reschke 598c145430 Merge pull request #1849 from nextcloud/oc_26368
Adding capability about new chunking - refs #25682 (#26368)
2016-10-22 15:11:49 +02:00
Lukas Reschke 1be6213ba4 Merge pull request #1832 from nextcloud/select2-into-core
Select2 into core
2016-10-22 14:35:07 +02:00
Lukas Reschke 169e889890
Add unit test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-22 14:05:53 +02:00
Arthur Schiwon ab3954745c
avoid that all avatars are copied to the author row when editing comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-21 22:57:06 +02:00
Roeland Jago Douma 7792902808
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-21 21:43:15 +02:00
Thomas Müller e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/
In case no preview is available we display the ownCloud logo

Fix unit test
2016-10-21 21:42:40 +02:00
John Molakvoæ 3e5e07aa64
Template css order
Select2 systemtags removal
Settings again
Fix Script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-10-21 16:56:31 +02:00
Thomas Müller bf85139f53
Adding capability about new chunking - refs #25682 (#26368)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-21 16:33:37 +02:00
Joas Schilling 0d878f94e6
Add unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:59:34 +02:00
Morris Jobke 2b76d14330 Merge pull request #1834 from nextcloud/downstream-26186
Add more files plugins to new DAV endpoint
2016-10-21 09:44:15 +02:00
Joas Schilling 103bf6dd28
Switch to public API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:09:26 +02:00
Joas Schilling 0b1fb180a5
Make AppConfig part of the public API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:09:23 +02:00
Roeland Jago Douma 50b6ee67cb Merge pull request #1806 from nextcloud/karakayasemi_1767
Update file.php put function posthook calls
2016-10-21 08:45:51 +02:00
Morris Jobke 2799b0a821 Merge pull request #1835 from nextcloud/downstream-24948
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 23:48:15 +02:00
Vincent Petry 73e216e0a7
Add more files plugins to new DAV endpoint (#26186)
* Add more files plugins to new DAV endpoint

Also fix report plugin to properly retrieve the path from the
prolongated URL

* In case the report is not for this plugin -> simply return to allow other plugins to get executed

* Adjust onReport tests to match new behavior
2016-10-20 21:36:15 +02:00
Semih Serhat Karakaya 33cee3502a
Update file.php put function posthook calls
Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-20 21:07:15 +02:00
Morris Jobke d9aeee2aa1 Merge pull request #1826 from nextcloud/downstream-26391
Fix post_unshareFromSelf hook parameter format
2016-10-20 20:44:05 +02:00
Joas Schilling 246bb9f33d
Move OC\Files\Storage\Shared to the right namespace 2016-10-20 20:27:44 +02:00
Morris Jobke 98c8464564 Merge pull request #1821 from nextcloud/downstream-26366
Code style changes from downstream
2016-10-20 20:18:47 +02:00
Lukas Reschke 0864f53675 Merge pull request #1796 from nextcloud/oc_fav-report
Make it possible to filter by tags with REPORT method
2016-10-20 18:32:51 +02:00
Vincent Petry d4976e5554
Fix post_unshareFromSelf hook parameter format
When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.

This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
2016-10-20 16:09:08 +02:00
Thomas Müller 08d6884107
Sanitize length headers when validating quota 2016-10-20 15:15:48 +02:00
Jan-Christoph Borchardt 5d7e9bb8fc Merge pull request #1768 from nextcloud/more-filepicker
More filepicker improvements
2016-10-20 14:46:57 +02:00
Joas Schilling cf2d1b2427
Move federated share notifications to ROS
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-20 12:14:59 +02:00
Morris Jobke 195c53b7a6 Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict
Show the path, when the filename conflicts
2016-10-20 00:27:54 +02:00
Robin Appelman 67050fd463
fix file exist dialog styling
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-19 14:18:21 +02:00
Arthur Schiwon 763a99ec30
consolidate error handling
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 13:56:49 +02:00
Arthur Schiwon bc18a2900e
fix avatar displaying after submit (either edit or new)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 12:47:53 +02:00
Roeland Jago Douma b5599a7673 Merge pull request #1795 from nextcloud/systemtags-activity-wording
change wording of system tags from un/assigned to more human added/removed
2016-10-19 12:16:46 +02:00
Joas Schilling 6f2fe8c62a
Show the path, when the filename conflicts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-19 11:33:25 +02:00
Vincent Petry 361f008c70
Make it possible to filter by tags with REPORT method
Enhanced the REPORT method on the Webdav endpoint and added a
"oc:favorite" filter rule. When set, it will return a flat list of
results filtered with only favorite files.

The web UI was also adjusted to use this REPORT method instead of the
private API endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-19 11:06:29 +02:00
Morris Jobke e072057dd8 Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits
Make sure we only use numbers as length
2016-10-19 11:01:19 +02:00
Jan-Christoph Borchardt 89dd5103cf change wording of system tags from un/assigned to more human added/removed
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-19 10:50:20 +02:00
Joas Schilling 5e48ce98c7 Merge pull request #1784 from nextcloud/fix-activity-filter-names
Adjust wording to make the separation between sharing and files more clear
2016-10-19 09:45:30 +02:00
Joas Schilling 05223a39f9
Make sure we only use numbers as length
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-19 09:28:54 +02:00
Arthur Schiwon 185433967e
display avatar (if enabled) alongside displaynames
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon 70bd6cafd4
fix regex
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon b21ce6ee5e
improve regex, fixes replacements of usernames with same trunk
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon 0e926efc9b
show displayname not uid in commit mentions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon 5d98ab83e9
resolve displayname via manager and registerable resolvers
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon fea3e20a80
move mention extraction to (I)Comment and report mentions via DAV
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:33:55 +02:00
Morris Jobke 0c8bd9fa49 Merge pull request #1788 from nextcloud/share-link-whitespace
add whitespace above share link so it's visually distinguished more
2016-10-18 20:19:58 +02:00
Jan-Christoph Borchardt 9f2e370ed7 add whitespace above share link so it's visually distinguished more
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-18 19:43:18 +02:00
Lukas Reschke b8eea5fcab Merge pull request #1729 from nextcloud/downstream-ldap-3
[downstream] LDAP empty hardening
2016-10-18 17:20:15 +02:00
Lukas Reschke 9759f55e50 Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache
Do not reset the list after adding cached entries
2016-10-18 17:18:33 +02:00
Joas Schilling b112493d1a
Adjust wording to make the separation between sharing and files clearer
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-18 17:18:14 +02:00
Lukas Reschke c55a737b26 Merge pull request #1734 from nextcloud/setvalue_opt
AllConfig setUserValue opt
2016-10-18 17:16:25 +02:00
Lukas Reschke 0923d2665f Merge pull request #1742 from nextcloud/us_sync-date-of-death
[oc] Sync deathdate and anniversary to birthday calendar
2016-10-18 17:14:53 +02:00
Morris Jobke d366b0eff0 Merge pull request #1774 from nextcloud/ellipsize-sharee
ellipsize sharee name to not overlap with can edit option on mobile
2016-10-18 17:03:03 +02:00
Morris Jobke 2bb031ecc6 Merge pull request #1606 from nextcloud/search-detail
search design details
2016-10-18 13:48:01 +02:00
Jan-Christoph Borchardt 22f76d96ad ellipsize sharee name to not overlap with
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-18 11:18:25 +02:00
Jan-Christoph Borchardt 129fdf2e2e Merge pull request #1754 from nextcloud/files-move
Add file action to move files and folders
2016-10-18 10:32:46 +02:00
Nextcloud bot 943d9737e4
[tx-robot] updated from transifex 2016-10-18 00:06:51 +00:00
Jan-Christoph Borchardt 2b79490201 use more fitting icon for files move action 2016-10-17 18:52:25 +02:00
Joas Schilling 4d6ec43402
Do not reset the list after adding cached entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-17 15:43:21 +02:00
Joas Schilling 77a5491d9d
Make sure the UID is correctly cased
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-17 13:41:38 +02:00
Morris Jobke 96f8f209b9 Merge pull request #1449 from nextcloud/comments-user-mention
Notifications for simple @-mentioning in comments
2016-10-17 09:30:47 +02:00
Nextcloud bot 5b74b3ceaf
[tx-robot] updated from transifex 2016-10-17 00:06:55 +00:00
Arthur Schiwon dade28cadd
Merge branch 'master' into downstream-ldap-3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-16 14:42:16 +02:00
Nextcloud bot 245a8f8fbc
[tx-robot] updated from transifex 2016-10-16 00:06:56 +00:00
Nextcloud bot 00ed841559
[tx-robot] updated from transifex 2016-10-15 00:06:56 +00:00
Robin Appelman fdc2e8ba56
Add file action to move files and folders
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-14 16:23:11 +02:00
Arthur Schiwon 70c7781aa8
apply some polish
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-14 15:36:05 +02:00
Lukas Reschke 62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries
optimize Folder::getById to use less queries
2016-10-14 15:18:23 +02:00
Thomas Citharel 3b055b160e
fix typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-14 11:48:18 +02:00
Thomas Müller 5cd90d4116
[9.2] Sync deathdate and anniversary to birthday calendar (#25655)
* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-14 10:12:43 +02:00
Nextcloud bot 92c24a91fa
[tx-robot] updated from transifex 2016-10-14 00:07:00 +00:00
Roeland Jago Douma 6c5f7d586e
Fix migration tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-13 19:40:44 +02:00
Arthur Schiwon a49d571799
fix and tidy up tests after merge conflicts
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 15:34:40 +02:00
Morris Jobke 05869e4d22 Merge pull request #1726 from nextcloud/fix-symfony-table
symfony replaced table helper by class, fixes two broken LDAP occ com…
2016-10-13 12:19:15 +02:00
Nextcloud bot 9aae4a0d02
[tx-robot] updated from transifex 2016-10-13 00:07:02 +00:00
Victor Dubiniuk c4fcd1f282
Update tests for phunit 5.5
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 01:06:45 +02:00
Victor Dubiniuk 011d5f554c
Harden empty
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 00:53:34 +02:00
Arthur Schiwon 9e817e9e0b
symfony replaced table helper by class, fixes two broken LDAP occ commands
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 23:47:07 +02:00
Arthur Schiwon 1bcd2ca8e3
emit pre-update event for comments
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 18:06:22 +02:00
Robin Appelman 2de59d8a2a
remove unneeded unlock
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
Robin Appelman ab10a54836
remove duplicate trait
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:38 +02:00
Robin Appelman f63f0aa1ae
get node by path as fallback
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman 9754724c8b
fix getting recipient share in ocs api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman 7d1e800c15
fix share tests not passing path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
Robin Appelman 1b3b816a0a
re-use the share node while formating if we already have it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
Robin Appelman 3845d4ec9a
more robust test setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman 7ce68ce6ac
phpunit is weird
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman 37eded7e7c
Always unlock node after trying to create a share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
Roeland Jago Douma b2d68c0009 Merge pull request #1713 from nextcloud/rebase_1493
fix issue #1482 - mail invites through v1 webdav
2016-10-12 10:24:44 +02:00
Claudemir Todo Bom 5b7f272fd4
fix issue #1482 - mail invites through v1 webdav
Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 09:13:55 +02:00
Roeland Jago Douma 0c574569a4
Readd Notify command
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:49 +02:00
Thomas Müller 8628d57b2c
Move console command registration to info.xml for encryption as well as files_external
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:15 +02:00
Nextcloud bot c2be9cb605
[tx-robot] updated from transifex 2016-10-12 00:08:16 +00:00
Thomas Müller c5ca71ee82
[9.2] Register commands in info.xml (#26248)
* Use DI to load console commands from the apps - class name to be defined in the info.xml

* Load commands from info.xml

* Fix unit test

* Allow Di magic for IMountManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 19:48:26 +02:00
Morris Jobke 675230f86d Merge pull request #1407 from nextcloud/multiline_comments
Bring back multiline comments
2016-10-11 16:17:51 +02:00
skjnldsv 1930aa3102
Fix bold no results search text
Fix wording
2016-10-11 15:06:25 +02:00
skjnldsv dcddd4b9d5 fix textarea submit 2016-10-11 12:33:20 +02:00
Nextcloud bot cc4b51490e
[tx-robot] updated from transifex 2016-10-11 00:06:54 +00:00
Roeland Jago Douma ada4d6cafc Merge pull request #1680 from nextcloud/downstream-26308
Remove PNG fallbacks from files app
2016-10-10 22:09:48 +02:00
Lukas Reschke d99ab1b038 Merge pull request #1675 from nextcloud/remove-unneeded-variable
remove unneeded variable & proper element creation
2016-10-10 20:28:30 +02:00
Morris Jobke 0497affc46
fix drag and drop icon for files app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-10 15:09:15 +02:00
Vincent Petry db472b20cc
Remove PNG fallbacks from files app (#26308) 2016-10-10 15:08:40 +02:00
Morris Jobke 5158328190
remove unneeded variable & proper element creation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-10 14:06:43 +02:00
Roeland Jago Douma 7d2f70ef72
Use more IConfig and add unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 10:51:13 +02:00
Roeland Jago Douma bdf4bf4669
DI IConfig into ldap helper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 10:18:18 +02:00
Roeland Jago Douma 1ba2b7e5d4
Do not query data that is already in the appconfig
This is already available. We better use a simple regex.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 09:39:20 +02:00
Nextcloud bot 3f40bb69f8
[tx-robot] updated from transifex 2016-10-10 00:06:58 +00:00
Nextcloud bot 9fc3209d2c
[tx-robot] updated from transifex 2016-10-09 00:06:49 +00:00
Nextcloud bot 0beecbf2c5
[tx-robot] updated from transifex 2016-10-08 00:06:50 +00:00
Arthur Schiwon a9671a4dc2
adjust wording of the notification
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-08 01:17:51 +02:00
Arthur Schiwon a35d4e7b44
remove notifications of deleted comments from the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-08 01:10:49 +02:00
Arthur Schiwon 006da9afd7
use different files route/controller
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 17:27:33 +02:00
Arthur Schiwon e1073cf442
Notificacations for simple @-mentioning in comments
(WIP) notify user when mentioned in comments

Fix doc, and create absolute URL for as notification link.

PSR-4 compatibility changes

also move notification creation to comments app

Do not notify yourself

unit test for controller and application

smaller fixes

- translatable app name
- remove doubles in mention array
- micro perf optimization
- display name: special label for deleted users, keep user id for users that could not be fetched from userManager

Comment Notification-Listener Unit Test

fix email adresses

remove notification when triggering comment was deleted

add and adjust tests

add missing @license tags

simplify NotificationsController registration

appinfo simplification, php docs

make string easier to translate

adjust test

replace dispatcher-based listeners with a registration method and interface

safer to not pass optional data parameter to setSubject for marking as processed. ID and mention suffices

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

update comment

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 17:11:19 +02:00
Morris Jobke 7264d20152 Merge pull request #1643 from nextcloud/ldap_more_caching
cache loginName2UserName and cover the method with unit tests
2016-10-07 09:38:53 +02:00
Nextcloud bot 838e258b44
[tx-robot] updated from transifex 2016-10-07 00:07:04 +00:00
Arthur Schiwon a30341823e
cache loginName2UserName and cover the method with unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 01:39:57 +02:00
Morris Jobke 6278d3bbfd Merge pull request #1144 from nextcloud/translate-default-calendar
translate default calendar & default address book displaynames & add …
2016-10-06 23:00:26 +02:00
Arthur Schiwon 979612fa08
get rid of test warnings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-06 22:53:14 +02:00
Morris Jobke 55e72caf9b Merge pull request #1616 from nextcloud/downstream_ldap_6
Prevent user with empty uid
2016-10-06 14:43:25 +02:00
Morris Jobke 70e0074e5c
Add transifex config 2016-10-06 14:20:02 +02:00
Joas Schilling 7dd952d5a2
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 14:20:02 +02:00
Joas Schilling ce964f0a10
Translate the Contacts addressbook when it's default
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 14:20:01 +02:00
Joas Schilling a4f82f13f3
Translate the personal calendar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 14:19:58 +02:00
Morris Jobke 0a092e94c7 Merge pull request #1636 from nextcloud/downstream-26203-fix-synjob-class-name
Fix SyncJob class name in info.xml
2016-10-06 12:45:54 +02:00
Joas Schilling 82c29e1204
Log the error with display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 11:21:43 +02:00
Joas Schilling f6e8da186d Merge pull request #1525 from nextcloud/newdav-tagsplugin
Newdav tagsplugin
2016-10-06 11:13:48 +02:00
Joas Schilling 1a26e7a8e7
Fix SyncJob class name in info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-06 10:55:28 +02:00
Morris Jobke ff3e8c2139 Merge pull request #1518 from nextcloud/dav-fileshome-directory-properties
FilesHome now also returns DAV properties
2016-10-06 00:21:44 +02:00
Morris Jobke fe2116ecf7 Merge pull request #1519 from nextcloud/better-comments-in-activity-sidebar
Better comments in activity sidebar
2016-10-05 23:56:10 +02:00
Lukas Reschke f2b1a1781c Merge pull request #1568 from nextcloud/test-running-coverage-also-for-db
[Test] Generate coverage for DB group
2016-10-05 14:37:25 +02:00
Joas Schilling 43265befac
Update file header
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 14:33:54 +02:00
Vincent Petry dba72a48cd
Fix activity rendering plugin name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:26 +02:00
Joas Schilling ed70d4a2dc
Mark the methods as copied
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:26 +02:00
Joas Schilling bd0c9489f6
Make sure the CSS rules apply to the activityTabView as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling 724cd50e52
Register a ActivityTabView plugin
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling fe6c9f7f47
Remove resolved FIXME
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling b8cf2fb58b
Do not shorten comments in the activity sidebar
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:22 +02:00
Morris Jobke 088dd716a3 Merge pull request #1418 from nextcloud/add-move-rename-support
Add support for translations of move/rename activities
2016-10-05 14:02:35 +02:00
Lukas Reschke a1f5364d7f
Generate coverage for quick DB tests
This adds the "QUICKDB" group which excludes some tests that abuse unit tests as integration tests as displayed in https://github.com/nextcloud/server/issues/1626

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 13:55:44 +02:00
Joas Schilling 671f16f706
Add icons to activity navigation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
Joas Schilling de81c52c80
Add support for translations of move/rename activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 10:06:59 +02:00
Vincent Petry 5d25563634
New dav endpoint register tags plugin
This makes it possible to retrieve and PROPPATCH the favorite info

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 08:19:41 +02:00
Nextcloud bot 66ae43880b
[tx-robot] updated from transifex 2016-10-05 00:06:57 +00:00
Morris Jobke 7c20aa2d72 Merge pull request #1617 from nextcloud/issue-1605-update-notification-readable-version
Update notification readable version (10.0.1 instead of 9.1.1.5)
2016-10-04 17:12:10 +02:00
Roeland Jago Douma c83b3e6bd5
Fix js test 2016-10-04 13:07:44 +02:00
Roeland Jago Douma 5ca50d9f31
Add autosize to comments input
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-04 13:04:56 +02:00
Joas Schilling db57190e33
Use new URL schema
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-04 12:49:55 +02:00
Joas Schilling b74c12c3f5
Use the readable version for notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-04 12:49:27 +02:00
Jörn Friedrich Dreyer 0ae9a2c9fe
Prevent user with empty uid
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-04 12:26:06 +02:00
Joas Schilling 3a0e06147c Merge pull request #1613 from nextcloud/2fa-backup-codes-psr4
Do not use underscores in PSR4 namespaces of the backup codes app
2016-10-04 10:37:36 +02:00
Nextcloud bot 14d226dc33
[tx-robot] updated from transifex 2016-10-04 00:06:56 +00:00
Christoph Wurst f27b7fa8d1
Do not use underscores in PSR4 namespaces of the backup codes app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-10-03 21:47:33 +02:00
Morris Jobke 62d5daa94f Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-name-conflict
Fix special characters when renaming to a conflict
2016-10-03 16:47:20 +02:00
Lukas Reschke 08b0e5c112 Merge pull request #607 from nextcloud/sharing-popover-menu
Move sharing options into popover menu
2016-10-03 14:18:17 +02:00
Christoph Wurst 407232b772 Merge pull request #1547 from nextcloud/files-translate-filesummary
Translate file summary connector (#26221)
2016-10-03 10:41:20 +02:00
Christoph Wurst 96af627bb7
fix sharing icon's alignment and add padding to the unshare icon 2016-10-03 09:35:54 +02:00
Nextcloud bot 07a1be2e06
[tx-robot] updated from transifex 2016-10-03 00:12:47 +00:00
Nextcloud bot 6297d201df
[tx-robot] updated from transifex 2016-10-02 00:16:25 +00:00
Nextcloud bot da03018add
[tx-robot] updated from transifex 2016-10-01 00:08:23 +00:00
Joas Schilling 0ecaf8e602
Fix special characters when renaming to a conflict
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-30 12:44:49 +02:00
Nextcloud bot 99076a8c0d
[tx-robot] updated from transifex 2016-09-30 00:08:13 +00:00
Olivier Mehani 60cab0d73e Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter::updateCard (#26243)
Signed-off-by: Olivier Mehani <shtrom@ssji.net>

#26242
2016-09-29 17:09:24 +02:00
Lukas Reschke 8a14f4a899 Merge pull request #1567 from nextcloud/inject-http-service
Inject IHTTPClientService
2016-09-29 11:56:07 +02:00
Nextcloud bot 4b873b35b7
[tx-robot] updated from transifex 2016-09-29 00:07:08 +00:00
Lukas Reschke 498b7399c1
Inject IHTTPClientService
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…

See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference

Pretty similar to https://github.com/nextcloud/server/pull/1565

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:26:20 +02:00
Lukas Reschke bd70221d61
Mock HTTPClientService
These tests were not using any kind of mocks at all! This made the test execution time took 2 minutes instead of now less than 1 second… (because multiple HTTP requests were queued and timed-out then…)

See https://blackfire.io/profiles/compare/6d2611f2-ad08-47b6-973b-2b5f9c8b96d2/graph for reference

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:06:56 +02:00
Lukas Reschke 2eab2ffa22 Merge pull request #1553 from nextcloud/fix-comment-count-translation
Fix comment count tooltip
2016-09-28 23:17:05 +02:00
Lukas Reschke 0f321fe116 Merge pull request #1534 from nextcloud/svg-optimization
Svgo optimization
2016-09-28 23:05:48 +02:00
Morris Jobke 85301df817 Merge pull request #1513 from nextcloud/fix-etag-on-move
Return ETag and OC-ETag in case of a move (#25683)
2016-09-28 21:46:51 +02:00
Morris Jobke ef0760f84f Merge pull request #1545 from nextcloud/delete-calendars-with-their-users
Delete calendars with their users
2016-09-28 21:42:55 +02:00
Thomas Müller bd96c6aa38
Return ETag and OC-ETag in case of a move (#25683)
Downstreaming of https://github.com/owncloud/core/pull/25683

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-28 21:12:50 +02:00
Morris Jobke f4eee1d3a5 Merge pull request #1512 from nextcloud/share-alttext
Display "Share" alt text for share action icon (#26158)
2016-09-28 20:44:15 +02:00
Thomas Citharel 6c8bcb38f1
Rename deleteAllSharesForUser() to deleteAllSharesByUser()
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-09-28 15:32:03 +02:00
Lukas Reschke 1602e82363
UpdateState is empty if no update is available
This leads to log messages such as "Undefined index: updaterEnabled at /media/psf/nextcloud/apps/updatenotification/lib/Controller/AdminController.php#116".

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-28 12:37:08 +02:00
Joas Schilling c9c64141ee
Fix comment count tooltip
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-28 10:54:37 +02:00
Julius Härtl f219ed2e99 Merge pull request #1535 from nextcloud/files-loading-css-fix
Use css loading animation and not gif
2016-09-28 10:38:46 +02:00
Nextcloud bot e2670e62eb
[tx-robot] updated from transifex 2016-09-28 00:10:20 +00:00
Lukas Reschke 479c427f2a
Add IL10N to unit test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 21:12:37 +02:00
John Molakvoæ f623d020f7 Use css loading animation and not gif
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 21:06:25 +02:00
skjnldsv 71830b285c Svgo optimization
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
Lukas Reschke 2f488ce373 Merge pull request #1459 from nextcloud/upstream-fix_trashbin_deleteallhooks_solution2
[Upstream] fix trashbin deleteallhooks solution2
2016-09-27 18:52:14 +02:00
Lukas Reschke 06e969cb74 Merge pull request #1197 from nextcloud/oc-public-sharing
CalDAV calendar public sharing
2016-09-27 18:51:40 +02:00
Vincent Petry 7de4c809ef
Translate file summary connector (#26221)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:38:56 +02:00
Thomas Citharel da1543eef7
fix deletion of calendars
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:33:56 +02:00
Thomas Citharel 5215833fe4
delete shares to an user
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:19 +02:00
Thomas Müller 97a47f49a1
Adjust delete logic and ann unit tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:10 +02:00
Thomas Citharel 18c07f0692
delete also addressbooks on user deletion
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:02 +02:00
Thomas Citharel 7db01ff805
delete calendars when users are deleted
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:29:53 +02:00
Björn Schießle 6ca8ce6228 Merge pull request #1543 from nextcloud/increase-component-length
Increase the max length for components
2016-09-27 18:01:45 +02:00
Joas Schilling a7315e98ff
Increase the max length for components
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-27 17:03:57 +02:00
Joas Schilling 3e00554d35
Respect updater kill switch and fall back to download button
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-27 14:47:59 +02:00
Nextcloud bot 810f72df46
[tx-robot] updated from transifex 2016-09-27 00:09:46 +00:00
Lukas Reschke a43c680d9f Merge pull request #1499 from nextcloud/updater
Add repair step and revert "Open updater" button
2016-09-26 22:28:21 +02:00
Morris Jobke 6b2920a6bc Merge pull request #1520 from nextcloud/upload-allow-zero
Allow uploading empty files (#26113)
2016-09-26 17:40:53 +02:00
Morris Jobke 3e4a4cab34 Merge pull request #1510 from nextcloud/workflow-fix-handlebar-update
Fix selection of workflowengine rules and operators
2016-09-26 17:33:22 +02:00
Joas Schilling fc65093694 Merge pull request #1460 from nextcloud/fed-share-retry
[upstream] Fix fed share test call to return proper result
2016-09-26 13:59:28 +02:00
Morris Jobke 4064010c29
Revert "Fix tests"
This reverts commit 27a3c68d84.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-09-26 13:44:50 +02:00
Lukas Reschke 4f4286932f Merge pull request #1457 from nextcloud/upstream-fix-birthday-calendar-component
[Upstream] fix birthday calendar component
2016-09-26 13:21:08 +02:00
Lukas Reschke 0873fe4284 Merge pull request #1524 from nextcloud/addScript
use correct case for addScript (#26214)
2016-09-26 13:18:41 +02:00
Lukas Reschke 0c6957dfb7 Merge pull request #1406 from nextcloud/fix-folder-drop-in-firefox
Fix folder drag glitch in Firefox
2016-09-26 13:10:19 +02:00
Thomas Citharel dcc23114e9
fix annotations & copyright headers 2016-09-26 11:55:43 +02:00
Thomas Citharel 9c75b00850
fix tests 2016-09-26 11:55:43 +02:00
Thomas Citharel 17d5dfdeb1
add in same request 2016-09-26 11:55:43 +02:00
Thomas Citharel 8360222554
fix public calendars 2016-09-26 11:55:42 +02:00
Thomas Müller d884370844
Use true random string as uri for public calendars - as a result we can no longer return the pre-publish-url 2016-09-26 11:55:42 +02:00
Lukas Reschke 4659e3ab59
Add new constructor args 2016-09-26 11:55:42 +02:00
Lukas Reschke 2fff203c59
Add missing constructor argument 2016-09-26 11:55:42 +02:00
Thomas Citharel ff67cbc6af
Add test for PublicCalendarRoot 2016-09-26 11:55:42 +02:00
Thomas Citharel 3e9a346223
add calendarserver-sharing to the list of advertised features 2016-09-26 11:55:41 +02:00
Thomas Citharel ad0eeaaf1c
use AllowedSharingModes for can-be-published & can-be-shared 2016-09-26 11:55:41 +02:00
Thomas Citharel 6378dbca7e
fix can-be-published 2016-09-26 11:55:41 +02:00
Thomas Citharel f0421e1f75
add missing tests 2016-09-26 11:55:41 +02:00
Thomas Citharel f16ea48e96
add can-be-published property 2016-09-26 11:55:40 +02:00
Thomas Citharel a4fe596a21
add space between calendarname and owner name 2016-09-26 11:55:40 +02:00
Thomas Citharel 8433c3ca31
fix getChild() 2016-09-26 11:55:40 +02:00
Thomas Citharel 9af2a9ff4d
test serializer 2016-09-26 11:55:40 +02:00
Thomas Citharel 691b3ab448
Add publicuri to oc_dav_shares table and start working with it 2016-09-26 11:55:39 +02:00
Thomas Citharel dd248caa09
fix some bracket positions 2016-09-26 11:55:39 +02:00
Thomas Citharel 1899116509
move getPublicCalendar inside the caldav backend 2016-09-26 11:55:39 +02:00
Thomas Citharel 762726d988
fix indent once and for all 2016-09-26 11:55:39 +02:00
Thomas Citharel 3921385ed3
fix things (indentation, tests, comments, backend custom implementation 2016-09-26 11:55:39 +02:00
Thomas Citharel ebf23778f5
fix unpublishing test 2016-09-26 11:55:38 +02:00
Thomas Citharel de5e212694
fix plugin test 2016-09-26 11:55:38 +02:00
Thomas Citharel 77216e7ca9
a few tests 2016-09-26 11:55:38 +02:00
Thomas Müller d0ec6b9c15
Disable OPTIONS handling - done by sabre 2016-09-26 11:55:38 +02:00
Thomas Müller e783d01da7
Allow public access to the principals/system/public 2016-09-26 11:55:37 +02:00
Thomas Citharel aadb56dfcc
Fix wrong way to get publish status 2016-09-26 11:55:37 +02:00
Thomas Citharel f09c46d166
Fix some tests 2016-09-26 11:55:37 +02:00
Thomas Citharel 2df69ec7f4
correct get published status and minor fixes 2016-09-26 11:55:37 +02:00
Thomas Citharel aca305332a
Fix DB call for MySQL databases 2016-09-26 11:55:37 +02:00
Thomas Citharel 994001c480
Dirty hack to disable dav plugins on public calendar urls 2016-09-26 11:55:36 +02:00
Thomas Müller 00dc157b19
Fix requests for browser plugin as well as for the public calendar root folder 2016-09-26 11:55:36 +02:00
Thomas Müller e7085aab38
Allow not-authenticated access to specific urls 2016-09-26 11:55:36 +02:00
Thomas Müller 90ab6e4fd9
Add new root collection public-calendars which holds all public calendars 2016-09-26 11:55:36 +02:00
Thomas Citharel 8da2100e7d
Start work on returning CalDAV published calendars 2016-09-26 11:55:35 +02:00
Thomas Citharel bd0aae8636
No need to call database twice 2016-09-26 11:55:35 +02:00
Thomas Citharel 7e5a82b968
Use urlgenerator to generate an absolute url
And pass Config the correct way too
2016-09-26 11:55:35 +02:00
Thomas Citharel 72f35f8862
Use ressource ID instead of name 2016-09-26 11:55:35 +02:00
Thomas Citharel f89961ddba
Fix annotations 2016-09-26 11:55:34 +02:00
Thomas Citharel 4a0e6e2ad0
Remove unnecessary line 2016-09-26 11:55:34 +02:00
Thomas Citharel 1652a74feb
Fix publish-url property & getPublishStatus() fct 2016-09-26 11:55:34 +02:00
Thomas Citharel 981c38f6d9
Remove unnecessary implementation 2016-09-26 11:55:34 +02:00
Thomas Citharel 5824c2493b
Make little corrections
Function getPublishedStatus) is not working atm.
2016-09-26 11:55:34 +02:00
Thomas Citharel 69d3601dcb
Proper work on Publishing 2016-09-26 11:55:33 +02:00
Jörn Friedrich Dreyer b79997dd33
use correct case for addScript (#26214)
Downstreaming of https://github.com/owncloud/core/pull/26214

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 11:44:57 +02:00
Vincent Petry e8836bfd30
Allow uploading empty files (#26113)
Downstreaming of https://github.com/owncloud/core/pull/26113

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 11:28:05 +02:00
Vincent Petry b17e836e45
FilesHome now also returns DAV properties
The files home node must also return DAV properties like etag,
permissions, etc for the clients to work like they did with the old
endpoint.

This fix makes FilesHome extend the Sabre Directory class, this makes
the FilesPlugin and other plugins recognize it as a directory and will
retrieve the matching properties when applicable.

Downstream of https://github.com/owncloud/core/pull/26066

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 11:24:23 +02:00
Vincent Petry f07d146644
Display "Share" alt text for share action icon (#26158)
Downstreaming of https://github.com/owncloud/core/pull/26158

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 10:30:11 +02:00
Joas Schilling 968dc876b2
Do not translate the samples themselves
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-26 10:30:08 +02:00