Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity
5,417 Commits 24 Branches 54 Tags 50 MiB
7429d1d8ef
Commit Graph

160 Commits

Author SHA1 Message Date
l10n daemon script
0684603930 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-12-24 05:18:23 +01:00
l10n daemon script
8f6054f788 GIT_SILENT made messages (after extraction) 2018-12-12 03:01:20 +01:00
l10n daemon script
5b831a3c8c GIT_SILENT made messages (after extraction) 2018-11-01 03:43:13 +01:00
l10n daemon script
116ba93b79 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-10-22 05:54:15 +02:00
l10n daemon script
5fb500465f GIT_SILENT made messages (after extraction) 2018-10-22 03:41:47 +02:00
l10n daemon script
b44134fd07 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-10-10 06:19:06 +02:00
l10n daemon script
82417ff4a5 GIT_SILENT made messages (after extraction) 2018-10-10 03:54:18 +02:00
l10n daemon script
e0d1175dd1 GIT_SILENT made messages (after extraction) 2018-08-26 03:34:44 +02:00
l10n daemon script
1500f2202a SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-08-03 05:36:42 +02:00
l10n daemon script
06020d9615 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-07-03 05:28:07 +02:00
l10n daemon script
1c6f5bd8e2 GIT_SILENT made messages (after extraction) 2018-07-03 03:23:47 +02:00
l10n daemon script
086d572e25 GIT_SILENT made messages (after extraction) 2018-06-26 03:24:35 +02:00
l10n daemon script
0e96dd33c2 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-06-17 05:29:07 +02:00
l10n daemon script
73123c72c2 GIT_SILENT made messages (after extraction) 2018-06-17 03:29:09 +02:00
l10n daemon script
c252de4bdd GIT_SILENT made messages (after extraction) 2018-06-13 03:38:24 +02:00
l10n daemon script
aca4f6c0a9 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-05-16 05:26:16 +02:00
David Rosca
3760a9ffd1
AppImage: Bundle KWindowSystem plugins 2018-05-09 18:11:57 +02:00
David Rosca
68ff092b4c
Update AppImage build Dockerfile 2018-05-07 13:33:52 +02:00
David Rosca
dd8d8b9007
Add Dockerfile for building AppImage 2018-05-01 22:59:49 +02:00
l10n daemon script
e36d092c08 GIT_SILENT made messages (after extraction) 2018-04-27 03:32:10 +02:00
l10n daemon script
dd60458d6a SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-04-24 05:25:10 +02:00
l10n daemon script
75d5f5d552 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-04-21 07:16:56 +02:00
l10n daemon script
08a3fe5476 GIT_SILENT made messages (after extraction) 2018-04-21 06:15:24 +02:00
l10n daemon script
a62fb97ed8 GIT_SILENT made messages (after extraction) 2018-04-17 06:17:22 +02:00
l10n daemon script
e0f390e986 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-04-07 07:11:21 +02:00
l10n daemon script
a931002465 GIT_SILENT made messages (after extraction) 2018-04-07 06:08:19 +02:00
David Rosca
04341b0981
Change homepage to falkon.org 2018-03-30 09:38:26 +02:00
David Rosca
87ce04b11d
Update build-appimage.sh 2018-02-28 22:03:18 +01:00
Jonathan Riddell
9f2c10216d more appstream data 2018-02-28 16:59:54 +00:00
Jonathan Riddell
18f13c7273 appstream screenshot 2018-02-28 16:59:54 +00:00
David Rosca
86d3ebebc7
Add new Falkon icon 2018-02-23 12:58:04 +01:00
l10n daemon script
788c795b62 GIT_SILENT made messages (after extraction) 2018-02-19 03:16:26 +01:00
l10n daemon script
a2828371ed GIT_SILENT made messages (after extraction) 2018-02-18 03:17:56 +01:00
l10n daemon script
a707926e13 GIT_SILENT made messages (after extraction) 2018-02-17 03:17:00 +01:00
David Rosca
2039710921
AppData: Remove qupzilla urls 2018-02-16 14:46:44 +01:00
l10n daemon script
39f78ad402 GIT_SILENT made messages (after extraction) 2018-02-12 03:19:51 +01:00
David Rosca
ef1f0256d3
Update build-appimage.sh 2018-02-11 19:25:42 +01:00
l10n daemon script
7bba5b79ed GIT_SILENT made messages (after extraction) 2018-02-04 03:24:04 +01:00
l10n daemon script
efe806e65e GIT_SILENT made messages (after extraction) 2018-01-30 03:21:50 +01:00
l10n daemon script
894394adbb GIT_SILENT made messages (after extraction) 2018-01-29 03:23:57 +01:00
David Rosca
32c613a35a
Fix appdata 2018-01-28 16:04:56 +01:00
l10n daemon script
6093245e4f GIT_SILENT made messages (after extraction) 2018-01-28 03:22:54 +01:00
l10n daemon script
86c7c98a86 GIT_SILENT made messages (after extraction) 2018-01-27 03:22:26 +01:00
David Rosca
93ff0c324c
Update description in appdata 2018-01-26 12:53:16 +01:00
l10n daemon script
d67fe39c2f GIT_SILENT made messages (after extraction) 2018-01-26 03:21:30 +01:00
l10n daemon script
7b0d1abdc9 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-01-25 05:05:01 +01:00
David Rosca
31fd06cde1 Remove scripts 2018-01-24 15:30:28 +01:00
David Rosca
d1502ba68e Use lowercase f in reverse domain name 2018-01-24 11:56:25 +01:00
l10n daemon script
20bc412317 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-01-23 05:11:58 +01:00
l10n daemon script
fc38215e2b SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2018-01-21 04:59:16 +01:00