aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-07-212-7104/+15657
|\
| * Update hstrings.phpkostikov2018-07-201-1633/+3130
| * Update hmessages.pokostikov2018-07-201-5471/+12527
* | prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-201-6/+6
|\ \
| * | Merge branch 'dev' into 'dev'Mario2018-07-201-6/+6
| |\|
| | * Update php2po.phpkostikov2018-07-201-6/+6
* | | fix jot drag and dropMario Vavti2018-07-201-6/+9
|/ /
* | checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-191-2/+2
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-190-0/+0
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-1910-25/+28
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-187-25/+183
| |\ \ \ | | |_|/ | |/| |
* | | | fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-191-0/+2
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-186-1573/+2048
|\| | | | |_|/ |/| |
| * | set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| * | version 3.7Mario Vavti2018-07-181-1/+1
| * | 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
* | | typozotlabs2018-07-181-1/+1
* | | query filter was a bit greedyzotlabs2018-07-183-3/+3
* | | mangled urls on redirectszotlabs2018-07-188-16/+17
* | | util/typo - perform php -l and then include the file. We'll catch a bunch mor...zotlabs2018-07-171-7/+9
| |/ |/|
* | spellcheckzotlabs2018-07-151-2/+2
* | update_addon_repo: scan the addon dir after updating and remove dead symlinks...zotlabs2018-07-151-0/+7
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-1510-28/+64
|\|
| * 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
| |\
| * \ 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
* | | functions to support module and widget registration by plugins. These have id...zotlabs2018-07-125-23/+174
| |/ |/|
* | fix to cart behaviourzotlabs2018-07-111-1/+1
|/
* 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