Commit Graph

3721 Commits

Author SHA1 Message Date
Christian Pauly
5e3ad1c5d7 Merge branch 'better-notifications' into 'master'
Better notifications

See merge request ChristianPauly/fluffychat-flutter!14
2020-01-08 13:19:16 +00:00
Christian Pauly
c4353bbea6 Better notifications 2020-01-08 13:19:15 +00:00
Christian Pauly
2c6a37d37a Merge branch 'ChristianPauly-master-patch-15304' into 'master'
Update .gitlab-ci.yml

See merge request ChristianPauly/fluffychat-flutter!15
2020-01-07 14:07:29 +00:00
Christian Pauly
d151b0cdf0 Update .gitlab-ci.yml 2020-01-07 14:07:29 +00:00
Christian Pauly
11b8ab4e56 Merge branch 'fix-store' into 'master'
Fix store

See merge request ChristianPauly/fluffychat-flutter!13
2020-01-06 20:25:53 +00:00
Christian Pauly
6f6912aadf Fix store 2020-01-06 21:22:50 +01:00
Christian Pauly
f99fe9eda8 Merge branch 'fix-linktext' into 'master'
Fix linktext

See merge request ChristianPauly/fluffychat-flutter!12
2020-01-06 19:39:05 +00:00
Christian Pauly
99d36e1d74 Fix linktext 2020-01-06 20:36:11 +01:00
Marcel
efe4988ddd Change version to 0.2.0 2020-01-05 14:10:22 +00:00
Marcel
e515469323 Merge branch 'more-features' into 'master'
More features

See merge request ChristianPauly/fluffychat-flutter!11
2020-01-05 11:27:03 +00:00
Christian Pauly
f1079e5c70 More features 2020-01-05 11:27:03 +00:00
Christian Pauly
614eb7077c Merge branch 'ChristianPauly-master-patch-49069' into 'master'
Fix room account data in store

See merge request ChristianPauly/fluffychat-flutter!10
2020-01-05 07:01:14 +00:00
Christian Pauly
6ea462a741 Update lib/utils/sqflite_store.dart 2020-01-04 16:12:24 +00:00
Christian Pauly
f466f579a1 Fix room account data in store 2020-01-04 16:10:59 +00:00
Marcel
90672c769e Merge branch 'fix-message-types' into 'master'
Fix message types and update to newest sdk

See merge request ChristianPauly/fluffychat-flutter!9
2020-01-04 12:53:49 +00:00
Christian Pauly
fda9b752df Fix message types and update to newest sdk 2020-01-04 12:53:49 +00:00
Christian Pauly
e97a5319d9 Merge branch 'next-version' into 'master'
Update pubspec.yaml

See merge request ChristianPauly/fluffychat-flutter!8
2020-01-04 09:09:17 +00:00
Christian Pauly
492ff3ffcc Update pubspec.yaml 2020-01-04 09:06:00 +00:00
Christian Pauly
41035834bc Merge branch 'enhance-settings' into 'master'
Enhance settings

See merge request ChristianPauly/fluffychat-flutter!7
2020-01-04 08:40:38 +00:00
Christian Pauly
2eb8828841 Enhance settings 2020-01-04 08:40:38 +00:00
Christian Pauly
10fc137435 Merge branch 'add-linktext' into 'master'
Add Link text

See merge request ChristianPauly/fluffychat-flutter!6
2020-01-04 08:37:09 +00:00
Christian Pauly
2cc29e7004 Add Link text 2020-01-04 08:37:09 +00:00
Christian Pauly
2c047d9b21 Fix login loading dialog 2020-01-04 09:16:29 +01:00
Marcel
ee9fc0ccd1 [Pubspec] Up the version for a hotfix
Took 3 minutes
2020-01-03 20:47:14 +01:00
Marcel
51eb48f080 Merge branch 'fix-minor-bugs' into 'master'
[New private chat dialog] Validate input before continuing

See merge request ChristianPauly/fluffychat-flutter!5
2020-01-03 19:46:51 +00:00
Marcel
58f45406e8 [New private chat dialog] Validate input before continuing
Took 19 minutes
2020-01-03 20:44:31 +01:00
Christian Pauly
c0594fa22b Update README.md 2020-01-03 17:41:50 +00:00
Christian Pauly
1f14079426 Update pubspec.yaml 2020-01-03 16:45:48 +00:00
Christian Pauly
96906f5040 fix ci 2020-01-03 17:35:36 +01:00
Christian Pauly
c73325b09a Show file 2020-01-03 17:31:27 +01:00
Christian Pauly
9113afda37 Add googleservicesjson to ci 2020-01-03 17:24:47 +01:00
Christian Pauly
8d7aaa44a6 Add firebase stuff 2020-01-03 17:23:40 +01:00
Christian Pauly
46f5eb5abb Next version 2020-01-03 14:52:51 +01:00
Christian Pauly
d8e415e416 Improved design 2020-01-03 14:47:42 +01:00
Christian Pauly
fac2377ca2 Better senderprefix 2020-01-03 14:45:48 +01:00
Christian Pauly
a4dfed9361 Fix wrap 2020-01-03 14:44:39 +01:00
Christian Pauly
1bd913c35d Minor fixes 2020-01-03 14:35:12 +01:00
Christian Pauly
2c98f4978b Merge branch 'master' of gitlab.com:ChristianPauly/fluffychat-flutter 2020-01-03 14:28:34 +01:00
Marcel
d86c4ecd2d Merge branch 'ci-make_fdroid_release_master_only' into 'master'
Make fdroid release master only

Closes #1

See merge request ChristianPauly/fluffychat-flutter!2
2020-01-03 12:54:43 +00:00
Marcel
c2dad42da4 Add Ci task to build a debug app on branches that are not master and build a fdroid signed version only when building on master
Took 5 minutes
2020-01-03 12:54:42 +00:00
Christian Pauly
9b8314c4a4 Fix textfield 2020-01-03 13:51:18 +01:00
Christian Pauly
646f98fb15 Update .gitlab-ci.yml 2020-01-03 12:34:30 +00:00
Christian Pauly
0e3534d7d8 Update .gitlab-ci.yml 2020-01-03 12:05:02 +00:00
Christian Pauly
d4418392a3 Fix logout in web 2020-01-03 12:37:59 +01:00
Christian Pauly
a611e2a141 Fix web version 2020-01-03 12:37:16 +01:00
Christian Pauly
4dd31d961a Only show invite button when possible 2020-01-03 12:07:04 +01:00
Christian Pauly
5a9d4b3d7f Fix colors 2020-01-03 12:04:24 +01:00
Christian Pauly
3a64d58d23 More fixes and new version 2020-01-03 11:57:00 +01:00
Christian Pauly
d838d3a474 Minor fixes 2020-01-03 11:47:31 +01:00
Christian Pauly
541cdec4ca Minor fixes 2020-01-03 10:46:34 +01:00