Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'hookableCSP-mr' into 'dev' | Mario | 2018-07-13 | 1 | -3/+30 |
|\ | | | | | | | | | Hookable csp mr See merge request hubzilla/core!1225 | ||||
| * | Hookable csp mr | M. Dent | 2018-07-13 | 1 | -3/+30 |
|/ | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-12 | 1 | -1/+1 |
|\ | |||||
| * | fix to cart behaviour | zotlabs | 2018-07-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'patch-1' into 'dev' | Andrew Manning | 2018-07-10 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Update hstrings.php - spelling - Privatsphäre See merge request hubzilla/core!1223 | ||||
| * | | Update hstrings.php - spelling - Privatsphäre | Heiko Förster | 2018-07-08 | 1 | -1/+1 |
|/ / | |||||
* | | fix css regression | Mario Vavti | 2018-07-07 | 2 | -3/+1 |
| | | |||||
* | | this is messing with names containing a comma and is superfluous now | Mario Vavti | 2018-07-06 | 1 | -2/+0 |
|/ | |||||
* | don't provide manage apps button when viewing all available | zotlabs | 2018-07-05 | 2 | -2/+2 |
| | |||||
* | change to import system apps at most once a day per person | zotlabs | 2018-07-05 | 1 | -2/+2 |
| | |||||
* | app store fixes | zotlabs | 2018-07-05 | 1 | -18/+13 |
| | |||||
* | appstore changes | zotlabs | 2018-07-04 | 6 | -12/+112 |
| | |||||
* | issue syncing pageflags | zotlabs | 2018-07-04 | 1 | -8/+5 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2018-07-04 | 1 | -2/+2 |
|\ | |||||
| * | order nouveau by created instead of received since ordering by received ↵ | Mario Vavti | 2018-07-04 | 1 | -2/+2 |
| | | | | | | | | returns unexpected results once old expired items get re-imported | ||||
| * | Revert "add the missing link to manage privacy groups" | Mario Vavti | 2018-07-04 | 1 | -8/+0 |
| | | | | | | | | This reverts commit c28e27357a1ce700b91021344050ec531bce3889. | ||||
* | | remove manage group link from activity_filter, already in personal menu | zotlabs | 2018-07-04 | 1 | -8/+0 |
| | | |||||
* | | remove broken include path hack | zotlabs | 2018-07-03 | 1 | -2/+0 |
|/ | |||||
* | bad merge | zotlabs | 2018-07-01 | 1 | -0/+4 |
| | |||||
* | some changes to support plume | zotlabs | 2018-07-01 | 1 | -1/+2 |
| | |||||
* | propagate expired posts to other networks | zotlabs | 2018-06-30 | 1 | -3/+8 |
| | |||||
* | be very precise about what a url looks like | zotlabs | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | add the missing link to manage privacy groups | zotlabs | 2018-06-28 | 1 | -0/+8 |
| | |||||
* | plugins -> addons | zotlabs | 2018-06-28 | 8 | -36/+36 |
| | |||||
* | String change to reflect the current forum tagging method | zotlabs | 2018-06-28 | 1 | -1/+1 |
| | |||||
* | imagick converter: -thumbnail doesn't preserve exif, -resize does | zotlabs | 2018-06-26 | 4 | -6/+6 |
| | |||||
* | do not include system channels in directory results | zotlabs | 2018-06-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-25 | 9 | -215/+342 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-25 | 3 | -17/+18 |
| |\ | |||||
| * | | version | Mario Vavti | 2018-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-06-25 | 54 | -3015/+2447 |
| |\ \ | |||||
| | * \ | Merge branch 'dev' into 'dev' | Mike Macgirvin | 2018-06-20 | 1 | -2/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | 2 times the same ;) See merge request hubzilla/core!1222 | ||||
| | | * | | Update roadmap.bb | gia vec | 2018-06-19 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Merge branch 'patch-1' into 'dev' | Mike Macgirvin | 2018-06-20 | 2 | -2/+2 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | NL strings: fix simple error See merge request hubzilla/core!1221 | ||||
| | | * | | fix simple error | jeroenpraat | 2018-06-18 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | fix simple error | jeroenpraat | 2018-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | updates justified gallery lib to version 3.7 and minor fixes for full template | Mario Vavti | 2018-06-25 | 5 | -210/+338 |
| | |/ / | |/| | | |||||
* | | | | disable log noise until it is needed | zotlabs | 2018-06-25 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | crc32 is potentially reversible | zotlabs | 2018-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | SECURITY: logging: hash the session_id in case somebody posts log snippets ↵ | zotlabs | 2018-06-25 | 1 | -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 ↵ | zotlabs | 2018-06-24 | 2 | -9/+2 |
| | | | | | | | | | | | | probably be done with the word-break property instead | ||||
* | | | remote_self wasn't working correctly | zotlabs | 2018-06-24 | 1 | -5/+6 |
| |/ |/| | |||||
* | | hiding a channel from the directory also hides them from the cloud rootdir | zotlabs | 2018-06-18 | 1 | -3/+2 |
| | | |||||
* | | whitespace | zotlabs | 2018-06-18 | 1 | -2/+0 |
| | | |||||
* | | channel sources: add 'resend' option to discard original author - similar to ↵ | zotlabs | 2018-06-18 | 3 | -6/+13 |
| | | | | | | | | the Friendica remote_self setting | ||||
* | | translate dos line endings | zotlabs | 2018-06-18 | 17 | -2381/+2381 |
| | | |||||
* | | provide flag to collect_recipients to exclude privacy groups (for federation ↵ | zotlabs | 2018-06-18 | 1 | -2/+8 |
| | | | | | | | | plugin use) | ||||
* | | consolidate the various project roadmap files and remove stuff that's either ↵ | zotlabs | 2018-06-17 | 3 | -89/+13 |
| | | | | | | | | finished or abandoned | ||||
* | | remove admin docs on upgrading from redmatrix; operation is no longer supported | zotlabs | 2018-06-17 | 1 | -10/+0 |
| | | |||||
* | | This effectively reverts 438ce44a which symlinked doc/es to a non-existent ↵ | zotlabs | 2018-06-17 | 1 | -1/+1 |
| | | | | | | | | file (doc/doc/es-es) |