Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix js error with catalan language (unescaped strings) | Mario Vavti | 2018-05-27 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1191 from jeroenpraat/master | git-marijus | 2018-05-25 | 2 | -11655/+12317 |
|\ | | | | | Finaly update of Dutch language strings | ||||
| * | Finaly update of Dutch language strings | Jeroen | 2018-05-24 | 2 | -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-1 | git-marijus | 2018-05-24 | 1 | -1/+1 |
|\ | | | | | Update remote_friends_common.tpl | ||||
| * | Update remote_friends_common.tpl | antil0pa | 2018-05-22 | 1 | -1/+1 |
|/ | | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page. | ||||
* | address globbing issue in #1170 | Mario Vavti | 2018-05-21 | 6 | -6/+18 |
| | |||||
* | update oauth related tables to use bigint/int(10) for user_id column. this ↵ | Mario | 2018-05-20 | 5 | -10/+68 |
| | | | | is to be more consistent with the rest of the tables and fixes issue #1180 | ||||
* | improve abconfig queries | Mario Vavti | 2018-05-20 | 3 | -3/+30 |
| | |||||
* | more local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -10/+10 |
| | |||||
* | local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -3/+3 |
| | |||||
* | do not update #acl-list-content on every click in jot. we just need this ↵ | Mario Vavti | 2018-05-20 | 1 | -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 reference | Mario Vavti | 2018-05-20 | 9 | -51/+215 |
| | |||||
* | fix issue where images were not visible in acl selector after using search | Mario Vavti | 2018-05-20 | 1 | -0/+4 |
| | |||||
* | Merge pull request #1178 from fadelkon/master | git-marijus | 2018-05-20 | 2 | -3225/+4431 |
|\ | | | | | Update catalan translations | ||||
| * | Update catalan translation (both po and php) for sources changes up to Apr ↵ | fadelkon | 2018-05-20 | 2 | -3422/+4764 |
| | | | | | | | | 23rd 2018, 07:35. | ||||
| * | Update view/ca/hstrings.php to match the version of view/ca/hmessages.po | fadelkon | 2018-05-20 | 1 | -1780/+1644 |
| | | |||||
* | | Merge pull request #1170 from waitman/master | git-marijus | 2018-05-20 | 14 | -15/+15 |
|\ \ | |/ |/| | shebang portable | ||||
| * | replace disable globbing switch | root | 2018-05-12 | 1 | -1/+1 |
| | | |||||
| * | replace disable globbing switch | root | 2018-05-12 | 1 | -1/+1 |
| | | |||||
| * | replace disable globbing switch | root | 2018-05-12 | 5 | -5/+5 |
| | | |||||
| * | shebang portable | root | 2018-05-12 | 14 | -15/+15 |
| | | |||||
* | | anybody authenticated not correctly handled in can_comment_on_post() | zotlabs | 2018-05-16 | 1 | -1/+1 |
|/ | |||||
* | fix postgres issue if register mode is set to yes - with approval | Mario Vavti | 2018-05-12 | 1 | -2/+4 |
| | |||||
* | yet another postgres/"group by" issue | zotlabs | 2018-05-08 | 1 | -2/+2 |
| | |||||
* | Merge branch '3.4RC'3.4 | Mario Vavti | 2018-05-04 | 1045 | -29968/+48488 |
|\ | |||||
| * | release version 3.4 | Mario Vavti | 2018-05-04 | 1 | -1/+1 |
| | | |||||
| * | switch DIRECTORY_FALLBACK_MASTER to https://zotadel.net | Mario Vavti | 2018-05-04 | 1 | -1/+1 |
| | | |||||
| * | update changelog | Mario Vavti | 2018-05-04 | 1 | -1/+5 |
| | | |||||
| * | RC5 | Mario Vavti | 2018-05-03 | 1 | -1/+1 |
| | | |||||
| * | Revert "hubzilla issue #1151 - activitypub mention gets bookmarked" | Mario Vavti | 2018-05-03 | 2 | -4/+4 |
| | | | | | | | | This reverts commit 285781b8870d1c36cf90a3b38a448719b8bf9d21. | ||||
| * | hubzilla issue #1151 - activitypub mention gets bookmarked | zotlabs | 2018-05-03 | 2 | -4/+4 |
| | | |||||
| * | make the cloud logging a bit less verbose until we actually need it. | zotlabs | 2018-05-03 | 2 | -2/+2 |
| | | |||||
| * | update composer autoload cache | Mario Vavti | 2018-05-03 | 2 | -0/+18 |
| | | |||||
| * | RC4 | Mario Vavti | 2018-05-02 | 1 | -1/+1 |
| | | |||||
| * | Create /doc/context/fr/wiki/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+13 |
| | | |||||
| * | Create /doc/context/fr/webpages/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+8 |
| | | |||||
| * | Create /doc/context/fr/settings/tokens | Galette Saucisse | 2018-05-02 | 1 | -0/+20 |
| | | |||||
| * | Create /doc/context/fr/settings/channel/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+18 |
| | | |||||
| * | Create /doc/context/fr/settings/account/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+18 |
| | | |||||
| * | Create /doc/context/fr/profile/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+6 |
| | | |||||
| * | Create /doc/context/photos/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+6 |
| | | |||||
| * | Create /doc/context/fr/mail/help.html | Galette Saucisse | 2018-05-02 | 1 | -0/+10 |
| | | |||||
| * | The channel import page seems to have missed the big theme cleanup of the ↵ | zotlabs | 2018-05-02 | 4 | -79/+62 |
| | | | | | | | | last couple of years. | ||||
| * | provide warnings about profile photo and cover photo permissions | zotlabs | 2018-05-02 | 4 | -1/+8 |
| | | |||||
| * | hubzilla issue #1149, don't duplicate addressbook entries on repeated ↵ | zotlabs | 2018-05-02 | 1 | -4/+20 |
| | | | | | | | | channel imports | ||||
| * | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵ | Mario Vavti | 2018-05-02 | 1 | -0/+11 |
| | | | | | | | | | | | | unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."" This reverts commit b223e364c6221aa3c680505fda4acfd6a1790272. | ||||
| * | parent folder permissions weren't being checked back to the cloud root ↵ | zotlabs | 2018-05-02 | 2 | -62/+47 |
| | | | | | | | | directory in all cases | ||||
| * | activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵ | Mario Vavti | 2018-04-30 | 1 | -1/+1 |
| | | | | | | | | button if we do not find an xchan_addr | ||||
| * | fix another pgsql update error | Mario | 2018-04-30 | 1 | -1/+1 |
| | | |||||
| * | Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵ | Mario Vavti | 2018-04-30 | 1 | -11/+0 |
| | | | | | | | | | | | | sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array." This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc. |