aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-121-1/+1
|\
| * prevent json-ld bombing, turn off browser autocomplete on channel sources ↵zotlabs2018-08-111-1/+1
| | | | | | | | creation
* | Merge branch 'oauth2-ui-pr' into 'dev'Mario2018-08-121-3/+4
|\ \ | |/ |/| | | | | Oauth2 ui pr See merge request hubzilla/core!1255
| * OAuth2 UI and settings updatesM.Dent2018-08-101-3/+4
| |
* | Update Spanish translationManuel Jiménez Friaza2018-07-305-16/+33
| |
* | Update hstrings.phpMax Kostikov2018-07-261-9/+9
| |
* | Update hmessages.poMax Kostikov2018-07-261-9/+10
| |
* | Update passchanged_eml.tplMax Kostikov2018-07-261-1/+1
| |
* | Update lostpass_eml.tplMax Kostikov2018-07-261-1/+1
| |
* | Update hstrings.phpkostikov2018-07-231-75/+94
| |
* | Update hmessages.pokostikov2018-07-231-183/+171
| |
* | 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 '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
| | |
* | | fix jot drag and dropMario Vavti2018-07-201-6/+9
|/ /
* | 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)
* | 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-131-2/+2
|/
* Update hstrings.php - spelling - PrivatsphäreHeiko Förster2018-07-081-1/+1
|
* fix css regressionMario Vavti2018-07-072-3/+1
|
* don't provide manage apps button when viewing all availablezotlabs2018-07-051-1/+1
|
* appstore changeszotlabs2018-07-042-0/+9
|
* plugins -> addonszotlabs2018-06-281-4/+4
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-251-1/+0
|\
| * remove the white-space pre-wrap property on code blocks. This should ↵zotlabs2018-06-241-1/+0
| | | | | | | | probably be done with the word-break property instead
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-2527-513/+4
|\ \
| * \ Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| |\ \ | | |/ | |/| | | | | | | NL strings: fix simple error See merge request hubzilla/core!1221
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| | |
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| | |
| * | channel sources: add 'resend' option to discard original author - similar to ↵zotlabs2018-06-182-0/+2
| | | | | | | | | | | | the Friendica remote_self setting
| * | remove several unused/unreferenced templateszotlabs2018-06-1723-511/+0
| |/
* / updates justified gallery lib to version 3.7 and minor fixes for full templateMario Vavti2018-06-251-4/+5
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-174-3/+7
|\
| * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵zotlabs2018-06-151-2/+2
| | | | | | | | saved default changes
| * wiki: word-wrap code on any characterzotlabs2018-06-141-0/+2
| |
| * optionally report total available space when uploadingzotlabs2018-06-131-0/+1
| |
| * SECURITY: provide option to disable the cloud 'root' directory and make the ↵zotlabs2018-06-131-0/+1
| | | | | | | | cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional.
| * Merge branch 'master' of ../hz into devzotlabs2018-06-101-1/+1
| |\