| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.6RC' | Mario Vavti | 2018-07-25 | 459 | -21056/+33775 |
| |\ | |||||
| | * | Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC | Mario Vavti | 2018-07-25 | 13 | -7204/+15883 |
| | |\ | |||||
| | | * | Merge branch 'patch-2' into 'dev' | Mario | 2018-07-23 | 3 | -261/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape internal quotes in translation on export See merge request hubzilla/core!1237 (cherry picked from commit 84e57d040b6b7df4b7673d3f6f4974225117e3a4) 64efd07f Escape internal quotes in translation on export 87857fe5 Update hmessages.po 3342fc22 Update hstrings.php | ||||
| | | * | update changelog | Mario Vavti | 2018-07-21 | 1 | -0/+94 |
| | | | | | | | | | | (cherry picked from commit 6be66d6df9c35adb48148b791730ec9c6c533988) | ||||
| | | * | Add var to respect current hstrings.php format | kostikov | 2018-07-21 | 1 | -2/+2 |
| | | | | | | | | | | (cherry picked from commit 062633d312b4d595e21ac09029f73ca8768508b0) | ||||
| | | * | Update php2po.php | kostikov | 2018-07-21 | 1 | -6/+6 |
| | | | | | | | | | | (cherry picked from commit f9b18aa62f30527880377d2c1dd391af4be04a6c) | ||||
| | | * | Update update_fail_eml.tpl | kostikov | 2018-07-21 | 1 | -13/+14 |
| | | | | | | | | | | (cherry picked from commit 8fc7f2aca178b170cf23504abdf60dfd6083e2eb) | ||||
| | | * | Update register_verify_eml.tpl | kostikov | 2018-07-21 | 1 | -10/+9 |
| | | | | | | | | | | (cherry picked from commit b6c2c8117e4bb778d2dad325398b348969557836) | ||||
| | | * | Update register_open_eml.tpl | kostikov | 2018-07-21 | 1 | -14/+12 |
| | | | | | | | | | | (cherry picked from commit 86a42aad16ddc6654c0781847c0e69a71c62a2e4) | ||||
| | | * | Update passchanged_eml.tpl | kostikov | 2018-07-21 | 1 | -11/+15 |
| | | | | | | | | | | (cherry picked from commit 8e2e09bb167de47b2171f4698afff3cc472c0fbb) | ||||
| | | * | Update lostpass_eml.tpl | kostikov | 2018-07-21 | 1 | -17/+20 |
| | | | | | | | | | | (cherry picked from commit 3713aa210f88bc56289917ed66a853e5eb68652e) | ||||
| | | * | Add new file | kostikov | 2018-07-21 | 1 | -0/+14 |
| | | | | | | | | | | (cherry picked from commit a65c23546bafa081a37b239045c6e38d5c2b2fdd) | ||||
| | | * | Update hstrings.php | kostikov | 2018-07-21 | 1 | -1633/+3130 |
| | | | | | | | | | | (cherry picked from commit 790a9155d416d52387a1891417d8558ed490ea5d) | ||||
| | | * | Update hmessages.po | kostikov | 2018-07-21 | 1 | -5471/+12527 |
| | | | | | | | | | | (cherry picked from commit f141b845fd96ebcd6b893b1289f2693f9f77dfbd) | ||||
| | | * | prevent double file uploads when dropping files into jot | Mario Vavti | 2018-07-20 | 1 | -0/+1 |
| | | | | | | | | | | (cherry picked from commit f6de91bf0fe1abf41d9b15a553ba378e42a956d1) | ||||
| | | * | fix jot drag and drop | Mario Vavti | 2018-07-20 | 1 | -6/+9 |
| | | | | | | | | | | (cherry picked from commit c72f6e6ea8d363c43de27760a2374230ce521606) | ||||
| | | * | checkjs fix ($page not bin-hex in all cases) | zotlabs | 2018-07-20 | 1 | -2/+2 |
| | | | | | | | | | | (cherry picked from commit a94c9d270906136f69156c0e7c0bd2c8a2e63d1a) | ||||
| | | * | fix the filtered query string so it can potentially be re-used as is. | zotlabs | 2018-07-20 | 1 | -0/+2 |
| | | | | | | | | | | (cherry picked from commit 6adbb93f0a4990a93c759b0fee580db6891527e2) | ||||
| | * | | RC1 | Mario Vavti | 2018-07-19 | 1 | -1/+1 |
| | |/ | |||||
| | * | typo | zotlabs | 2018-07-19 | 1 | -1/+1 |
| | | | | | | | (cherry picked from commit ec852b0c8d6c8e566b2a5fb279ed359630afb5ee) | ||||
| | * | query filter was a bit greedy | zotlabs | 2018-07-19 | 3 | -3/+3 |
| | | | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109) | ||||
| | * | Merge branch 'cherry-pick-5ce50d0a' into '3.6RC' | Mario | 2018-07-19 | 8 | -16/+17 |
| | |\ | | | | | | | | | | | | | mangled urls on redirects See merge request hubzilla/core!1228 | ||||
| | | * | mangled urls on redirects | zotlabs | 2018-07-19 | 8 | -16/+17 |
| | |/ | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a) | ||||
| | * | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 |
| | | | | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e) | ||||
| | * | update composer autoload cache | Mario Vavti | 2018-07-18 | 2 | -2/+18 |
| | | | |||||
| | * | update strings | Mario Vavti | 2018-07-18 | 1 | -1568/+2025 |
| | | | |||||
| | * | version 3.6RC | Mario Vavti | 2018-07-18 | 1 | -1/+1 |
| | | | |||||
| | * | Update hmessages.po | kostikov | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72) | ||||
| | * | Fix wrong plural function logic | kostikov | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | (cherry picked from commit 42840886119420b4efad511da0cb307f74542545) | ||||
| | * | when calling timeago() from mod_mail.js it is called before the translations ↵ | Mario Vavti | 2018-07-13 | 2 | -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 date | Mario Vavti | 2018-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | let timeago render the date | Mario Vavti | 2018-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | update jquery.timeago lib | Mario Vavti | 2018-07-13 | 2 | -17/+28 |
| | | | |||||
| | * | 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 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |