aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* compatibility fix for future versionsMario2018-07-191-1/+7
|
* set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
* Merge branch 'patch-1' into 'master'Mario2018-07-181-1/+1
|\ | | | | | | | | Fix wrong plural function logic See merge request hubzilla/core!1226
| * Update hmessages.pokostikov2018-07-181-1/+1
| |
| * Fix wrong plural function logickostikov2018-07-171-1/+1
|/
* issue syncing pageflagszotlabs2018-07-041-8/+5
|
* hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵zotlabs2018-06-152-7/+8
| | | | saved default changes
* apply changes to slider defaults across all modules that use buildQuery for ↵zotlabs2018-06-155-10/+10
| | | | updates
* Merge branch 'master' into 'master'Mike Macgirvin2018-06-132-2/+2
|\ | | | | | | | | Master See merge request hubzilla/core!1218
| * Update hstrings.phpgia vec2018-06-121-1/+1
| |
| * Update hmessages.pogia vec2018-06-121-1/+1
| |
* | Merge branch 'remove-github-from-README' into 'master'Mike Macgirvin2018-06-131-1/+1
|\ \ | |/ |/| | | | | remove github from link to INSTALL.txt See merge request hubzilla/core!1215
| * remove github from link to INSTALL.txtHerbert Thielen2018-06-111-1/+1
|/
* fixes for immediate expire, channel_active not initialised in DBzotlabs2018-06-102-4/+2
|
* fix issue #1221Mario Vavti2018-06-101-2/+2
| | | (cherry picked from commit d0f7b1d9b79a5a96314d5c6caa011f7050cec2f9)
* Merge branch 'dev' into 'dev'Mario2018-06-101-1/+1
| | | | | | | | | Update symbolic link doc/es See merge request hubzilla/core!1214 (cherry picked from commit 46cc64f2d8a503c21c8eda6d4b0b17427d29d6cd) 438ce44a Update symbolic link doc/es
* update changelog3.4.1Mario Vavti2018-06-081-0/+24
| | | (cherry picked from commit 7c98aea52497ebbdd1880d98b0dbc26c32eaca39)
* bump versionMario2018-06-081-1/+1
|
* DB update to fix wrong hubloc_url for activitypub hublocsMario Vavti2018-06-082-1/+27
| | | (cherry picked from commit eb04dbc5ce2321ca5da4274005bd3e4352cf83fa)
* github to framagit transitionMario Vavti2018-06-081-2/+2
| | | (cherry picked from commit 7bf1c5f27b8b8f0eea226e81a5db99585c5a56b3)
* we probably don't need to delivery local items more than oncezotlabs2018-06-081-0/+2
| | | (cherry picked from commit 139c39c2ce270ca1e95d86b517ebe0ad4182ecfa)
* when removing a connection, use the same rules as expire: don't remove items ↵zotlabs2018-06-081-2/+7
| | | | | that are starred, filed, or that you replied to. (cherry picked from commit 5d83469621facf89884ada4036bd25b7b566b616)
* don't show forums in forum widget if archived flag is setzotlabs2018-06-081-1/+1
| | | (cherry picked from commit 7c05500392aea9d992919e1791c1557dd2f49424)
* Initial translations in doc/es-esManuel Jiménez Friaza2018-06-088-0/+659
| | | (cherry picked from commit ea8ff7037a7272802a500ad91c2052451c0c1deb)
* 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