harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,638 Commits 6 Branches 36 Tags 152 MiB
e5883dd605
Commit Graph

23638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario
84d4036117 Merge branch 'fix-master-rate-limiter' into 'dev' 
Fix master rate limiter

See merge request hubzilla/core!1341

(cherry picked from commit e38e85572e)

49eff772 Fix worker age calculation
be30dc9e Move logger to debug/all
b6a9be88 Delete duplicate queue items
 2018-10-16 21:19:28 +02:00
Mario
e38e85572e Merge branch 'fix-master-rate-limiter' into 'dev' 
Fix master rate limiter

See merge request hubzilla/core!1341
 2018-10-16 21:19:16 +02:00
M. Dent
f50d6208c8 Fix master rate limiter 2018-10-16 21:19:16 +02:00
M. Dent
34d189c02e Merge branch 'dev' into 'dev' 
improve posting to mod pconfig via ajax

See merge request hubzilla/core!1340
 2018-10-16 21:08:19 +02:00
Mario
ba9b49bc83 Merge branch 'patch-17' into 'dev' 
Add Russian translations to Newmember widget

See merge request hubzilla/core!1339

(cherry picked from commit ed08eb07c6)

04edb741 Add Russian translations to Newmember widget
d2d6f8c9 Update hstrings.php
 2018-10-16 14:08:02 +02:00
Mario
ed08eb07c6 Merge branch 'patch-17' into 'dev' 
Add Russian translations to Newmember widget

See merge request hubzilla/core!1339
 2018-10-16 14:07:52 +02:00
Mario Vavti
ae875734e2 improve posting to mod pconfig via ajax 2018-10-16 13:46:03 +02:00
Max Kostikov
d2d6f8c970 Update hstrings.php 2018-10-15 21:28:54 +02:00
Max Kostikov
04edb741a6 Add Russian translations to Newmember widget 2018-10-15 21:28:01 +02:00
Mario Vavti
34b4b65865 add missing features section to newmember widget 
(cherry picked from commit 25a74f3664)
 2018-10-15 20:33:28 +02:00
Mario Vavti
25a74f3664 add missing features section to newmember widget 2018-10-15 20:18:25 +02:00
Mario Vavti
fa5537bfc0 allow to undelete deleted base apps 
(cherry picked from commit 3588c4ab99)
 2018-10-15 15:45:51 +02:00
Mario Vavti
3588c4ab99 allow to undelete deleted base apps 2018-10-15 15:43:55 +02:00
Mario Vavti
5a9b1f769d some changelog work 
(cherry picked from commit 782ec06f2b)
 2018-10-15 14:24:54 +02:00
Mario Vavti
782ec06f2b some changelog work 2018-10-15 14:23:58 +02:00
Mario Vavti
5b43db7171 fix wiki issue with wiki page links when using bbcode 
(cherry picked from commit df62037c4a)
 2018-10-15 13:14:30 +02:00
Mario Vavti
df62037c4a fix wiki issue with wiki page links when using bbcode 2018-10-15 13:13:04 +02:00
Mario Vavti
ad1cc82b38 update readme for master and dev branch buildstatus 
(cherry picked from commit 05b8c53ff7)
 2018-10-15 10:38:57 +02:00
Mario Vavti
05b8c53ff7 update readme for master and dev branch buildstatus 2018-10-15 10:37:14 +02:00
Mario
7268426248 Merge branch 'dev' into 'dev' 
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.

See merge request hubzilla/core!1332

(cherry picked from commit c39de966df)

b77acb3e add gitlab-ci.yml and phpunit.xml
22275f30 fix dba_pdoTest
0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown…
 2018-10-15 10:00:06 +02:00
Mario
c39de966df Merge branch 'dev' into 'dev' 
Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci.

See merge request hubzilla/core!1332
 2018-10-15 09:59:52 +02:00
Mario
eb133ef9a7 Merge branch 'patch-16' into 'dev' 
JS plurals displaying code cleanup

See merge request hubzilla/core!1338

(cherry picked from commit 721461dd3e)

b7280a44 JS plurals displaying code cleanup
ab0e2f52 Update language.php
f9c3b807 Update main.js
ce52c27a Update main.js
 2018-10-15 09:59:25 +02:00
