 Mario
|
95355ddec0
|
Merge branch 'patch-1' into 'master'
Fix wrong plural function logic
See merge request hubzilla/core!1226
|
2018-07-18 08:27:21 +02:00 |
|
 kostikov
|
cbab7d2150
|
Update hmessages.po
|
2018-07-18 00:28:04 +02:00 |
|
|
kostikov
|
4284088611
|
Fix wrong plural function logic
|
2018-07-17 21:27:08 +02:00 |
|
 zotlabs
|
f808a2b5a1
|
issue syncing pageflags
|
2018-07-04 19:53:51 -07:00 |
|
|
zotlabs
|
3fc955abfd
|
hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes
|
2018-06-15 15:34:27 -07:00 |
|
|
zotlabs
|
615fa1119f
|
apply changes to slider defaults across all modules that use buildQuery for updates
|
2018-06-15 15:32:12 -07:00 |
|
|
Mike Macgirvin
|
fdf920b374
|
Merge branch 'master' into 'master'
Master
See merge request hubzilla/core!1218
|
2018-06-13 03:11:05 +02:00 |
|
|
Mike Macgirvin
|
dffd82cb24
|
Merge branch 'remove-github-from-README' into 'master'
remove github from link to INSTALL.txt
See merge request hubzilla/core!1215
|
2018-06-13 03:09:39 +02:00 |
|
 gia vec
|
9840d1ce73
|
Update hstrings.php
|
2018-06-12 20:47:19 +02:00 |
|
|
gia vec
|
6a45bd4372
|
Update hmessages.po
|
2018-06-12 20:42:16 +02:00 |
|
 Herbert Thielen
|
530bc996ca
|
remove github from link to INSTALL.txt
|
2018-06-11 15:26:30 +02:00 |
|
|
zotlabs
|
2f2bd03b15
|
fixes for immediate expire, channel_active not initialised in DB
|
2018-06-10 22:19:51 -07:00 |
|
|
Mario Vavti
|
53363d6808
|
fix issue #1221
(cherry picked from commit d0f7b1d9b7)
|
2018-06-10 17:06:12 +02:00 |
|
|
Mario
|
86c0abe67e
|
Merge branch 'dev' into 'dev'
Update symbolic link doc/es
See merge request hubzilla/core!1214
(cherry picked from commit 46cc64f2d8)
438ce44a Update symbolic link doc/es
|
2018-06-10 16:54:37 +02:00 |
|
|
Mario Vavti
|
2f7dfb0286
|
update changelog
(cherry picked from commit 7c98aea524)
3.4.1
|
2018-06-08 12:17:33 +02:00 |
|
|
Mario
|
688c5bdd20
|
bump version
|
2018-06-08 12:05:06 +02:00 |
|
|
Mario Vavti
|
752a9d904c
|
DB update to fix wrong hubloc_url for activitypub hublocs
(cherry picked from commit eb04dbc5ce)
|
2018-06-08 09:41:35 +02:00 |
|
|
Mario Vavti
|
a5b9fbaf00
|
github to framagit transition
(cherry picked from commit 7bf1c5f27b)
|
2018-06-08 09:05:27 +02:00 |
|
|
zotlabs
|
d841303c04
|
we probably don't need to delivery local items more than once
(cherry picked from commit 139c39c2ce)
|
2018-06-08 08:38:53 +02:00 |
|
|
zotlabs
|
5e5b9895df
|
when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to.
(cherry picked from commit 5d83469621)
|
2018-06-08 08:37:36 +02:00 |
|
|
zotlabs
|
ac8f798e56
|
don't show forums in forum widget if archived flag is set
(cherry picked from commit 7c05500392)
|
2018-06-08 08:37:13 +02:00 |
|
 Manuel Jiménez Friaza
