aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | 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
| |\
| * \ 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
| | |
* | | functions to support module and widget registration by plugins. These have ↵zotlabs2018-07-125-23/+174
| |/ |/| | | | | identical construction to core modules and widgets and are registered just like hooks during addon load. Also additional Apps functions addon_app_installed() and system_app_installed() which will eventually replace feature_installed() for features which are converted to apps. The convention being used is that the module associated with the app calls the appropriate *_app_installed() function and if not present emits descriptive text about the app and exits. This allows one to click on an 'available' app and learn about it. Once installed, the app module behaves normally and may offer functionality or what once were addon settings on the settings/featured page. Refer to zap-addons in the zap repository for examples of how this is being used to eliminate the 'additional features' and 'addon settings' pages.
* | 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 ↵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
| |