Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2018-07-21 | 2 | -7104/+15657 |
|\ | | | | | | | | | Update russian translation for 3.6 See merge request hubzilla/core!1230 | ||||
| * | Update hstrings.php | kostikov | 2018-07-20 | 1 | -1633/+3130 |
| | | |||||
| * | Update hmessages.po | kostikov | 2018-07-20 | 1 | -5471/+12527 |
| | | |||||
* | | prevent double file uploads when dropping files into jot | Mario Vavti | 2018-07-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-20 | 1 | -6/+6 |
|\ \ | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-07-20 | 1 | -6/+6 |
| |\| | | | | | | | | | | | | | Update php2po.php See merge request hubzilla/core!1229 | ||||
| | * | Update php2po.php | kostikov | 2018-07-20 | 1 | -6/+6 |
| | | | |||||
* | | | fix jot drag and drop | Mario Vavti | 2018-07-20 | 1 | -6/+9 |
|/ / | |||||
* | | checkjs fix ($page not bin-hex in all cases) | zotlabs | 2018-07-19 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-19 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-19 | 10 | -25/+28 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-18 | 7 | -25/+183 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | fix the filtered query string so it can potentially be re-used as is. | zotlabs | 2018-07-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-18 | 6 | -1573/+2048 |
|\| | | | |_|/ |/| | | |||||
| * | | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 |
| | | | |||||
| * | | version 3.7 | Mario Vavti | 2018-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | 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) | ||||
* | | | typo | zotlabs | 2018-07-18 | 1 | -1/+1 |
| | | | |||||
* | | | query filter was a bit greedy | zotlabs | 2018-07-18 | 3 | -3/+3 |
| | | | |||||
* | | | mangled urls on redirects | zotlabs | 2018-07-18 | 8 | -16/+17 |
| | | | |||||
* | | | util/typo - perform php -l and then include the file. We'll catch a bunch ↵ | zotlabs | 2018-07-17 | 1 | -7/+9 |
| |/ |/| | | | | | more stuff. | ||||
* | | spellcheck | zotlabs | 2018-07-15 | 1 | -2/+2 |
| | | |||||
* | | update_addon_repo: scan the addon dir after updating and remove dead ↵ | zotlabs | 2018-07-15 | 1 | -0/+7 |
| | | | | | | | | symlinks (which represent deprecated/removed addons). | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-15 | 10 | -28/+64 |
|\| | |||||
| * | 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 |
| |\ | |||||
| * \ | 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 |
| | | | |||||
* | | | functions to support module and widget registration by plugins. These have ↵ | zotlabs | 2018-07-12 | 5 | -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 behaviour | zotlabs | 2018-07-11 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| | |