aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | remove broken include path hackzotlabs2018-07-031-2/+0
|/
* bad mergezotlabs2018-07-011-0/+4
|
* some changes to support plumezotlabs2018-07-011-1/+2
|
* propagate expired posts to other networkszotlabs2018-06-301-3/+8
|
* be very precise about what a url looks likezotlabs2018-06-301-1/+1
|
* add the missing link to manage privacy groupszotlabs2018-06-281-0/+8
|
* plugins -> addonszotlabs2018-06-288-36/+36
|
* String change to reflect the current forum tagging methodzotlabs2018-06-281-1/+1
|
* imagick converter: -thumbnail doesn't preserve exif, -resize doeszotlabs2018-06-264-6/+6
|
* do not include system channels in directory resultszotlabs2018-06-251-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-259-215/+342
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-253-17/+18
| |\
| * | versionMario Vavti2018-06-251-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-2554-3015/+2447
| |\ \
| | * \ Merge branch 'dev' into 'dev'Mike Macgirvin2018-06-201-2/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | 2 times the same ;) See merge request hubzilla/core!1222
| | | * | Update roadmap.bbgia vec2018-06-191-2/+1
| | | | |
| | * | | Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | NL strings: fix simple error See merge request hubzilla/core!1221
| | | * | fix simple errorjeroenpraat2018-06-181-1/+1
| | | | |
| | | * | fix simple errorjeroenpraat2018-06-181-1/+1
| | | | |
| * | | | updates justified gallery lib to version 3.7 and minor fixes for full templateMario Vavti2018-06-255-210/+338
| | |/ / | |/| |
* | | | disable log noise until it is neededzotlabs2018-06-251-1/+1
| |_|/ |/| |
* | | crc32 is potentially reversiblezotlabs2018-06-251-1/+1
| | |
* | | SECURITY: logging: hash the session_id in case somebody posts log snippets ↵zotlabs2018-06-251-3/+10
| | | | | | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events
* | | remove the white-space pre-wrap property on code blocks. This should ↵zotlabs2018-06-242-9/+2
| | | | | | | | | | | | probably be done with the word-break property instead
* | | remote_self wasn't working correctlyzotlabs2018-06-241-5/+6
| |/ |/|
* | hiding a channel from the directory also hides them from the cloud rootdirzotlabs2018-06-181-3/+2
| |
* | whitespacezotlabs2018-06-181-2/+0
| |
* | channel sources: add 'resend' option to discard original author - similar to ↵zotlabs2018-06-183-6/+13
| | | | | | | | the Friendica remote_self setting
* | translate dos line endingszotlabs2018-06-1817-2381/+2381
| |
* | provide flag to collect_recipients to exclude privacy groups (for federation ↵zotlabs2018-06-181-2/+8
| | | | | | | | plugin use)
* | consolidate the various project roadmap files and remove stuff that's either ↵zotlabs2018-06-173-89/+13
| | | | | | | | finished or abandoned
* | remove admin docs on upgrading from redmatrix; operation is no longer supportedzotlabs2018-06-171-10/+0
| |
* | This effectively reverts 438ce44a which symlinked doc/es to a non-existent ↵zotlabs2018-06-171-1/+1
| | | | | | | | file (doc/doc/es-es)