aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * update changelogMario Vavti2018-07-211-0/+94
| * Add var to respect current hstrings.php formatkostikov2018-07-211-2/+2
| * Update php2po.phpkostikov2018-07-211-6/+6
| * Update update_fail_eml.tplkostikov2018-07-211-13/+14
| * Update register_verify_eml.tplkostikov2018-07-211-10/+9
| * Update register_open_eml.tplkostikov2018-07-211-14/+12
| * Update passchanged_eml.tplkostikov2018-07-211-11/+15
| * Update lostpass_eml.tplkostikov2018-07-211-17/+20
| * Add new filekostikov2018-07-211-0/+14
| * Update hstrings.phpkostikov2018-07-211-1633/+3130
| * Update hmessages.pokostikov2018-07-211-5471/+12527
| * prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| * fix jot drag and dropMario Vavti2018-07-201-6/+9
| * checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-201-2/+2
| * fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-201-0/+2
* | RC1Mario Vavti2018-07-191-1/+1
|/
* typozotlabs2018-07-191-1/+1
* query filter was a bit greedyzotlabs2018-07-193-3/+3
* Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'Mario2018-07-198-16/+17
|\
| * mangled urls on redirectszotlabs2018-07-198-16/+17
|/
* set the correct album name when moving photosMario Vavti2018-07-181-1/+3
* 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
* Fix wrong plural function logickostikov2018-07-181-1/+1
* when calling timeago() from mod_mail.js it is called before the translations ...Mario Vavti2018-07-132-1/+3
* 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 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ä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 retur...Mario Vavti2018-07-041-2/+2
| * Revert "add the missing link to manage privacy groups"Mario Vavti2018-07-041-8/+0
* | remove manage group link from activity_filter, already in personal menuzotlabs2018-07-041-8/+0
* | remove broken include path hackzotlabs2018-07-031-2/+0
|/