Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f472c50 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '634-update_to_v4_2_2_ose' into 'epic23-update_with_upstream' 

634 - Update with upstream v4.2.3.3

See merge request !61
parents 20e79e49 59712616

.github/workflows/release.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ jobs: 
        uses: softprops/action-gh-release@v0.1.14

        with:

          prerelease: ${{ contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta') || contains(github.ref_name, '-rc') }}

          files: app/build/outputs/apk/standard/release/*.apk

          files: app/build/outputs/apk/ose/release/*.apk

          fail_on_unmatched_files: true

.gitlab-ci.yml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"



stages:

  - build



before_script:

  - git submodule sync

  - git submodule update --init --recursive --force

  - echo email.key $PEPPER >> local.properties

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

    - .gradle/



build:

  stage: build

  script:

    - ./gradlew build -x test

  artifacts:

    paths:

      - app/build/outputs/apk/ose/

.gitmodules

+6 −1
Original line number Diff line number Diff line 
[submodule "ical4android"]

	path = ical4android

	url = https://github.com/bitfireAT/ical4android.git

	url = https://gitlab.e.foundation/e/os/ical4android.git

	branch = main

[submodule "vcard4android"]

	path = vcard4android

	url = https://github.com/bitfireAT/vcard4android.git

[submodule "cert4android"]

	path = cert4android

	url = https://github.com/bitfireAT/cert4android.git

[submodule "dav4android"]

	path = dav4android

	url = https://gitlab.e.foundation/e/apps/dav4android.git

	branch = main

AUTHORS

+11 −1
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ 


Ricki Hirner (bitfire.at)

Bernhard Stockmann (bitfire.at)



Sunik Kupfer (bitfire.at)

Patrick Lang (techbee.at)



# This is the list of significant contributors to AccountManager.

#

# This does not necessarily list everyone who has contributed work.

# To see the full list of contributors, see the revision history in

# source control.



© 2018-2019 - Author: Nihar Thakkar

© 2018-2022 - Author: Vincent Bourgmayer (murena)

© 2018-2022 - Author: Romain Hunault (murena)

© 2021-2022 - Author: Fahim Salam Chowdhury (murena)

README.md

+3 −11
Original line number Diff line number Diff line 
![accountManager logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)

Account Manager



[![Website](https://img.shields.io/website?style=flat-square&up_color=%237cb342&url=https%3A%2F%2Fwww.davx5.com)](https://www.davx5.com/)

[![Twitter](https://img.shields.io/twitter/follow/davx5app?color=%237cb342&label=%40davx5app&style=flat-square)](https://twitter.com/davx5app)

[![F-Droid](https://img.shields.io/f-droid/v/at.bitfire.davdroid?style=flat-square)](https://f-droid.org/packages/at.bitfire.davdroid/)

[![License](https://img.shields.io/github/license/bitfireAT/davx5-ose?style=flat-square)](https://github.com/bitfireAT/davx5-ose/blob/main/LICENSE)

[![Development tests](https://github.com/bitfireAT/davx5-ose/actions/workflows/test-dev.yml/badge.svg)](https://github.com/bitfireAT/davx5-ose/actions/workflows/test-dev.yml)



![DAVx⁵ logo](app/src/main/res/mipmap-xxxhdpi/ic_launcher.png)





DAVx⁵

========

Account Manager is a fork of DAVx⁵.



Please see the [DAVx⁵ Web site](https://www.davx5.com) for

comprehensive information about DAVx⁵.