531e555b52
Bumped version number for beta release.
2017-07-25 18:43:19 +01:00
a9024aa34b
Merge branch '955-shared-with-update' into 'master'
...
Fix "shared with" counter not being updated
Closes #955
See merge request !569
2017-07-25 17:40:40 +00:00
d4e3b7842c
Merge branch 'blog-sharing-tests' into 'master'
...
Add unit tests for BlogSharingManager
See merge request !567
2017-07-25 17:40:29 +00:00
167fddfbcc
Add unit tests for BlogSharingManager
2017-07-25 12:45:36 -03:00
a48d642648
Fix UI bug in CreateForumActivity and adapt group creation
2017-07-25 12:32:53 -03:00
9a70f054c7
Use proper GroupId when reacting to accepted invitations
...
Fixes #955
2017-07-25 10:03:13 -03:00
ca43d13bd6
Merge branch 'inject-properties-module-eager-singletons' into 'master'
...
Inject properties module's eager singletons
See merge request !568
2017-07-25 12:55:59 +00:00
5b71004179
Inject properties module's eager singletons.
2017-07-25 13:49:15 +01:00
63befccdbf
Bumped expiry time and version number for beta release.
2017-07-21 11:52:09 +01:00
4ecf7c02d0
Merge branch '979-duplicate-blog-session' into 'master'
...
Fix Blog Sharing Sessions
Closes #979
See merge request !566
2017-07-21 10:27:21 +00:00
f25badc18c
Move responsibility for pre-sharing blogs to sharing manager
...
to have all the code related to that in one place,
so it is easier to maintain and to spot bugs.
This also checks that only blogs without an existing sharing session
are shared and initialized again.
It extends an existing test to catch the missing check.
This removes some debugging information from the previous commit
to not leak private information via the sharing sessions.
Fixes #979
2017-07-17 14:07:47 -03:00
6e931e9ba5
Bump version number and expiry date for beta release.
2017-07-17 10:32:46 +01:00
7e749124bf
Merge branch '617-protocol-versioning' into 'master'
...
Protocol versioning for BTP
See merge request !557
2017-07-17 09:24:35 +00:00
5822eb7808
Remove 'this'.
2017-07-17 10:16:50 +01:00
7a7e086541
Merge branch '982-name-not-found-exception' into 'master'
...
Use fully-qualified class names in manifest
Closes #982
See merge request !565
2017-07-14 12:19:50 +00:00
abab3167c2
Use fully-qualified class names in manifest.
...
This prevents a crash on Android 4 when the package name in build.gradle differs from the name in the manifest.
2017-07-14 12:01:55 +01:00
8d08570568
Merge branch '977-crash-when-opening-rss-blog' into 'master'
...
Create correct shareable for RSS blogs
Closes #977
See merge request !564
2017-07-07 17:42:54 +00:00
2007078f13
Added test for sharing an RSS blog.
2017-07-07 18:02:15 +01:00
dfb71a7978
Merge branch '942-block-blog-notifications' into 'master'
...
Block blog notifications when viewing combined feed
See merge request !563
2017-07-07 16:32:07 +00:00
480b0e3a03
Create correct shareable for RSS blogs.
...
Also removed "personal blog" wording that doesn't apply to RSS blogs.
2017-07-07 17:30:44 +01:00
8f8751f4ac
Block blog notifications when viewing combined feed.
2017-07-07 15:34:00 +01:00
de2ea112ee
Merge branch '933-beta-warning' into 'master'
...
Show Beta Expiry Warning
Closes #933
See merge request !559
2017-07-07 12:19:04 +00:00
6f99a53fd9
Show beta expiry warning in main activity
2017-07-07 09:12:07 -03:00
a8a9b9032d
Merge branch 'warn_on_extra_translation' into 'master'
...
Show a warning instead of throwing an error for unused translations
See merge request !561
2017-07-07 12:01:23 +00:00
6b15fb89de
Show a warning instead of throwing an error for unused translations
...
Signed-off-by: goapunk <noobie@goapunks.net >
2017-07-07 12:19:44 +02:00
a711d6b8a1
Merge branch '106-fix-package-name' into 'master'
...
Set applicationId to match app_package
See merge request !560
2017-07-05 13:46:30 +00:00
5678f8aaa4
Update Robolectric tests so they can find resources.
2017-07-05 14:40:03 +01:00
2fe37f6c26
Set applicationId to match app_package.
2017-07-05 14:17:35 +01:00
a879747968
Translation Update
2017-07-05 09:50:14 -03:00
95e8fd7ee0
Merge branch 'notify_more_agressively' into 'master'
...
Notify more aggressively
See merge request !555
2017-07-05 11:36:37 +00:00
4416aaaa4c
Notify more aggressively
...
* Add setting to show notification on the lockscreen
* Don't block notifications in the contact-/-group/-forum/-bloglist
Signed-off-by: goapunk <noobie@goapunks.net >
2017-07-05 13:05:21 +02:00
500d5f0efe
Merge branch '822-group-creation-workflow' into 'master'
...
Revisit private group creation workflow
Closes #822
See merge request !553
2017-07-04 17:19:11 +00:00
fc8978fd90
Create forum when button is clicked.
2017-07-04 16:17:59 +01:00
73df126bd4
Create and share private groups separately, as with forums.
2017-07-04 16:17:58 +01:00
9146488c7d
Use same layout and behaviour for creating groups and forums.
2017-07-04 16:17:58 +01:00
613a7fe376
Merge branch '962-removing-contacts' into 'master'
...
Add test where two contacts remove each other
Closes #962
See merge request !558
2017-07-04 15:14:27 +00:00
ecb62f00d4
Code cleanup.
2017-07-04 16:09:32 +01:00
c4540a03cd
Protocol versioning for BTP.
2017-07-04 16:09:32 +01:00
3e31da99b5
Merge branch '106-beta-namespace' into 'master'
...
Change app name and package name for beta release
Closes #106
See merge request !545
2017-07-04 14:40:47 +00:00
098c1d0b1e
Add test where two contacts remove each other
2017-07-04 11:30:17 -03:00
178e908c86
Use a different package name and app name for beta builds.
2017-07-03 18:20:05 +01:00
ecf7cf14ae
Merge branch '957-rss-url-case-sensitivity' into 'master'
...
Handle RSS URLs case-insensitively
Closes #957
See merge request !544
2017-07-03 16:22:52 +00:00
09e2a15a73
Merge branch '951-remove-visibility-indicators' into 'master'
...
Remove visibility indicators from private group join messages
Closes #951
See merge request !546
2017-07-03 16:22:31 +00:00
ab387860a6
Removed visibility indicators from private group member list.
2017-07-03 16:37:29 +01:00
f63fc94f2b
Removed visibility indicators from private group join messages.
2017-07-03 16:37:29 +01:00
41e5928cca
Validate and normalise RSS URLs.
2017-07-03 16:36:50 +01:00
8303175494
Merge branch 'use-f-droid-base-docker-image' into 'master'
...
Use F-Droid's base Docker image
See merge request !556
2017-07-03 15:35:28 +00:00
151eb6935b
Use F-Droid's base Docker image.
2017-07-03 16:17:03 +01:00
6a419c0c7b
Merge branch '968-downgrade-h2' into 'master'
...
Downgrade H2 to 1.4.192
Closes #968
See merge request !550
2017-07-03 11:51:35 +00:00
1795b32121
Downgrade H2 to 1.4.192.
2017-07-03 12:36:45 +01:00
akwizgran
akwizgran
Torsten Grote
goapunk