Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 54bdf59dde Update js_strings.php Max Kostikov 2018-10-13 19:56:07 +02:00
• e96e3dc6e6 Update po2php.php Max Kostikov 2018-10-13 19:54:13 +02:00
• 3ac4337aec Update main.js Max Kostikov 2018-10-13 19:52:59 +02:00
• f68674b35a Update js_strings.tpl Max Kostikov 2018-10-13 19:51:33 +02:00
• 729d0d5368 Update language.php Max Kostikov 2018-10-13 19:50:09 +02:00
• 5c0d31873a Add date/time plurals translation in JavaScript Max Kostikov 2018-10-13 19:48:45 +02:00
• 5310f4e310 bump version to 3.8RC2.1 due to javascript changes Mario 2018-10-13 17:32:08 +02:00
• 2c961328f1 Merge branch 'dev' into 3.8RC Mario Vavti 2018-10-13 17:21:12 +02:00
• c36773674e Revert "Merge branch 'patch-11' into 'dev'" Mario Vavti 2018-10-13 17:18:42 +02:00
• 54c615dbc2 Update hmessages.po Max KostikovandMario 2018-10-13 12:22:58 +00:00
• 483ef09890 Update hstrings.php Max KostikovandMario 2018-10-13 12:22:13 +00:00
• 81a741e760 Update hstrings.php Max KostikovandMario 2018-10-13 12:20:48 +00:00
• 278f2a6cac New russian plurals for JavaScript Max KostikovandMario 2018-10-13 12:20:10 +00:00
• cf277261dc Merge branch 'patch-12' into 'dev' Mario 2018-10-13 14:51:59 +02:00
• 451ee5a593 Update hmessages.po Max Kostikov 2018-10-13 14:22:58 +02:00
• ba3811a284 Update hstrings.php Max Kostikov 2018-10-13 14:22:13 +02:00
• e2241b9365 Update hstrings.php Max Kostikov 2018-10-13 14:20:48 +02:00
• fe2bb84403 New russian plurals for JavaScript Max Kostikov 2018-10-13 14:20:10 +02:00
• 6f1067a889 version 3.8RC2 Mario Vavti 2018-10-13 14:12:09 +02:00
• f0cdbd0f52 Merge branch 'dev' into 3.8RC Mario Vavti 2018-10-13 14:11:08 +02:00
• 9632cafa95 bump version Mario Vavti 2018-10-13 14:05:44 +02:00
• 321b2b9b49 Fix order of assignment and get template file before return ZotSocial AdminandMario 2018-10-12 19:14:20 +00:00
• fb3dd5eee6 Merge branch 'dev' into 'dev' Mario 2018-10-13 14:01:01 +02:00
• e518445853 Merge branch 'patch-11' into 'dev' Mario 2018-10-13 14:00:12 +02:00
• 8ce240b95c Merge branch 'patch-10' into 'dev' Mario 2018-10-13 13:57:48 +02:00
• 0db047e572 fix phpunit error with html2markdown test and temporary disable failing markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected) git-marijus 2018-10-13 13:39:22 +02:00
• 22275f3077 fix dba_pdoTest git-marijus 2018-10-13 13:26:59 +02:00
• b77acb3e53 add gitlab-ci.yml and phpunit.xml git-marijus 2018-10-13 13:19:17 +02:00
• 6ae9ef571e Update language.php Max Kostikov 2018-10-13 02:14:19 +02:00
• 8e5189464e Update language.php Max Kostikov 2018-10-13 01:36:24 +02:00
• 0de713ff36 Update language.php Max Kostikov 2018-10-13 01:08:06 +02:00
• 137bee9d27 Update language.php Max Kostikov 2018-10-13 00:40:06 +02:00
• 3641ab8c7d Update language.php Max Kostikov 2018-10-13 00:28:12 +02:00
• 16b6b76507 Update language.php Max Kostikov 2018-10-13 00:25:57 +02:00
• 5cd9540d5f Update language.php Max Kostikov 2018-10-13 00:24:04 +02:00
• ae7873260e Update language.php Max Kostikov 2018-10-13 00:20:23 +02:00
• 3dfe604ba0 Update main.js Max Kostikov 2018-10-13 00:15:48 +02:00
• 3e19c4ddae Update language.php Max Kostikov 2018-10-13 00:12:17 +02:00
• de59300aaf Update js_strings.tpl Max Kostikov 2018-10-12 23:51:01 +02:00
• 8cb05a91ab Update language.php Max Kostikov 2018-10-12 23:45:52 +02:00
• 5f2c3f607e Add plurals translation at browser side (JS) Max Kostikov 2018-10-12 23:43:38 +02:00
• 8ebcc4439b Fix order of assignment and get template file before return ZotSocial AdminandDM42.Net (Matt Dent) 2018-10-12 15:14:20 -04:00
• b65ee01aef Update hmessages.po Max Kostikov 2018-10-12 16:39:03 +02:00
• 2b311bd860 Update hstrings.php Max Kostikov 2018-10-12 16:38:58 +02:00
• a841b75b98 Update hstrings.php Max Kostikov 2018-10-12 11:50:21 +02:00
• 9b3b7dc098 Update hmessages.po Max Kostikov 2018-10-12 11:49:48 +02:00
• f783454774 verify some edge case http signatures zotlabsandMario 2018-10-12 04:28:47 +00:00
• 81d9258e80 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-10-12 09:42:57 +02:00
• c6bfd5e7be verify some edge case http signatures zotlabs 2018-10-11 21:28:47 -07:00
• 3c5cfd465b Update hstrings.php Max Kostikov 2018-10-11 23:39:58 +02:00
• f61f9bdc5f Missed strings added to Russian translation Max Kostikov 2018-10-11 23:39:13 +02:00
• 2ab6e0843d Typos in Spanish translation Manuel Jiménez FriazaandMario 2018-10-11 10:23:00 +00:00
• d21bf41b6c Merge branch 'dev' into 'dev' Mario 2018-10-11 16:06:25 +02:00
• c54ba1fb86 Typos in Spanish translation Manuel Jiménez Friaza 2018-10-11 12:23:00 +02:00
• 4d86a199f0 Add wiki_preprocess hook and documentation M.DentandMario 2018-10-11 02:46:00 +00:00
• 4756826054 Merge branch 'dev' into 'dev' Mario 2018-10-11 11:42:00 +02:00
• ea309aa19e Merge branch 'patch-9' into 'dev' Mario 2018-10-11 11:40:11 +02:00
• bad4ea6e65 Add wiki_preprocess hook and documentation M.Dent 2018-10-10 22:46:00 -04:00
• cf4288767a fix issue in zot finger Mario Vavti 2018-10-10 21:00:59 +00:00
• 802ccdff4a fix issue in zot finger Mario Vavti 2018-10-10 23:00:59 +02:00
• ba50de15ea revert gitlab-ci until we have a working configuration Mario Vavti 2018-10-10 20:15:35 +02:00
• 73e30e8085 Update hstrings.php Max Kostikov 2018-10-10 17:45:03 +02:00
• a53912cc19 Formatting fix in russian translation Max Kostikov 2018-10-10 17:43:41 +02:00
• f105f70ded missing install Mario Vavti 2018-10-10 15:47:55 +02:00
• f0cd084738 one last try for now Mario Vavti 2018-10-10 15:45:54 +02:00
• ae5158b676 sigh... Mario Vavti 2018-10-10 15:36:16 +02:00
• bfd45a0017 lets try this Mario Vavti 2018-10-10 15:27:43 +02:00
• 78be0c66da add some dependencies for gd Mario Vavti 2018-10-10 15:21:54 +02:00
• 562cde37f4 probably that is the way to do it Mario Vavti 2018-10-10 15:15:09 +02:00
• 263dea0e36 wrong package name Mario Vavti 2018-10-10 15:06:19 +02:00
• de743e35d0 add php-gd and use php7 image Mario Vavti 2018-10-10 15:01:42 +02:00
• 09a46d0c74 gitlab-ci example file Mario Vavti 2018-10-10 14:54:13 +02:00
• ca5a1d0853 fix minor issue in dark and light schemas Mario Vavti 2018-10-10 12:01:03 +00:00
• 97fcc495f2 fix minor issue in dark and light schemas Mario Vavti 2018-10-10 14:01:03 +02:00
• 4e69467b14 SECURITY: signature issue zotlabsandMario 2018-10-10 05:37:53 +00:00
• d2e366a46f Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-10-10 13:33:15 +02:00
• 94905a71ac fix even more wiki issues Mario Vavti 2018-10-10 09:01:13 +00:00
• c7644ad29d fix some more wiki issues Mario Vavti 2018-10-10 08:39:28 +00:00
• 0daa462207 Fix escaping quote for wiki_delete_page M.DentandMario 2018-10-10 01:01:05 +00:00
• d8f79f48e9 Rework Wiki encoding scheme. M.DentandMario 2018-10-08 17:22:39 +00:00
• bf878dc446 Implement custom escaping M.DentandMario 2018-10-07 23:08:47 +00:00
• c06b37b798 fix even more wiki issues Mario Vavti 2018-10-10 11:01:13 +02:00
• 30e3580856 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-10-10 10:39:42 +02:00
• d29caa099a fix some more wiki issues Mario Vavti 2018-10-10 10:39:28 +02:00
• d1270aab4d Fixed some errors in Spanish translation Manuel Jiménez FriazaandMario 2018-10-09 09:48:08 +00:00
• cd55298616 Merge branch 'dev' into 'dev' Mario 2018-10-10 09:22:32 +02:00
• c6f3298f78 SECURITY: signature issue zotlabs 2018-10-09 22:37:53 -07:00
• 350db4ed9f Merge branch 'fix-wiki-escaping' into 'dev' M. Dent 2018-10-10 03:04:31 +02:00
• 1ccca9863c Fix escaping quote for wiki_delete_page M.Dent 2018-10-09 21:01:05 -04:00
• a7b03c1cea Fixed some errors in Spanish translation Manuel Jiménez Friaza 2018-10-09 11:48:08 +02:00
• 2cb52f8875 Merge branch 'dev' zotlabs 2018-10-08 20:58:16 -07:00
• 2c797807cd whitespace zotlabs 2018-10-08 20:56:20 -07:00
• 37b94bf5fa Merge branch 'fix-wiki-escaping' into 'dev' Mario 2018-10-08 21:20:17 +02:00
• cbbe4b33a3 Update Spanish translation Manuel Jiménez FriazaandMario 2018-10-08 17:57:11 +00:00
• a00a849952 Merge branch 'dev' into 'dev' Mario 2018-10-08 21:08:39 +02:00
• e877a001ab Update Spanish translation Manuel Jiménez Friaza 2018-10-08 19:57:11 +02:00
• 709665846e Rework Wiki encoding scheme. M.Dent 2018-10-08 13:22:39 -04:00
• 93a310582f Implement custom escaping M.Dent 2018-10-07 19:08:47 -04:00
• 9f4219773e typo Mario Vavti 2018-10-08 09:38:45 +00:00
• f0b7a7e5d3 typo Mario Vavti 2018-10-08 11:38:45 +02:00