Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | wiki: word-wrap code on any character | zotlabs | 2018-06-14 | 1 | -0/+2 |
| | | |||||
| * | optionally report total available space when uploading | zotlabs | 2018-06-13 | 1 | -0/+1 |
| | | |||||
| * | SECURITY: provide option to disable the cloud 'root' directory and make the ↵ | zotlabs | 2018-06-13 | 1 | -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 dev | zotlabs | 2018-06-10 | 1 | -1/+1 |
| |\ | |||||
| | * | hubzilla core issue #1218 | zotlabs | 2018-06-10 | 1 | -1/+1 |
| | | | |||||
* | | | some work on mod group | Mario | 2018-06-17 | 6 | -124/+91 |
|/ / | |||||
* | | fix issue #1219 | Mario Vavti | 2018-06-09 | 1 | -1/+1 |
| | | |||||
* | | move cid filter js to the widget | Mario Vavti | 2018-06-09 | 2 | -4/+5 |
| | | |||||
* | | new feature filter network by name | Mario Vavti | 2018-06-08 | 3 | -0/+14 |
|/ | |||||
* | fixes for search_item.tpl | Mario Vavti | 2018-06-07 | 2 | -49/+41 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-06 | 5 | -8/+8 |
|\ | |||||
| * | some work to make menus editable by visitors with webpage write permissions; ↵ | zotlabs | 2018-06-05 | 5 | -8/+8 |
| | | | | | | | | this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality. | ||||
* | | rely on the pf argument to determine if we deal with a forum or not. ↵ | Mario Vavti | 2018-06-05 | 1 | -0/+2 |
|/ | | | | xchan_pubforum is not set for all public forums in the forum filters for some reason. | ||||
* | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 5 | -4/+9 |
| | |||||
* | some more work on forum notifications | Mario Vavti | 2018-06-02 | 3 | -4/+38 |
| |