Commit Graph

22477 Commits

Author SHA1 Message Date
zotlabs 7ed197f46b for whatever reason there were two of these 2018-10-22 17:12:36 -07:00
Mario Vavti ea850e58d2 changelog for 3.8.1 2018-10-21 09:22:42 +02:00
Mario Vavti a61ce45a32 fix ellipsis for too long nav banner 2018-10-21 09:10:02 +02:00
Mario ad5f3877f1 Merge branch 'edit-menu-contents-fix' into 'dev'
fix wrong value being used for menu_id

See merge request hubzilla/core!1345
2018-10-21 09:00:48 +02:00
Mario Vavti 8a02e967d3 Merge remote-tracking branch 'mike/master' into dev 2018-10-21 08:42:37 +02:00
zotlabs 7c49f22702 disable blueimp demo server 2018-10-20 15:27:35 -07:00
mike fdb7c115a7 fix wrong value being used for menu_id 2018-10-20 16:55:54 -04:00
Mario Vavti d96a731e93 bump version 2018-10-19 11:14:20 +02:00
Mario Vavti 2583270774 optimize autoload 2018-10-19 11:12:07 +02:00
Mario Vavti 5393d674f9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-19 11:07:40 +02:00
Mario Vavti 4aed866d69 strings and bump apd versions to version 2 2018-10-19 11:07:06 +02:00
Mario c044ff3444 Merge branch 'patch-18' into 'dev'
Russian translation for upgrade plugin added

See merge request hubzilla/core!1344
2018-10-19 10:56:46 +02:00
Max Kostikov 6e75842354 Update hstrings.php 2018-10-18 11:19:02 +02:00
Max Kostikov ac2b6bcc33 Russian translation for upgrade plugin added 2018-10-18 11:18:14 +02:00
Mario e9471124c0 Merge branch 'dev' into 'dev'
Fix template root redirection

See merge request hubzilla/core!1343
2018-10-18 09:12:30 +02:00
M.Dent 442d1cb48f Fix template root redirection 2018-10-17 22:21:31 -04:00
Mario Vavti fa91e2a60c complete changelog 2018-10-17 12:25:46 +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 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 25a74f3664 add missing features section to newmember widget 2018-10-15 20:18:25 +02:00
Mario Vavti 3588c4ab99 allow to undelete deleted base apps 2018-10-15 15:43:55 +02:00
Mario Vavti 782ec06f2b some changelog work 2018-10-15 14:23:58 +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 05b8c53ff7 update readme for master and dev branch buildstatus 2018-10-15 10:37:14 +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 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 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 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 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
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
Max Kostikov ba3811a284 Update hstrings.php 2018-10-13 14:22:13 +02:00