Mario Vavti
|
f0cdbd0f52
|
Merge branch 'dev' into 3.8RC
|
2018-10-13 14:11:08 +02:00 |
|
Mario Vavti
|
9632cafa95
|
bump version
|
2018-10-13 14:05:44 +02:00 |
|
ZotSocial Admin
|
321b2b9b49
|
Fix order of assignment and get template file before return
(cherry picked from commit 8ebcc4439b)
|
2018-10-13 14:01:43 +02:00 |
|
Mario
|
fb3dd5eee6
|
Merge branch 'dev' into 'dev'
Fix order of assignment and get template file before return
See merge request hubzilla/core!1329
|
2018-10-13 14:01:01 +02:00 |
|
Mario
|
e518445853
|
Merge branch 'patch-11' into 'dev'
Add date/time plurals translation in JavaScript
See merge request hubzilla/core!1331
|
2018-10-13 14:00:12 +02:00 |
|
Mario
|
8ce240b95c
|
Merge branch 'patch-10' into 'dev'
Missed strings added to Russian translation
See merge request hubzilla/core!1328
|
2018-10-13 13:57:48 +02:00 |
|
Max Kostikov
|
6ae9ef571e
|
Update language.php
|
2018-10-13 02:14:19 +02:00 |
|
Max Kostikov
|
8e5189464e
|
Update language.php
|
2018-10-13 01:36:24 +02:00 |
|
Max Kostikov
|
0de713ff36
|
Update language.php
|
2018-10-13 01:08:06 +02:00 |
|
Max Kostikov
|
137bee9d27
|
Update language.php
|
2018-10-13 00:40:06 +02:00 |
|
Max Kostikov
|
3641ab8c7d
|
Update language.php
|
2018-10-13 00:28:12 +02:00 |
|
Max Kostikov
|
16b6b76507
|
Update language.php
|
2018-10-13 00:25:57 +02:00 |
|
Max Kostikov
|
5cd9540d5f
|
Update language.php
|
2018-10-13 00:24:04 +02:00 |
|
Max Kostikov
|
ae7873260e
|
Update language.php
|
2018-10-13 00:20:23 +02:00 |
|
Max Kostikov
|
3dfe604ba0
|
Update main.js
|
2018-10-13 00:15:48 +02:00 |
|
Max Kostikov
|
3e19c4ddae
|
Update language.php
|
2018-10-13 00:12:17 +02:00 |
|
Max Kostikov
|
de59300aaf
|
Update js_strings.tpl
|
2018-10-12 23:51:01 +02:00 |
|
Max Kostikov
|
8cb05a91ab
|
Update language.php
|
2018-10-12 23:45:52 +02:00 |
|
Max Kostikov
|
5f2c3f607e
|
Add plurals translation at browser side (JS)
|
2018-10-12 23:43:38 +02:00 |
|
ZotSocial Admin
|
8ebcc4439b
|
Fix order of assignment and get template file before return
|
2018-10-12 15:20:57 -04:00 |
|
Max Kostikov
|
b65ee01aef
|
Update hmessages.po
|
2018-10-12 16:39:03 +02:00 |
|
Max Kostikov
|
2b311bd860
|
Update hstrings.php
|
2018-10-12 16:38:58 +02:00 |
|
Max Kostikov
|
a841b75b98
|
Update hstrings.php
|
2018-10-12 11:50:21 +02:00 |
|
Max Kostikov
|
9b3b7dc098
|
Update hmessages.po
|
2018-10-12 11:49:48 +02:00 |
|
zotlabs
|
f783454774
|
verify some edge case http signatures
(cherry picked from commit c6bfd5e7be)
|
2018-10-12 10:56:28 +02:00 |
|
Mario Vavti
|
81d9258e80
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-12 09:42:57 +02:00 |
|
zotlabs
|
c6bfd5e7be
|
verify some edge case http signatures
|
2018-10-11 21:28:47 -07:00 |
|
Max Kostikov
|
3c5cfd465b
|
Update hstrings.php
|
2018-10-11 23:39:58 +02:00 |
|
Max Kostikov
|
f61f9bdc5f
|
Missed strings added to Russian translation
|
2018-10-11 23:39:13 +02:00 |
|
Manuel Jiménez Friaza
|
2ab6e0843d
|
Typos in Spanish translation
(cherry picked from commit c54ba1fb86)
|
2018-10-11 16:06:45 +02:00 |
|
Mario
|
d21bf41b6c
|
Merge branch 'dev' into 'dev'
Typos in Spanish translation
See merge request hubzilla/core!1327
|
2018-10-11 16:06:25 +02:00 |
|
Manuel Jiménez Friaza
|
c54ba1fb86
|
Typos in Spanish translation
|
2018-10-11 12:23:00 +02:00 |
|
M.Dent
|
4d86a199f0
|
Add wiki_preprocess hook and documentation
(cherry picked from commit bad4ea6e65)
|
2018-10-11 11:42:29 +02:00 |
|
Mario
|
4756826054
|
Merge branch 'dev' into 'dev'
Add wiki_preprocess hook and documentation
See merge request hubzilla/core!1326
|
2018-10-11 11:42:00 +02:00 |
|
Mario
|
ea309aa19e
|
Merge branch 'patch-9' into 'dev'
Formatting fix in russian translation
See merge request hubzilla/core!1325
|
2018-10-11 11:40:11 +02:00 |
|
M.Dent
|
bad4ea6e65
|
Add wiki_preprocess hook and documentation
|
2018-10-10 22:46:00 -04:00 |
|
Mario Vavti
|
cf4288767a
|
fix issue in zot finger
(cherry picked from commit 802ccdff4a)
|
2018-10-10 23:08:58 +02:00 |
|
Mario Vavti
|
802ccdff4a
|
fix issue in zot finger
|
2018-10-10 23:00:59 +02:00 |
|
Mario Vavti
|
ba50de15ea
|
revert gitlab-ci until we have a working configuration
|
2018-10-10 20:15:35 +02:00 |
|
Max Kostikov
|
73e30e8085
|
Update hstrings.php
|
2018-10-10 17:45:03 +02:00 |
|
Max Kostikov
|
a53912cc19
|
Formatting fix in russian translation
|
2018-10-10 17:43:41 +02:00 |
|
Mario Vavti
|
f105f70ded
|
missing install
|
2018-10-10 15:47:55 +02:00 |
|
Mario Vavti
|
f0cd084738
|
one last try for now
|
2018-10-10 15:45:54 +02:00 |
|
Mario Vavti
|
ae5158b676
|
sigh...
|
2018-10-10 15:36:16 +02:00 |
|
Mario Vavti
|
bfd45a0017
|
lets try this
|
2018-10-10 15:27:43 +02:00 |
|
Mario Vavti
|
78be0c66da
|
add some dependencies for gd
|
2018-10-10 15:21:54 +02:00 |
|
Mario Vavti
|
562cde37f4
|
probably that is the way to do it
|
2018-10-10 15:15:09 +02:00 |
|
Mario Vavti
|
263dea0e36
|
wrong package name
|
2018-10-10 15:06:19 +02:00 |
|
Mario Vavti
|
de743e35d0
|
add php-gd and use php7 image
|
2018-10-10 15:01:42 +02:00 |
|
Mario Vavti
|
09a46d0c74
|
gitlab-ci example file
|
2018-10-10 14:54:13 +02:00 |
|