Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-19 | 3 | -9/+7 |
|\ | |||||
| * | Revert "remove some redundant references to sticky_kit" | Mario Vavti | 2017-09-19 | 2 | -0/+3 |
| | | | | | | | | This reverts commit dbc0cc8c929809d70ec306f08d4c0031b49c5c93. | ||||
| * | remove some redundant references to sticky_kit | Mario Vavti | 2017-09-19 | 2 | -3/+0 |
| | | |||||
| * | jquery-3.2.1 | Mario | 2017-09-19 | 1 | -4/+4 |
| | | |||||
| * | fix some issues with sticky-kit | Mario | 2017-09-19 | 2 | -5/+3 |
| | | |||||
* | | turn common friends into a widget | zotlabs | 2017-09-19 | 3 | -17/+27 |
|/ | |||||
* | fix various wikipage widget issues (sort pages by name, respect locked mime ↵ | Mario | 2017-09-19 | 1 | -11/+11 |
| | | | | type setting, move create tool back to the bottom) | ||||
* | Moved add wiki page form to top of page list to address issue ↵ | Andrew Manning | 2017-09-16 | 1 | -17/+17 |
| | | | | https://github.com/redmatrix/hubzilla/issues/719 | ||||
* | Page title is what we need in order to delete pages, not the url | Andrew Manning | 2017-09-16 | 1 | -1/+1 |
| | |||||
* | do not show edit pencil if not allowed to edit | Mario Vavti | 2017-09-16 | 1 | -0/+4 |
| | |||||
* | implement wiki editing | Mario | 2017-09-15 | 3 | -20/+24 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-09-15 | 3 | -5/+13 |
|\ | |||||
| * | wiki: lock mimetype | zotlabs | 2017-09-14 | 3 | -4/+12 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-14 | 1 | -0/+2 |
| |\ | |||||
| * | | bring back wiki download | zotlabs | 2017-09-14 | 1 | -2/+2 |
| | | | |||||
* | | | some work on wiki acl | git-marijus | 2017-09-15 | 1 | -1/+15 |
| |/ |/| | |||||
* | | wiki: do not suggest bbcode if mimetype is text/plain | Mario Vavti | 2017-09-14 | 1 | -0/+2 |
|/ | |||||
* | wiki mimetype selection. We can add text/plain as soon as we add code to ↵ | zotlabs | 2017-09-12 | 1 | -1/+2 |
| | | | | purify and render it specifically. | ||||
* | wiki mimetype selection | zotlabs | 2017-09-12 | 1 | -1/+2 |
| | |||||
* | fix radius | Mario Vavti | 2017-09-08 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-08 | 3 | -4/+4 |
|\ | |||||
| * | improve the code block styling a wee bit | zotlabs | 2017-09-07 | 2 | -9/+3 |
| | | |||||
| * | markdown code blocks not preserving line breaks, removed a bootstrap ↵ | zotlabs | 2017-09-07 | 2 | -4/+10 |
| | | | | | | | | over-ride which fixes this, but also changed the style to pre-wrap to wrap the text rather than the default horizontal scroll | ||||
* | | do not double encode already encoded mids | Mario Vavti | 2017-09-07 | 1 | -3/+5 |
|/ | |||||
* | cards: remove double generic-content-wrapper and section title | Mario Vavti | 2017-09-06 | 1 | -9/+4 |
| | |||||
* | provide sharing of cards | zotlabs | 2017-09-05 | 3 | -13/+18 |
| | |||||
* | 32 characters are often not enough to distinguish gnu-social mids - use the ↵ | Mario Vavti | 2017-09-05 | 1 | -2/+2 |
| | | | | entire mid. in /display if we are not dealing with posts (eg likes) provide the thr_parent mid as bParam_mid so we can still adress the right post in javascript | ||||
* | Default Access Control List (ACL) -> Default Privacy Group and minor ↵ | Mario Vavti | 2017-09-04 | 1 | -2/+1 |
| | | | | template fix | ||||
* | remove logging | Mario Vavti | 2017-09-04 | 1 | -2/+0 |
| | |||||
* | add combined index for item.uid and item.item_unseen. this speeds up ↵ | Mario Vavti | 2017-09-01 | 2 | -6/+6 |
| | | | | notifications by a magnitude. | ||||
* | some issues with mod_display on very first anonymous page visit (prior to ↵ | zotlabs | 2017-08-30 | 2 | -1/+3 |
| | | | | any browser cookies being set) | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-29 | 4 | -32/+67 |
|\ | |||||
| * | remove obsolete class | Mario Vavti | 2017-08-28 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-28 | 1 | -1/+3 |
| |\ | |||||
| * | | rewrite comment form handling | git-marijus | 2017-08-28 | 4 | -32/+67 |
| | | | |||||
* | | | add editor autocompleters on cards page | zotlabs | 2017-08-28 | 1 | -0/+6 |
| |/ |/| | |||||
* | | fix issue with comment box re-opening after submit; however I should note ↵ | zotlabs | 2017-08-27 | 1 | -1/+3 |
|/ | | | | that bind and unbind are deprecated in jquery > 1.3 and these calls probably need to be upgraded. | ||||
* | fix titles on ajaxupdate issue, add jsonld-php library | zotlabs | 2017-08-26 | 1 | -2/+3 |
| | |||||
* | radically reduce code duplication in updateConvItems(); it's a bit easier to ↵ | zotlabs | 2017-08-25 | 1 | -109/+55 |
| | | | | understand now although the different modes aren't as cleanly separated as they were. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-24 | 2 | -17/+138 |
|\ | |||||
| * | minor adjustmen to the help language selector | git-marijus | 2017-08-24 | 2 | -3/+3 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-24 | 4 | -1/+19 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-24 | 4 | -1/+19 |
| | |\ | |||||
| * | | | Added language selector menu for Help pages | Andrew Manning | 2017-08-24 | 2 | -0/+65 |
| |/ / | |||||
| * | | Repaired and extended support for help page translations including table of ↵ | Andrew Manning | 2017-08-23 | 2 | -18/+74 |
| | | | | | | | | | | | | contents files at the top level. Moved help module javascript to mod_help.js. | ||||
* | | | cards - change placeholdertext, separate from button text | zotlabs | 2017-08-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | add tasklist and notes to cards page | zotlabs | 2017-08-23 | 1 | -1/+4 |
| | | |||||
* | | cards: make likes reload page | zotlabs | 2017-08-23 | 2 | -2/+3 |
| | | |||||
* | | partial support (unfinished) for ajax loading cards with liveupdate; page ↵ | zotlabs | 2017-08-23 | 1 | -0/+1 |
| | | | | | | | | still functions even though this isn't finished | ||||
* | | apply autotime to all autotime classed elements when static loading a page | zotlabs | 2017-08-23 | 1 | -2/+1 |
| | |