Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'redbasic-addroomforfooter' into 'dev' | Mario | 2018-08-21 | 2 | -2/+12 |
|\ | | | | | | | | | Add bottom margin on aside elements and main to allow for viewport footer. See merge request hubzilla/core!1259 | ||||
| * | Add bottom margin on aside elements and main to allow for viewport footer. | M.Dent | 2018-08-20 | 2 | -2/+12 |
| | | |||||
* | | Update catalan translations for sstrings up to 18th July 2018 | fadelkon | 2018-08-20 | 6 | -1851/+2442 |
|/ | |||||
* | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-12 | 1 | -1/+1 |
|\ | |||||
| * | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵ | zotlabs | 2018-08-11 | 1 | -1/+1 |
| | | | | | | | | creation | ||||
* | | Merge branch 'oauth2-ui-pr' into 'dev' | Mario | 2018-08-12 | 1 | -3/+4 |
|\ \ | |/ |/| | | | | | Oauth2 ui pr See merge request hubzilla/core!1255 | ||||
| * | OAuth2 UI and settings updates | M.Dent | 2018-08-10 | 1 | -3/+4 |
| | | |||||
* | | Update Spanish translation | Manuel Jiménez Friaza | 2018-07-30 | 5 | -16/+33 |
| | | |||||
* | | Update hstrings.php | Max Kostikov | 2018-07-26 | 1 | -9/+9 |
| | | |||||
* | | Update hmessages.po | Max Kostikov | 2018-07-26 | 1 | -9/+10 |
| | | |||||
* | | Update passchanged_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 |
| | | |||||
* | | Update lostpass_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 |
| | | |||||
* | | Update hstrings.php | kostikov | 2018-07-23 | 1 | -75/+94 |
| | | |||||
* | | Update hmessages.po | kostikov | 2018-07-23 | 1 | -183/+171 |
| | | |||||
* | | 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 '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 |
| | | | |||||
* | | | fix jot drag and drop | Mario Vavti | 2018-07-20 | 1 | -6/+9 |
|/ / | |||||
* | | 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 | 1 | -2/+2 |
|/ | |||||
* | 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 |
| | |||||
* | don't provide manage apps button when viewing all available | zotlabs | 2018-07-05 | 1 | -1/+1 |
| | |||||
* | appstore changes | zotlabs | 2018-07-04 | 2 | -0/+9 |
| | |||||
* | plugins -> addons | zotlabs | 2018-06-28 | 1 | -4/+4 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-25 | 1 | -1/+0 |
|\ | |||||
| * | remove the white-space pre-wrap property on code blocks. This should ↵ | zotlabs | 2018-06-24 | 1 | -1/+0 |
| | | | | | | | | probably be done with the word-break property instead | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-06-25 | 27 | -513/+4 |
|\ \ | |||||
| * \ | Merge branch 'patch-1' into 'dev' | Mike Macgirvin | 2018-06-20 | 2 | -2/+2 |
| |\ \ | | |/ | |/| | | | | | | | NL strings: fix simple error See merge request hubzilla/core!1221 | ||||
| | * | fix simple error | jeroenpraat | 2018-06-18 | 1 | -1/+1 |
| | | | |||||
| | * | fix simple error | jeroenpraat | 2018-06-18 | 1 | -1/+1 |
| | | | |||||
| * | | channel sources: add 'resend' option to discard original author - similar to ↵ | zotlabs | 2018-06-18 | 2 | -0/+2 |
| | | | | | | | | | | | | the Friendica remote_self setting | ||||
| * | | remove several unused/unreferenced templates | zotlabs | 2018-06-17 | 23 | -511/+0 |
| |/ | |||||
* / | updates justified gallery lib to version 3.7 and minor fixes for full template | Mario Vavti | 2018-06-25 | 1 | -4/+5 |
|/ | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-06-17 | 4 | -3/+7 |
|\ | |||||
| * | hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵ | zotlabs | 2018-06-15 | 1 | -2/+2 |
| | | | | | | | | saved default changes |