aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.6RC'Mario Vavti2018-07-25459-21056/+33775
|\
| * Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RCMario Vavti2018-07-2513-7204/+15883
| |\
| | * Merge branch 'patch-2' into 'dev'Mario2018-07-233-261/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape internal quotes in translation on export See merge request hubzilla/core!1237 (cherry picked from commit 84e57d040b6b7df4b7673d3f6f4974225117e3a4) 64efd07f Escape internal quotes in translation on export 87857fe5 Update hmessages.po 3342fc22 Update hstrings.php
| | * update changelogMario Vavti2018-07-211-0/+94
| | | | | | | | | (cherry picked from commit 6be66d6df9c35adb48148b791730ec9c6c533988)
| | * Add var to respect current hstrings.php formatkostikov2018-07-211-2/+2
| | | | | | | | | (cherry picked from commit 062633d312b4d595e21ac09029f73ca8768508b0)
| | * Update php2po.phpkostikov2018-07-211-6/+6
| | | | | | | | | (cherry picked from commit f9b18aa62f30527880377d2c1dd391af4be04a6c)
| | * Update update_fail_eml.tplkostikov2018-07-211-13/+14
| | | | | | | | | (cherry picked from commit 8fc7f2aca178b170cf23504abdf60dfd6083e2eb)
| | * Update register_verify_eml.tplkostikov2018-07-211-10/+9
| | | | | | | | | (cherry picked from commit b6c2c8117e4bb778d2dad325398b348969557836)
| | * Update register_open_eml.tplkostikov2018-07-211-14/+12
| | | | | | | | | (cherry picked from commit 86a42aad16ddc6654c0781847c0e69a71c62a2e4)
| | * Update passchanged_eml.tplkostikov2018-07-211-11/+15
| | | | | | | | | (cherry picked from commit 8e2e09bb167de47b2171f4698afff3cc472c0fbb)
| | * Update lostpass_eml.tplkostikov2018-07-211-17/+20
| | | | | | | | | (cherry picked from commit 3713aa210f88bc56289917ed66a853e5eb68652e)
| | * Add new filekostikov2018-07-211-0/+14
| | | | | | | | | (cherry picked from commit a65c23546bafa081a37b239045c6e38d5c2b2fdd)
| | * Update hstrings.phpkostikov2018-07-211-1633/+3130
| | | | | | | | | (cherry picked from commit 790a9155d416d52387a1891417d8558ed490ea5d)
| | * Update hmessages.pokostikov2018-07-211-5471/+12527
| | | | | | | | | (cherry picked from commit f141b845fd96ebcd6b893b1289f2693f9f77dfbd)
| | * prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| | | | | | | | | (cherry picked from commit f6de91bf0fe1abf41d9b15a553ba378e42a956d1)
| | * fix jot drag and dropMario Vavti2018-07-201-6/+9
| | | | | | | | | (cherry picked from commit c72f6e6ea8d363c43de27760a2374230ce521606)
| | * checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-201-2/+2
| | | | | | | | | (cherry picked from commit a94c9d270906136f69156c0e7c0bd2c8a2e63d1a)
| | * fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-201-0/+2
| | | | | | | | | (cherry picked from commit 6adbb93f0a4990a93c759b0fee580db6891527e2)
| * | RC1Mario Vavti2018-07-191-1/+1
| |/
| * typozotlabs2018-07-191-1/+1
| | | | | | (cherry picked from commit ec852b0c8d6c8e566b2a5fb279ed359630afb5ee)
| * query filter was a bit greedyzotlabs2018-07-193-3/+3
| | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109)
| * Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'Mario2018-07-198-16/+17
| |\ | | | | | | | | | | | | mangled urls on redirects See merge request hubzilla/core!1228
| | * mangled urls on redirectszotlabs2018-07-198-16/+17
| |/ | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a)
| * set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| | | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
| * update composer autoload cacheMario Vavti2018-07-182-2/+18
| |
| * update stringsMario Vavti2018-07-181-1568/+2025
| |
| * version 3.6RCMario Vavti2018-07-181-1/+1
| |
| * Update hmessages.pokostikov2018-07-181-1/+1
| | | | | | (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
| * Fix wrong plural function logickostikov2018-07-181-1/+1
| | | | | | (cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
| * when calling timeago() from mod_mail.js it is called before the translations ↵Mario Vavti2018-07-132-1/+3
| | | | | | | | are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time)
| * let timeago render the dateMario Vavti2018-07-131-1/+1
| |
| * let timeago render the dateMario Vavti2018-07-131-1/+1
| |
| * update jquery.timeago libMario Vavti2018-07-132-17/+28
| |
| * Merge branch 'hookableCSP-mr' into 'dev'Mario2018-07-131-3/+30
| |\ | | | | | | | | | | | | Hookable csp mr See merge request hubzilla/core!1225
| | * Hookable csp mrM. Dent2018-07-131-3/+30
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-121-1/+1
| |\
| | * fix to cart behaviourzotlabs2018-07-111-1/+1
| | |
| * | Merge branch 'patch-1' into 'dev'Andrew Manning2018-07-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | Update hstrings.php - spelling - Privatsphäre See merge request hubzilla/core!1223
| | * | Update hstrings.php - spelling - PrivatsphäreHeiko Förster2018-07-081-1/+1
| |/ /
| * | fix css regressionMario Vavti2018-07-072-3/+1
| | |
| * | this is messing with names containing a comma and is superfluous nowMario Vavti2018-07-061-2/+0
| |/
| * don't provide manage apps button when viewing all availablezotlabs2018-07-052-2/+2
| |
| * change to import system apps at most once a day per personzotlabs2018-07-051-2/+2
| |
| * app store fixeszotlabs2018-07-051-18/+13
| |
| * appstore changeszotlabs2018-07-046-12/+112
| |
| * issue syncing pageflagszotlabs2018-07-041-8/+5
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2018-07-041-2/+2
| |\
| | * order nouveau by created instead of received since ordering by received ↵Mario Vavti2018-07-041-2/+2
| | | | | | | | | | | | returns unexpected results once old expired items get re-imported
| | * Revert "add the missing link to manage privacy groups"Mario Vavti2018-07-041-8/+0
| | | | | | | | | | | | This reverts commit c28e27357a1ce700b91021344050ec531bce3889.
| * | remove manage group link from activity_filter, already in personal menuzotlabs2018-07-041-8/+0
| | |