Commit Graph

4876 Commits

Author SHA1 Message Date
adbenitez b9518aa9b6 Merge branch 'adb/multi-account-notifications' 2023-02-04 17:53:35 -05:00
adbenitez 3ce9a79274 set unique data for getRemoteReplyIntent() and getMarkAsReadIntent() pending intents 2023-02-04 16:33:03 -05:00
adbenitez 0d943d9b60 Merge branch 'adb/multi-account-notifications' 2023-02-04 14:45:00 -05:00
adbenitez 624c4688ee update README.md 2023-02-04 08:38:16 -05:00
adbenitez a4b85e7299 update README.md 2023-02-04 08:35:48 -05:00
adbenitez 824cdf7a99 Merge branch 'master' of https://github.com/adbenitez/deltalab-android 2023-02-04 08:30:56 -05:00
Asiel Díaz Benítez 3007fa6551 Merge pull request #12 from Poussinou/patch-1
Update README.md
2023-02-04 08:23:03 -05:00
adbenitez 040249af57 set unique data for getOpenChatlistIntent() and getOpenChatIntent() pending intents 2023-02-04 07:41:18 -05:00
adbenitez eac7723903 Merge remote-tracking branch 'upstream/master' 2023-02-04 05:35:36 -05:00
adbenitez 64c1c5af2e implement ChatData.equals() 2023-02-04 05:27:55 -05:00
adbenitez 93a17e99e9 use ChatData class instead of Pair, fix notifications preferences 2023-02-03 15:51:59 -05:00
adbenitez 1d6a2350f0 update comment in inboxes declaration 2023-02-03 13:32:17 -05:00
adbenitez 8962476a21 use different values for "ACCOUNT_ID_EXTRA and CHAT_ID_EXTRA" 2023-02-03 13:25:40 -05:00
Asiel Díaz Benítez f38a15024c Update src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
Co-authored-by: Hocuri <hocuri@gmx.de>
2023-02-03 13:12:13 -05:00
B. Petersen 4ba6daae21 Revert "Webxdc fixes"
This reverts commit 6afddd84fff659fa6d8f727f2bf388d0c504058d.
2023-02-03 13:18:05 +01:00
adbenitez 402fedaf78 allow notifications for all accounts 2023-02-02 13:05:03 -05:00
B. Petersen ae4a725764 clarify branch name in update script 2023-02-02 14:54:00 +01:00
adbenitez 3f30a2789a Merge remote-tracking branch 'upstream/master' 2023-02-01 10:40:01 -05:00
bjoern 699d97cccc prepare 1.34.11 (#2459)
* update changelog for 1.34.11

* bump version to 1.34.11
2023-01-31 21:36:27 +01:00
Hocuri 8281bf9489 Webxdc fixes (#2458)
This now fixes all the checks in the `test webxdc`, see the
Delta Chat group
2023-01-31 18:30:53 +01:00
bjoern 38be87ee8e refine new f-droid documentation (#2461)
successor of #2444:

- there seems to be a maximal lenght of 500 characters for the changelog
  (the 500 chars come from the changlog in #2444
  that was truncated after 500 characters)

- the changelog is only needed if there is really a f-droid release scheduled;
  move the instructions down
2023-01-31 16:32:26 +01:00
B. Petersen f088fbd0bc update deltachat-core-rust to 'Prepare 1.107.0' of branch 'stable-1.107' 2023-01-31 14:52:31 +01:00
bjoern c4651acceb adapt ./scripts/update-core.sh to work with different branches (#2460) 2023-01-31 14:51:45 +01:00
B. Petersen 354ddb5e0a update translations 2023-01-31 14:19:33 +01:00
B. Petersen 7f874fe1f4 update translations, clarify hint for string 'N Selected' 2023-01-31 11:58:16 +01:00
Poussinou 2eb0fdd4dd Update README.md 2023-01-21 20:24:55 +09:30
adbenitez 834ac6fd51 Merge remote-tracking branch 'upstream/master' 2023-01-19 05:48:46 -05:00
Asiel Díaz Benítez 0db90343da Merge pull request #2455 from deltachat/adb/fix-socks5-switch-style
fix "use SOCKS5" switch style
2023-01-19 04:32:53 -05:00
adbenitez 6993317be3 fix "use SOCKS5" switch style (not visible in dark mode due to forced Light theme) 2023-01-19 00:15:03 -05:00
Asiel Díaz Benítez f19e29bb22 Merge pull request #2454 from deltachat/adb/disable-socks5-password-toogle-after-config
don't allow to reveal proxy password
2023-01-18 23:01:26 -05:00
adbenitez cc97b61299 don't allow to reveal proxy password when editing the settings after account was successfully configured 2023-01-18 17:10:07 -05:00
adbenitez 0763a103a5 update version number 2023-01-18 16:31:36 -05:00
adbenitez 810f34da9c update submodule 2023-01-18 16:30:20 -05:00
adbenitez e16ffbd52c Merge remote-tracking branch 'upstream/master' 2023-01-18 16:29:59 -05:00
Asiel Díaz Benítez bde84845d8 Merge pull request #2452 from deltachat/adb/add-socks5
add socks5 settings to registration activity
2023-01-18 16:15:46 -05:00
adbenitez 4aaa656938 make SOCKS5 section more similar to Delta Chat Desktop 2023-01-18 15:11:48 -05:00
B. Petersen 85918cf33f update translations 2023-01-18 14:34:02 +01:00
adbenitez b296f2251c update CI 2023-01-18 07:19:34 -05:00
adbenitez b938a9fc83 update CI 2023-01-18 07:14:57 -05:00
adbenitez 741353a399 fix device message 2023-01-18 06:52:44 -05:00
adbenitez 9cf80c8f82 fix ConversationListActivity 2023-01-18 06:44:38 -05:00
adbenitez f467ccb4d1 Merge branch 'adb/add-socks5' 2023-01-18 06:40:53 -05:00
adbenitez a3ab3e80a4 update submodule 2023-01-18 06:40:37 -05:00
adbenitez b737c05da2 update CI 2023-01-18 06:39:42 -05:00
adbenitez bef2b344c8 update device message 2023-01-18 06:39:06 -05:00
adbenitez accf1413dc allow to share location for 12 hours 2023-01-18 05:58:35 -05:00
adbenitez 3dfc587183 add socks5 settings to registration activity 2023-01-18 01:06:48 -05:00
adbenitez ec29ce0a1f Merge remote-tracking branch 'upstream/master' 2023-01-15 16:24:58 -05:00
bjoern 90c4399d2a prepare 1.34.10 (#2447)
* update CHANGELOG for 1.34.9

* bump version to 1.34.9

* add a little device message for the 1.34.9 update

* add f-droid changelog

* make device message more clear and add it only for existing installations

* bump to 1.34.10
2023-01-11 10:54:02 +01:00
B. Petersen fffff6abe5 update deltachat-core-rust submodule to 'Clippy fix' 2023-01-10 23:32:26 +01:00