Commit Graph

23577 Commits

Author SHA1 Message Date
Max Kostikov
781eeff021 Update Linkinfo.php 2018-10-23 20:36:30 +02:00
Max Kostikov
3e6c2c6024 Update Linkinfo.php 2018-10-23 19:57:21 +02:00
Max Kostikov
f180558041 Convert non UTF-8 content on link embeding 2018-10-23 19:32:36 +02:00
zotlabs
506ea71302 for whatever reason there were two of these
(cherry picked from commit 7ed197f46b)
2018-10-23 13:23:18 +02:00
Mario Vavti
01e11e9043 Merge remote-tracking branch 'mike/master' into dev 2018-10-23 13:18:04 +02:00
zotlabs
7ed197f46b for whatever reason there were two of these 2018-10-22 17:12:36 -07:00
Mario Vavti
5c36eef039 textcomplete: return up to 100 items and look for for matches in the entire string (not just the beginning) when suggesting emojis 2018-10-22 15:36:02 +02:00
Mario Vavti
26e20f9999 add summary to bbcode autocomplete list 2018-10-22 14:04:09 +02:00
Mario Vavti
71195895ba update blueimp_upload to version 9.23 2018-10-22 09:45:20 +02:00
Mario
c7ebb4b009 version 3.8.1 2018-10-21 09:25:37 +02:00
Mario Vavti
c0cef8dd12 changelog for 3.8.1
(cherry picked from commit ea850e58d2)
2018-10-21 09:23:37 +02:00
Mario Vavti
ea850e58d2 changelog for 3.8.1 2018-10-21 09:22:42 +02:00
Mario Vavti
dcdd97a985 fix ellipsis for too long nav banner
(cherry picked from commit a61ce45a32)
2018-10-21 09:10:45 +02:00
Mario Vavti
a61ce45a32 fix ellipsis for too long nav banner 2018-10-21 09:10:02 +02:00
mike
1326c4e71e fix wrong value being used for menu_id
(cherry picked from commit fdb7c115a7)
2018-10-21 09:02:17 +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
zotlabs
9cbbc80f7a disable blueimp demo server
(cherry picked from commit 7c49f22702)
2018-10-21 08:49:43 +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
fa9e9510e5 Merge branch '3.8RC' 2018-10-19 11:18:28 +02:00
Mario Vavti
06b3ad1071 version 3.8 2018-10-19 11:16:44 +02:00
Mario Vavti
d96a731e93 bump version 2018-10-19 11:14:20 +02:00
Mario Vavti
847ff77a81 optimize autoload
(cherry picked from commit 2583270774)
2018-10-19 11:13:33 +02:00
Mario Vavti
df746c7911 strings and bump apd versions to version 2
(cherry picked from commit 4aed866d69)
2018-10-19 11:12:33 +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
d775a7ee21 Merge branch 'patch-18' into 'dev'
Russian translation for upgrade plugin added

See merge request hubzilla/core!1344

(cherry picked from commit c044ff3444)

ac2b6bcc Russian translation for upgrade plugin added
6e758423 Update hstrings.php
2018-10-19 10:56:55 +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
c440b758a3 Merge branch 'dev' into 'dev'
Fix template root redirection

See merge request hubzilla/core!1343

(cherry picked from commit e9471124c0)

442d1cb4 Fix template root redirection
2018-10-18 09:12:38 +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
5030c55b1e complete changelog
(cherry picked from commit fa91e2a60c)
2018-10-17 12:51:36 +02:00
Mario Vavti
fa91e2a60c complete changelog 2018-10-17 12:25:46 +02:00
Mario
32de123db0 fix sql error 2018-10-17 11:05:28 +02:00
Mario Vavti
90e9c37d35 improve posting to mod pconfig via ajax
(cherry picked from commit ae875734e2)
2018-10-16 21:20:47 +02:00
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