Mario
721461dd3e Merge branch 'patch-16' into 'dev' 
JS plurals displaying code cleanup

See merge request hubzilla/core!1338
 2018-10-15 09:59:17 +02:00
Mario
337e25ad43 Merge branch 'patch-15' into 'dev' 
Add JS function code for plurals translation in Russian

See merge request hubzilla/core!1337

(cherry picked from commit 7042528d26)

ee4a2629 Add JS function code for plurals translation
8af91b02 Update hstrings.php
 2018-10-15 09:58:24 +02:00
Mario
7042528d26 Merge branch 'patch-15' into 'dev' 
Add JS function code for plurals translation in Russian

See merge request hubzilla/core!1337
 2018-10-15 09:58:09 +02:00
Max Kostikov
ce52c27a8a Update main.js 2018-10-14 22:45:11 +02:00
Max Kostikov
f9c3b80780 Update main.js 2018-10-14 22:28:47 +02:00
Max Kostikov
ab0e2f5236 Update language.php 2018-10-14 22:28:14 +02:00
Max Kostikov
b7280a442e JS plurals displaying code cleanup 2018-10-14 22:26:56 +02:00
Max Kostikov
8af91b0209 Update hstrings.php 2018-10-14 22:24:36 +02:00
Max Kostikov
ee4a262953 Add JS function code for plurals translation 2018-10-14 15:21:00 +02:00
Mario Vavti
d584293cde min version bump 2018-10-13 20:28:24 +02:00
Mario
c60c9b323b another min version change to mitigate caching issues. we are now at 3.8RC2.2 2018-10-13 20:22:04 +02:00
Mario
eaee27c9e4 Merge branch 'patch-14' into 'dev' 
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1336

(cherry picked from commit a2575059e2)

5c0d3187 Add date/time plurals translation in JavaScript
729d0d53 Update language.php
f68674b3 Update js_strings.tpl
3ac4337a Update main.js
e96e3dc6 Update po2php.php
54bdf59d Update js_strings.php
 2018-10-13 20:17:14 +02:00
Mario
a2575059e2 Merge branch 'patch-14' into 'dev' 
Add date/time plurals translation in JavaScript

See merge request hubzilla/core!1336
 2018-10-13 20:16:56 +02:00
Max Kostikov
54bdf59dde Update js_strings.php 2018-10-13 19:56:07 +02:00
Max Kostikov
e96e3dc6e6 Update po2php.php 2018-10-13 19:54:13 +02:00
Max Kostikov
3ac4337aec Update main.js 2018-10-13 19:52:59 +02:00
Max Kostikov
f68674b35a Update js_strings.tpl 2018-10-13 19:51:33 +02:00
Max Kostikov
729d0d5368 Update language.php 2018-10-13 19:50:09 +02:00
Max Kostikov
5c0d31873a Add date/time plurals translation in JavaScript 2018-10-13 19:48:45 +02:00
Mario
5310f4e310 bump version to 3.8RC2.1 due to javascript changes 2018-10-13 17:32:08 +02:00
Mario Vavti
2c961328f1 Merge branch 'dev' into 3.8RC 2018-10-13 17:21:12 +02:00
Mario Vavti
c36773674e Revert "Merge branch 'patch-11' into 'dev'" 
This reverts commit e518445853, reversing
changes made to 8ce240b95c.
 2018-10-13 17:18:42 +02:00
Max Kostikov
54c615dbc2 Update hmessages.po 
(cherry picked from commit 451ee5a593)
 2018-10-13 14:55:25 +02:00
Max Kostikov
483ef09890 Update hstrings.php 
(cherry picked from commit ba3811a284)
 2018-10-13 14:54:57 +02:00
Max Kostikov
81a741e760 Update hstrings.php 
(cherry picked from commit e2241b9365)
 2018-10-13 14:54:29 +02:00
Max Kostikov
278f2a6cac New russian plurals for JavaScript 
(cherry picked from commit fe2bb84403)
 2018-10-13 14:54:05 +02:00
Mario
cf277261dc Merge branch 'patch-12' into 'dev' 
New russian plurals for JavaScript

See merge request hubzilla/core!1333
 2018-10-13 14:51:59 +02:00
Max Kostikov
451ee5a593 Update hmessages.po 2018-10-13 14:22:58 +02:00