Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update hmessages.po | kostikov | 2018-07-23 | 1 | -183/+171 |
| | |||||
* | update changelog | Mario Vavti | 2018-07-21 | 1 | -0/+94 |
| | |||||
* | Merge branch 'patch-2' into 'dev' | Mario | 2018-07-21 | 7 | -65/+118 |
|\ | | | | | | | | | New russian templates See merge request hubzilla/core!1233 | ||||
| * | Update update_fail_eml.tpl | kostikov | 2018-07-20 | 1 | -13/+14 |
| | | |||||
| * | Create register_verify_member.tpl | kostikov | 2018-07-20 | 1 | -0/+34 |
| | | |||||
| * | Update register_verify_eml.tpl | kostikov | 2018-07-20 | 1 | -10/+9 |
| | | |||||
| * | Update register_open_eml.tpl | kostikov | 2018-07-20 | 1 | -14/+12 |
| | | |||||
| * | Update passchanged_eml.tpl | kostikov | 2018-07-20 | 1 | -11/+15 |
| | | |||||
| * | Update lostpass_eml.tpl | kostikov | 2018-07-20 | 1 | -17/+20 |
| | | |||||
| * | Add new file | kostikov | 2018-07-20 | 1 | -0/+14 |
| | | |||||
* | | Merge branch 'patch-1' into 'dev' | Mario | 2018-07-21 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Add var to respect current hstrings.php format See merge request hubzilla/core!1231 | ||||
| * | | Add var to respect current hstrings.php format | kostikov | 2018-07-20 | 1 | -2/+2 |
| | | | |||||
* | | | 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 |
| | | |