aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Escape internal quotes in translation on exportkostikov2018-07-221-3/+3
|
* update changelogMario Vavti2018-07-211-0/+94
|
* Merge branch 'patch-2' into 'dev'Mario2018-07-217-65/+118
|\ | | | | | | | | New russian templates See merge request hubzilla/core!1233
| * Update update_fail_eml.tplkostikov2018-07-201-13/+14
| |
| * Create register_verify_member.tplkostikov2018-07-201-0/+34
| |
| * Update register_verify_eml.tplkostikov2018-07-201-10/+9
| |
| * Update register_open_eml.tplkostikov2018-07-201-14/+12
| |
| * Update passchanged_eml.tplkostikov2018-07-201-11/+15
| |
| * Update lostpass_eml.tplkostikov2018-07-201-17/+20
| |
| * Add new filekostikov2018-07-201-0/+14
| |
* | Merge branch 'patch-1' into 'dev'Mario2018-07-211-2/+2
|\ \ | | | | | | | | | | | | Add var to respect current hstrings.php format See merge request hubzilla/core!1231
| * | Add var to respect current hstrings.php formatkostikov2018-07-201-2/+2
| | |
* | | Merge branch 'dev' into 'dev'Mario2018-07-212-7104/+15657
|\ \ \ | |_|/ |/| | | | | | | | Update russian translation for 3.6 See merge request hubzilla/core!1230
| * | Update hstrings.phpkostikov2018-07-201-1633/+3130
| | |
| * | Update hmessages.pokostikov2018-07-201-5471/+12527
| | |
* | | prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| |/ |/|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-201-6/+6
|\ \
| * | Merge branch 'dev' into 'dev'Mario2018-07-201-6/+6
| |\| | | | | | | | | | | | | Update php2po.php See merge request hubzilla/core!1229
| | * Update php2po.phpkostikov2018-07-201-6/+6
| | |
* | | fix jot drag and dropMario Vavti2018-07-201-6/+9
|/ /
* | checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-191-2/+2
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-190-0/+0
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-1910-25/+28
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-187-25/+183
| |\ \ \ | | |_|/ | |/| |
* | | | fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-191-0/+2
| | | |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-186-1573/+2048
|\| | | | |_|/ |/| |
| * | set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| | |
| * | version 3.7Mario Vavti2018-07-181-1/+1
| | |
| * | update composer autoload cacheMario Vavti2018-07-182-2/+18
| | |
| * | update stringsMario Vavti2018-07-181-1568/+2025
| | |
| * | version 3.6RCMario Vavti2018-07-181-1/+1
| | |
| * | Update hmessages.pokostikov2018-07-181-1/+1
| | | | | | | | | (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
| * | Fix wrong plural function logickostikov2018-07-181-1/+1
| | | | | | | | | (cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
* | | typozotlabs2018-07-181-1/+1
| | |
* | | query filter was a bit greedyzotlabs2018-07-183-3/+3
| | |
* | | mangled urls on redirectszotlabs2018-07-188-16/+17
| | |
* | | util/typo - perform php -l and then include the file. We'll catch a bunch ↵zotlabs2018-07-171-7/+9
| |/ |/| | | | | more stuff.
* | spellcheckzotlabs2018-07-151-2/+2
| |
* | update_addon_repo: scan the addon dir after updating and remove dead ↵zotlabs2018-07-151-0/+7
| | | | | | | | symlinks (which represent deprecated/removed addons).
* | 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
| | |