|
5c8ec5cce4
|
Initial translations in doc/es-es
(cherry picked from commit ea8ff7037a)
|
2018-06-08 08:36:19 +02:00 |
|
|
Mario Vavti
|
19e509d997
|
escape query string
(cherry picked from commit b3928f3d2a)
|
2018-06-08 08:33:38 +02:00 |
|
|
Mario Vavti
|
38b230a128
|
typo
(cherry picked from commit b47fdd748f)
|
2018-06-08 08:31:02 +02:00 |
|
|
Mario
|
5deecfea28
|
Merge branch 'master' into 'master'
Master
See merge request hubzilla/core!1211
|
2018-06-08 08:26:15 +02:00 |
|
|
gia vec
|
009ecb0ff4
|
Update developers.bb
|
2018-06-07 22:13:18 +02:00 |
|
|
gia vec
|
68ffddafb1
|
Update Developers.md
|
2018-06-07 22:10:32 +02:00 |
|
|
zotlabs
|
d3f741a8b6
|
update a number of links in the code
(cherry picked from commit 2c7597066c)
|
2018-06-07 14:19:31 +02:00 |
|
|
Mario Vavti
|
9d664df993
|
remove gravizot.de from directory fallback servers due to owners request
|
2018-06-06 22:14:10 +02:00 |
|
|
Mario Vavti
|
89ecc07eb0
|
update install instructions
|
2018-06-06 22:13:27 +02:00 |
|
|
Manuel Jiménez Friaza
|
4aa9549828
|
Some stuff of the Spanish Hubzilla
|
2018-05-29 08:52:49 +02:00 |
|
|
Mario Vavti
|
9655b27f81
|
fix js error with catalan language (unescaped strings)
|
2018-05-27 12:21:20 +02:00 |
|
|
git-marijus
|
13b3594ff3
|
Merge pull request #1191 from jeroenpraat/master
Finaly update of Dutch language strings
|
2018-05-25 12:37:11 +02:00 |
|
 Jeroen
|
fb060c27ef
|
Finaly update of Dutch language strings
Already in dev, but it's up to Mario or Mike to decide if the master may be updated too
|
2018-05-24 18:25:28 +02:00 |
|
|
git-marijus
|
2599d78d0c
|
Merge pull request #1185 from antil0pa/patch-1
Update remote_friends_common.tpl
|
2018-05-24 11:49:35 +02:00 |
|
 antil0pa
|
1da0042ee5
|
Update remote_friends_common.tpl
Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
|
2018-05-22 16:24:04 +02:00 |
|
|
Mario Vavti
|
4610fa2774
|
address globbing issue in #1170
|
2018-05-21 20:01:45 +02:00 |
|
|
Mario
|
5b48eb3657
|
update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180
|
2018-05-20 22:55:13 +02:00 |
|
|
Mario Vavti
|
43f04e4bc0
|
improve abconfig queries
|
2018-05-20 22:55:01 +02:00 |
|
|
Mario Vavti
|
649260ce44
|
more local_channel() is not string
|
2018-05-20 22:54:49 +02:00 |
|
|
Mario Vavti
|
f091a3c9fc
|
local_channel() is not string
|
2018-05-20 22:54:36 +02:00 |
|
|
Mario Vavti
|
18338495af
|
do not update #acl-list-content on every click in jot. we just need this updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts.
|
2018-05-20 22:54:02 +02:00 |
|
|
Mario Vavti
|
a3f9cf7e97
|
update to fork-awesome 1.1 and fix an old font-awesome reference
|
2018-05-20 22:53:19 +02:00 |
|
|
Mario Vavti
|
ef0f195fe8
|
fix issue where images were not visible in acl selector after using search
|
2018-05-20 22:52:33 +02:00 |
|
|
git-marijus
|
23b53cd1ce
|
Merge pull request #1178 from fadelkon/master
Update catalan translations
|
2018-05-20 11:44:59 +02:00 |
|
|
git-marijus
|
d0d14579d1
|
Merge pull request #1170 from waitman/master
shebang portable
|
2018-05-20 11:23:15 +02:00 |
|
 fadelkon
|
8733d9f2a6
|
Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35.
|
2018-05-20 05:59:43 +02:00 |
|
|
fadelkon
|
29da06c298
|
Update view/ca/hstrings.php to match the version of view/ca/hmessages.po
|
2018-05-20 05:46:31 +02:00 |
|
|
zotlabs
|
da460ff32f
|
anybody authenticated not correctly handled in can_comment_on_post()
|
2018-05-16 10:57:13 +02:00 |
|
 root
|
1509c9682b
|
replace disable globbing switch
|
2018-05-12 10:23:45 -07:00 |
|