Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions appinfo/app.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
/**
* @author Frank Karlitschek <frank@owncloud.org>
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
12 changes: 6 additions & 6 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<id>activity</id>
<name>Activity</name>
<description>
This application enables users to view actions related to their files in ownCloud.
This application enables users to view actions related to their files in Nextcloud.
Once enabled, users will see a new icon “Activity” in their apps menu.
When clicked, a new page appears for users to track the activity related to files – from new files, to deleted files, move, rename, updates and shared activity.
The user can configure their individual activity settings in their personal menu.
Expand All @@ -22,11 +22,11 @@
</types>

<documentation>
<admin>https://doc.owncloud.org/server/9.1/admin_manual/configuration_server/activity_configuration.html</admin>
</documentation>
<website>https://github.com/owncloud/activity/</website>
<bugs>https://github.com/owncloud/activity/issues</bugs>
<repository type="git">https://github.com/owncloud/activity.git</repository>
<admin>https://docs.nextcloud.org/server/10/admin_manual/configuration_server/activity_configuration.html</admin>
</documentation>
<website>https://github.com/nextcloud/activity/</website>
<bugs>https://github.com/nextcloud/activity/issues</bugs>
<repository type="git">https://github.com/nextcloud/activity.git</repository>

<dependencies>
<owncloud min-version="9.1" max-version="9.1" />
Expand Down
8 changes: 4 additions & 4 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* @author Frank Karlitschek <frank@owncloud.org>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions appinfo/update.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion docs/endpoint-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Field name | Type | Value description
`message` | string (Optional) | Untranslated arbitrary message (unused by core apps)
`messageparams` | array | See `subjectparams`
`message_prepared` | string | Translated version of the message with parameters included (See section `MarkUp`)
`link` | string (Optional) | A full URL pointing to a suitable location (e.g. `'http://localhost/ownCloud/master/core/index.php/apps/files/?dir=%2Ffolder'` in case the folder got created)
`link` | string (Optional) | A full URL pointing to a suitable location (e.g. `'http://localhost/cloud/master/core/index.php/apps/files/?dir=%2Ffolder'` in case the folder got created)
`object_type` | string (Optional) | Type of the object this activity is about (e.g. `'files'` is used for files and folders)
`object_id` | int (Optional) | ID of the object this activity is about (e.g. ID in the file cache is used for files and folders)
`object_name` | string (Optional) | Name of the object this activity is about (e.g. for files it's the relative path to the user's root: `'/folder/.travis.yml'`)
Expand Down
24 changes: 10 additions & 14 deletions issue_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Thanks for reporting issues back to ownCloud! This is the issue tracker of ownCloud, if you have any support question please check out https://owncloud.org/support
Thanks for reporting issues back to Nextcloud! This is the issue tracker of the Nextcloud Activity App, if you have any support question please check out https://help.nextcloud.com/

This is the bug tracker for the Activity App. Find other components at https://github.com/owncloud/core/blob/master/CONTRIBUTING.md#guidelines
This is the bug tracker for the Activity App. Find other components at https://github.com/nextcloud/core/blob/master/CONTRIBUTING.md#guidelines

To make it possible for us to help you please fill out below information carefully.
-->
Expand All @@ -25,14 +25,14 @@ Tell us what happens instead

**PHP version:**

**ownCloud version:** (see ownCloud admin page)
**Nextcloud version:** (see Nextcloud admin page)

**Where did you install ownCloud from:**
**Where did you install Nextcloud from:**

**Signing status (ownCloud 9.0 and above):**
**Signing status:**

```
Login as admin user into your ownCloud and access
Login as admin user into your Nextcloud and access
http://example.com/index.php/settings/integrity/failed
paste the results here.
```
Expand All @@ -42,26 +42,22 @@ paste the results here.
```
If you have access to your command line run e.g.:
sudo -u www-data php occ app:list
from within your ownCloud installation folder
from within your Nextcloud installation folder
```

**The content of config/config.php:**

```
If you have access to your command line run e.g.:
sudo -u www-data php occ config:list system
from within your ownCloud installation folder
from within your Nextcloud installation folder

or

Insert your config.php content here
(Without the database password, passwordsalt and secret)
```

**Are you using external storage, if yes which one:** local/smb/sftp/...

**Are you using encryption:** yes/no

**Are you using an external user-backend, if yes which one:** LDAP/ActiveDirectory/Webdav/...

### Client configuration
Expand All @@ -71,9 +67,9 @@ Insert your config.php content here

### Logs

#### ownCloud log (data/owncloud.log)
#### Nextcloud log (data/nextcloud.log)
```
Insert your ownCloud log here
Insert your Nextcloud log here
```

#### Browser log
Expand Down
5 changes: 3 additions & 2 deletions lib/Api.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/BackgroundJob/EmailNotification.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/BackgroundJob/ExpireActivities.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Consumer.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/Activities.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/EndPoint.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/Feed.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/OCSEndPoint.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
7 changes: 4 additions & 3 deletions lib/Controller/Settings.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
7 changes: 4 additions & 3 deletions lib/Data.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @author Frank Karlitschek <frank@owncloud.org>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Joas Schilling <coding@schilljs.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/DataHelper.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Exception/InvalidFilterException.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Extension/Files.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Extension/Files_Sharing.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
7 changes: 4 additions & 3 deletions lib/FilesHooks.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @author Frank Karlitschek <frank@owncloud.org>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Joas Schilling <coding@schilljs.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/FilesHooksStatic.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Formatter/BaseFormatter.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Formatter/CloudIDFormatter.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions lib/Formatter/FileFormatter.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* @author Joas Schilling <nickvergessen@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
Expand Down
Loading