Skip to content
Open
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
21 changes: 6 additions & 15 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
---
name: Bug report
about: Create a bug report to help us improve
title: "[BUG]"
labels: ''
assignees: ''

---

### Actual behaviour
-Tell us what happens

Expand All @@ -19,8 +10,8 @@ assignees: ''
3.


Can this problem be reproduced with the official owncloud server?
(url: https://ocis.ocis.master.owncloud.works, user: einstein, password: relativity)
Can this problem be reproduced with the official server?
(url: https://demo.opencloud.eu)


### Environment data
Expand All @@ -30,17 +21,17 @@ Device model:

Stock or customized system:

ownCloud app version:
Android app version:

ownCloud server version:
Server version:

### Logs
#### Web server error log
```
Insert your webserver log here
```

#### ownCloud log (data/owncloud.log)
#### Server log
```
Insert your ownCloud log here
Insert your OpenCloud server log here
```
34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

136 changes: 0 additions & 136 deletions .github/ISSUE_TEMPLATE/release_template.md

This file was deleted.

9 changes: 0 additions & 9 deletions .github/pull_request_template.md

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/calens.yml

This file was deleted.

35 changes: 13 additions & 22 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
## Submitting issues

If you have questions about how to use ownCloud, please join our [rocket chat channel][rocketchat] or our [forum][forum].
If you have questions about how to use OpenCloud, please join our matrix channel.

### Guidelines
* [Report the issue](https://github.com/owncloud/android/issues/new) using on of our [templates][template], they include all the information we need to track down the issue.
* This repository is *only* for issues within the ownCloud Android app code. Issues in other components should be reported in their own repositories:
- [ownCloud core](https://github.com/owncloud/core/issues)
- [oCIS](https://github.com/owncloud/ocis/issues)
- [iOS client](https://github.com/owncloud/ios-app/issues)
- [Desktop client](https://github.com/owncloud/client/issues)
* Search the [existing issues](https://github.com/owncloud/android/issues) first, it's likely that your issue was already reported.
* [Report the issue](https://github.com/opencloud-eu/android/issues/new), they include all the information we need to track down the issue.
* This repository is *only* for issues within the Android app code. Issues in other components should be reported in their own repositories:
- [Repositories](https://github.com/opencloud-eu)
* Search the [existing issues](https://github.com/opencloud-eu/android/issues) first, it's likely that your issue was already reported.

If your issue appears to be a bug, and hasn't been reported, open a new issue.

Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.

[template]: https://github.com/owncloud/android/tree/master/.github/ISSUE_TEMPLATE
[rocketchat]: https://talk.owncloud.com/channel/mobile
[forum]: https://central.owncloud.org/


## Contributing to Source Code

Thanks for wanting to contribute source code to ownCloud. That's great!
Thanks for wanting to contribute source code to OpenCloud. That's great!

Before we're able to merge your code into the ownCloud app for Android, please, check the [contribution guidelines][contribution].
Before we're able to merge your code into the OpenCloud app for Android, please, check the contribution guidelines.

### Guidelines
* Contribute your code in a feature, fix, improvement or technical enhancement branch by using one of the following branch names:
Expand All @@ -36,7 +31,7 @@ Before we're able to merge your code into the ownCloud app for Android, please,
Please, use the mentioned prefixes because CI system is ready to match with them. Be sure your feature, fix, improvement or technical branches are updated with latest changes in official `android/master`, it will give us a better chance to test your code before merging it with stable code.
* Once you are done with your code, start a pull request to merge your contribution into official `android/master`.
* Keep on using pull requests for your next contributions although you own write permissions.
* Important to mention that ownCloud Android team uses OneFlow as branching model. It's something as useful as easy:
* Important to mention that ÒpenCloud Android team uses OneFlow as branching model. It's something as useful as easy:

* `master` will stay as main branch. Everything will work around it.
* Feature branch: new branch created from `master`. Once it is finished and DoD accomplished, rebased and merged into `master`.
Expand All @@ -46,16 +41,12 @@ Before we're able to merge your code into the ownCloud app for Android, please,

Interesting [link](https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow) about this.

[contribution]: https://owncloud.com/contribute/

### 1. Fork and download android/master repository:

* Please follow [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) to setup ownCloud Android app work environment.
* Please follow [SETUP.md](https://github.com/opencloud-eu/android/blob/master/SETUP.md) to setup OpenCloud Android app work environment.

### 2. Create pull request:

NOTE: You must sign the [CLA](https://cla-assistant.io/owncloud/android) before your changes can be accepted!

* Create new feature, fix, improvement or technical enhancement branch from your master branch: ```git checkout -b feature/feature_name```
* Register your changes: `git add filename`
* Commit your changes locally. Please, if posible use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) to add descriptive messages to the commits. Take the simplest approach:
Expand Down Expand Up @@ -89,9 +80,9 @@ In order to check or review the stable versions, all available tags can be fetch
## Translations
Please submit translations via [Transifex][transifex].

[transifex]: https://www.transifex.com/projects/p/owncloud/
[transifex]: https://explore.transifex.com/opencloud-eu/opencloud-eu/

## Code of conduct
Please, read the [ownCloud code of conduct]. Being respectful and polite with other members of the community and staff is necessary to develop a better product together.
Please, read the [code of conduct]. Being respectful and polite with other members of the community and staff is necessary to develop a better product together.

[ownCloud code of conduct]: https://owncloud.com/contribute/code-of-conduct/
[code of conduct]: https://opencloud.eu
31 changes: 11 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,31 @@
# [ownCloud](https://owncloud.org) Android app
# [OpenCloud](https://opencloud.eu) Android app

<a href="https://play.google.com/store/apps/details?id=eu.opencloud.android"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="75"></a>

<a href="https://play.google.com/store/apps/details?id=com.owncloud.android"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="75"></a><a href="https://f-droid.org/packages/com.owncloud.android/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75"></a>

| <img src="docs_resources/filelist_device.png"> | <img src="docs_resources/photos_device.png"> | <img src="docs_resources/share_device.png"> | <img src="docs_resources/spaces_device.png"> |
| ---------------------------------------------- | -------------------------------------------- | ------------------------------------------- | ------------------------------------------- |

## Join development!

**Build status:** <br>

|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/7c4fbbdb2c1c0a20/status.svg?token=t2kBlsAf8d8yZftuohQnTw&branch=master)|
|master (Unit tests and data instrumented tests)| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME&branch=master)|
| :----- | :------ |
|**master (UI tests)**| ![](https://app.bitrise.io/app/a2a0b888408d15d8/status.svg?token=6Fz1YAJL944eJLwmmbkQ9A&branch=master)|

|**master (UI tests)**| ![](https://app.bitrise.io/app/FIXME/status.svg?token=FIXME/&branch=master)|

**Start contributing:** Make sure you read [SETUP.md](https://github.com/owncloud/android/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch.
Easy starting points are also reviewing [pull requests](https://github.com/owncloud/android/pulls) and working on [contributions are welcome](https://github.com/owncloud/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22Contributions+are+welcome%22).

**Forum:** [#Android](https://central.owncloud.org/c/android)
**Start contributing:** Make sure you read [SETUP.md](https://github.com/opencloud-eu/android/blob/master/SETUP.md) when you start working on this project. Basically: Fork this repository and contribute back using pull requests to the master branch.
Easy starting points are also reviewing [pull requests](https://github.com/opencloud-eu/android/pulls) and working on [contributions are welcome](https://github.com/opencloud-eu/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22Contributions+are+welcome%22).

**License:** [GPLv2](https://github.com/owncloud/android/blob/master/LICENSE.txt)
**License:** [LICENSE.txt](https://github.com/opencloud-eu/android/blob/master/LICENSE.txt)

## Join testing!

If you are interested in testing the new features before being released and give us your feedback, please try out our beta channels:

**Play Store**

1. Download ownCloud app from Play Store.
2. Go to ownCloud tab in Play Store and scroll down to the end of the view.
1. Download OpenCloud app from Play Store.
2. Go to OpenCloud tab in Play Store and scroll down to the end of the view.
3. Press the **I'M IN** button to join the beta program and your final app will be replaced with the beta one.

Note: If you want to use the ownCloud production version you have to leave the beta program, uninstall the app, and reinstall the production version.

**F-Droid**

1. Go to ownCloud tab in F-Droid.
2. Open versions section.
3. Download the latest version that contains beta in the name.
Note: If you want to use the OpenCloud production version you have to leave the beta program, uninstall the app, and reinstall the production version.
Loading
Loading