Commits · master · Maui / Pix

18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ccc11344
  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"
```
  ccc11344
- GIT_SILENT made messages (after extraction) · a2b38a8b
  Script Kiddy authored Jun 18, 2020
  
  a2b38a8b
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d2492d7a
  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"
```
  d2492d7a
- GIT_SILENT made messages (after extraction) · 568b10a6
  Script Kiddy authored Jun 17, 2020
  
  568b10a6
11 Jun, 2020 1 commit
- Fix countries.csv path · 4ed357ae
  Anupam Basak authored Jun 11, 2020
  
  4ed357ae
10 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 216dd7d0
  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"
```
  216dd7d0
- Merge branch 'master' of invent.kde.org:kde/maui-pix · 642bee9a
  camilo higuita authored Jun 09, 2020
  
  642bee9a
- add missing countries file from koko · 7fbfcdc2
  camilo higuita authored Jun 09, 2020
  
  7fbfcdc2
- GIT_SILENT made messages (after extraction) · bc796224
  Script Kiddy authored Jun 10, 2020
  
  bc796224
07 Jun, 2020 1 commit
- silent warning for qt 5.15 on connections · b4c9123b
  camilo higuita authored Jun 07, 2020
  
  b4c9123b
06 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3127976a
  Script Kiddy authored Jun 06, 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"
```
  3127976a
- Merge branch 'master' of invent.kde.org:kde/maui-pix · d8331e25
  camilo higuita authored Jun 05, 2020
  
  d8331e25
- update to latest kquickimageedit · f61d1e3a
  camilo higuita authored Jun 05, 2020
  
  f61d1e3a
- GIT_SILENT made messages (after extraction) · 4b23585c
  Script Kiddy authored Jun 06, 2020
  
  4b23585c
03 Jun, 2020 2 commits
- Work on the editor layout and ui papercuts on info and settings dialog · eb057874
  camilo higuita authored Jun 03, 2020
  
  eb057874
- Initial work for editing tools from issue #3 and re style the picture info dialog from issue #4 · 3ebb0074
  camilo higuita authored Jun 02, 2020
  
  3ebb0074
02 Jun, 2020 5 commits
- style info dialog · cc9f7553
  Camilo Higuita authored Jun 02, 2020
  
  cc9f7553
- SVN_SILENT made messages (.desktop file) - always resolve ours · 60e0b20b
  Script Kiddy authored Jun 02, 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"
```
  60e0b20b
- Merge branch 'master' of invent.kde.org:kde/maui-pix · f20d7639
  camilo higuita authored Jun 01, 2020
  
  f20d7639
- move to i18n fix issue #5 and start implementing the metadata info dialog with exiv2 for issue #4 · 455bbf2d
  camilo higuita authored Jun 01, 2020
  
  455bbf2d
- GIT_SILENT made messages (after extraction) · 288579da
  Script Kiddy authored Jun 02, 2020
  
  288579da
31 May, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 14ca50ba
  Script Kiddy authored May 31, 2020
  
  14ca50ba
19 May, 2020 2 commits
- fix issue #1 and #2 · 7c87e7f1
  camilo higuita authored May 19, 2020
  
  7c87e7f1
- add logo · 552ac8a8
  Camilo Higuita authored May 19, 2020
  
  552ac8a8
17 May, 2020 2 commits
- Bump version · c36ce466
  Anupam Basak authored May 18, 2020
  
  c36ce466
- Bump version · a4b5d9cd
  Anupam Basak authored May 18, 2020
  
  a4b5d9cd
14 May, 2020 3 commits
- fixes from android since we dont have qt 5.114 and depend on 5.13 still · 4b175438
  Camilo Higuita authored May 13, 2020
  
  4b175438
- make batches for loading file bigger · d6184822
  Camilo higuita authored May 13, 2020
  
  d6184822
- clean up after refactor from widnows · 37e670c1
  camilo higuita authored May 13, 2020
  
  37e670c1
13 May, 2020 3 commits
- rescan on dir changes · 6a2fad36
  Camilo higuita authored May 13, 2020
  
  6a2fad36
- Merge branch 'master' of https://invent.kde.org/kde/maui-pix · 0826c283
  Camilo higuita authored May 13, 2020
  
  0826c283
- not using db anymore and fix crashing issue on rescannign colelction · d65678e0
  Camilo higuita authored May 13, 2020
  
  d65678e0
11 May, 2020 2 commits
- update cmake · e08e8847
  camilo higuita authored May 10, 2020
  
  e08e8847
- bump version from cmake · 724f971e
  camilo higuita authored May 10, 2020
  
  724f971e
09 May, 2020 6 commits
- added windows files · 94252177
  Camilo higuita authored May 09, 2020
  
  94252177
- Merge branch 'master' of https://invent.kde.org/kde/maui-pix · 5cd6b58f
  Camilo higuita authored May 09, 2020
  
  5cd6b58f
- Merge branch 'master' of invent.kde.org:kde/maui-pix · b76cd63e
  camilo higuita authored May 09, 2020
  
  b76cd63e
- windows fixes · 52c662b4
  Camilo higuita authored May 09, 2020
  
  52c662b4
- correct keyboard shrotcut selection · 7f649dc3
  camilo higuita authored May 09, 2020
  
  7f649dc3
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1a79a3a8
  Script Kiddy authored May 09, 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"
```
  1a79a3a8