Commits · master · Maui / Communicator

18 Jan, 2021 3 commits
- update copyright dates · dd165b86
  camilo higuita authored Jan 18, 2021
  
  dd165b86
- remove unwanted files · 410bb633
  camilo higuita authored Jan 18, 2021
  
  410bb633
- make it work on android again · cd001a61
  camilo higuita authored Jan 18, 2021
  
  cd001a61
16 Jan, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c05e7931

Script Kiddy authored Jan 16, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

c05e7931

05 Jan, 2021 3 commits
- Fix compilation warnings · 4c41f0c1
  Anupam Basak authored Jan 05, 2021
  
  4c41f0c1
- Fix compilation warnings · 9967fc22
  Anupam Basak authored Jan 05, 2021
  
  9967fc22
- Update .clang-format · 2e162635
  Anupam Basak authored Jan 05, 2021
  
  2e162635
30 Dec, 2020 3 commits
- Fix compiler warnings · 18907bf5
  Anupam Basak authored Dec 30, 2020
  
  18907bf5
- Formatted with clang-format · 15636c27
  Anupam Basak authored Dec 30, 2020
  
  15636c27
- Add KDEClangFormat · 178dd6b9
  Anupam Basak authored Dec 30, 2020
  
  178dd6b9
21 Dec, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 87f98fa9

Script Kiddy authored Dec 21, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

87f98fa9

18 Dec, 2020 1 commit
- Fix wrong method signature · 484d3a71
  Anupam Basak authored Dec 18, 2020
  
  484d3a71
28 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · da5bed48

Script Kiddy authored Nov 28, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

da5bed48

23 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0a15f75d

Script Kiddy authored Nov 23, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

0a15f75d

20 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · ab88b534

Script Kiddy authored Nov 20, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

ab88b534

17 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f74f80c6

Script Kiddy authored Nov 17, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

f74f80c6

14 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · ccb2e7ab

Script Kiddy authored Nov 14, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

ccb2e7ab

13 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 45b2c9b7

Script Kiddy authored Nov 13, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

45b2c9b7

12 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d6fc3053

Script Kiddy authored Nov 12, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

d6fc3053

11 Nov, 2020 1 commit
- Merge branch 'development' · 5287d0b6
  Anupam Basak authored Nov 12, 2020
  
  5287d0b6
10 Nov, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 30f791d8

Script Kiddy authored Nov 10, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

30f791d8

06 Nov, 2020 1 commit
- indent · e423063a
  camilo higuita authored Nov 05, 2020
  
  e423063a
05 Nov, 2020 4 commits
- Merge branch 'development' of https://invent.kde.org/maui/communicator into development · 90bde396
  camilo higuita authored Nov 05, 2020
  
  90bde396
- overhaul of the contactpage and model backend · 5166028a
  camilo higuita authored Nov 05, 2020
  
  5166028a
- Remove KLocalizedContext initialization · 572a8ba8
  Anupam Basak authored Nov 06, 2020
  
  572a8ba8
- bringin up to date. one single edit contact page for creating and updating... · cbddcfc2
  camilo higuita authored Nov 04, 2020
```
bringin up to date. one single edit contact page for creating and updating contacts and move from dialogs popups to pages
```
  cbddcfc2
03 Nov, 2020 1 commit
- bring up to date to latest mauikit and ditch the popups dialogs · d80ba6a6
  Camilo Higuita authored Nov 03, 2020
  
  d80ba6a6
20 Oct, 2020 2 commits
- update version. multiple fixes and i18n usage · be1076cd
  Camilo Higuita authored Oct 19, 2020
  
  be1076cd
- update to using i18n and kaboutdata · b8d91936
  Camilo Higuita authored Oct 19, 2020
  
  b8d91936
18 Oct, 2020 1 commit
- Change qsTr to i18n · 46880457
  Anupam Basak authored Oct 18, 2020
  
  46880457
28 Sep, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d0fad804

Script Kiddy authored Sep 28, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

d0fad804

25 Sep, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 421335e8

Script Kiddy authored Sep 25, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

421335e8

24 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c9eee20f

Script Kiddy authored Jul 24, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

c9eee20f

22 Jul, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 427dfa32

Script Kiddy authored Jul 22, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

427dfa32

18 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 371b4a4b

Script Kiddy authored Jun 18, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

371b4a4b

17 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b26cb3d4

Script Kiddy authored Jun 17, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b26cb3d4

15 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e34f6730

Script Kiddy authored Jun 15, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

e34f6730

10 Jun, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 48f19605

Script Kiddy authored Jun 10, 2020

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

48f19605

19 May, 2020 2 commits
- Merge branch 'development' · d0d11e40
  Camilo Higuita authored May 19, 2020
  
  d0d11e40
- add logo · 4342c8b4
  Camilo Higuita authored May 19, 2020
  
  4342c8b4