aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* escape query stringMario Vavti2018-06-085-7/+7
| | | (cherry picked from commit b3928f3d2a7c4c77df5ceba6fc29cbfcbe067dff)
* typoMario Vavti2018-06-081-1/+1
| | | (cherry picked from commit b47fdd748f4f7e8112ae5cd9d2d5c84985f43c7f)
* Merge branch 'master' into 'master'Mario2018-06-082-72/+72
|\ | | | | | | | | Master See merge request hubzilla/core!1211
| * Update developers.bbgia vec2018-06-071-71/+71
| |
| * Update Developers.mdgia vec2018-06-071-1/+1
|/
* update a number of links in the codezotlabs2018-06-076-42/+39
| | | (cherry picked from commit 2c7597066c03bc60e83b934415df6fd7551016d1)
* remove gravizot.de from directory fallback servers due to owners requestMario Vavti2018-06-061-1/+0
|
* update install instructionsMario Vavti2018-06-061-10/+10
|
* Some stuff of the Spanish HubzillaManuel Jiménez Friaza2018-05-292-0/+21
|
* fix js error with catalan language (unescaped strings)Mario Vavti2018-05-271-2/+2
|
* Merge pull request #1191 from jeroenpraat/mastergit-marijus2018-05-252-11655/+12317
|\ | | | | Finaly update of Dutch language strings
| * Finaly update of Dutch language stringsJeroen2018-05-242-11655/+12317
|/ | | Already in dev, but it's up to Mario or Mike to decide if the master may be updated too
* Merge pull request #1185 from antil0pa/patch-1git-marijus2018-05-241-1/+1
|\ | | | | Update remote_friends_common.tpl
| * Update remote_friends_common.tplantil0pa2018-05-221-1/+1
|/ | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
* address globbing issue in #1170Mario Vavti2018-05-216-6/+18
|
* update oauth related tables to use bigint/int(10) for user_id column. this ↵Mario2018-05-205-10/+68
| | | | is to be more consistent with the rest of the tables and fixes issue #1180
* improve abconfig queriesMario Vavti2018-05-203-3/+30
|
* more local_channel() is not stringMario Vavti2018-05-201-10/+10
|
* local_channel() is not stringMario Vavti2018-05-201-3/+3
|
* do not update #acl-list-content on every click in jot. we just need this ↵Mario Vavti2018-05-201-49/+51
| | | | updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts.
* update to fork-awesome 1.1 and fix an old font-awesome referenceMario Vavti2018-05-209-51/+215
|
* fix issue where images were not visible in acl selector after using searchMario Vavti2018-05-201-0/+4
|
* Merge pull request #1178 from fadelkon/mastergit-marijus2018-05-202-3225/+4431
|\ | | | | Update catalan translations
| * Update catalan translation (both po and php) for sources changes up to Apr ↵fadelkon2018-05-202-3422/+4764
| | | | | | | | 23rd 2018, 07:35.
| * Update view/ca/hstrings.php to match the version of view/ca/hmessages.pofadelkon2018-05-201-1780/+1644
| |
* | Merge pull request #1170 from waitman/mastergit-marijus2018-05-2014-15/+15
|\ \ | |/ |/| shebang portable
| * replace disable globbing switchroot2018-05-121-1/+1
| |
| * replace disable globbing switchroot2018-05-121-1/+1
| |
| * replace disable globbing switchroot2018-05-125-5/+5
| |
| * shebang portableroot2018-05-1214-15/+15
| |
* | anybody authenticated not correctly handled in can_comment_on_post()zotlabs2018-05-161-1/+1
|/
* fix postgres issue if register mode is set to yes - with approvalMario Vavti2018-05-121-2/+4
|
* yet another postgres/"group by" issuezotlabs2018-05-081-2/+2
|
* Merge branch '3.4RC'3.4Mario Vavti2018-05-041045-29968/+48488
|\
| * release version 3.4Mario Vavti2018-05-041-1/+1
| |
| * switch DIRECTORY_FALLBACK_MASTER to https://zotadel.netMario Vavti2018-05-041-1/+1
| |
| * update changelogMario Vavti2018-05-041-1/+5
| |
| * RC5Mario Vavti2018-05-031-1/+1
| |
| * Revert "hubzilla issue #1151 - activitypub mention gets bookmarked"Mario Vavti2018-05-032-4/+4
| | | | | | | | This reverts commit 285781b8870d1c36cf90a3b38a448719b8bf9d21.
| * hubzilla issue #1151 - activitypub mention gets bookmarkedzotlabs2018-05-032-4/+4
| |
| * make the cloud logging a bit less verbose until we actually need it.zotlabs2018-05-032-2/+2
| |
| * update composer autoload cacheMario Vavti2018-05-032-0/+18
| |
| * RC4Mario Vavti2018-05-021-1/+1
| |
| * Create /doc/context/fr/wiki/help.htmlGalette Saucisse2018-05-021-0/+13
| |
| * Create /doc/context/fr/webpages/help.htmlGalette Saucisse2018-05-021-0/+8
| |
| * Create /doc/context/fr/settings/tokensGalette Saucisse2018-05-021-0/+20
| |
| * Create /doc/context/fr/settings/channel/help.htmlGalette Saucisse2018-05-021-0/+18
| |
| * Create /doc/context/fr/settings/account/help.htmlGalette Saucisse2018-05-021-0/+18
| |
| * Create /doc/context/fr/profile/help.htmlGalette Saucisse2018-05-021-0/+6
| |
| * Create /doc/context/photos/help.htmlGalette Saucisse2018-05-021-0/+6
| |