Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-04 | 3 | -18/+74 |
|\ | |||||
| * | introduce shared files notifications | Mario Vavti | 2017-10-04 | 1 | -1/+34 |
| | | |||||
| * | bring back notifications for account approvals | Mario Vavti | 2017-10-04 | 1 | -0/+24 |
| | | |||||
| * | some basic work on mod common | Mario Vavti | 2017-10-03 | 1 | -16/+15 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-03 | 2 | -23/+41 |
| |\ | |||||
| * | | fix community tags not preserved on post edit. issue #865 | Mario Vavti | 2017-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | redirect loop with rmagic and owa | zotlabs | 2017-10-04 | 2 | -2/+3 |
| | | | |||||
* | | | hubzilla issue #868 | zotlabs | 2017-10-03 | 1 | -0/+4 |
| | | | |||||
* | | | wrong param | zotlabs | 2017-10-03 | 1 | -4/+4 |
| | | | |||||
* | | | urlencode hashes from mod_acl | zotlabs | 2017-10-03 | 1 | -2/+2 |
| |/ |/| | |||||
* | | import: special handling required for channel photo in the xchan record when ↵ | zotlabs | 2017-10-02 | 1 | -14/+25 |
| | | | | | | | | not seizing 'primary' | ||||
* | | Clone sync deletions to comments (which belong to you) on wall posts (which ↵ | zotlabs | 2017-10-02 | 1 | -9/+16 |
|/ | | | | do not). | ||||
* | profile photo propagation issue if the local xchan_photo_[l|m|s] fields were ↵ | zotlabs | 2017-10-01 | 1 | -2/+10 |
| | | | | changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-01 | 1 | -0/+2 |
|\ | |||||
| * | card_edit: fix lockstate and current permissions not handed over to editor | Mario Vavti | 2017-10-01 | 1 | -0/+2 |
| | | |||||
* | | use imagick converter for large photos | zotlabs | 2017-09-30 | 1 | -0/+3 |
|/ | |||||
* | make justifiedGallery even more happy | Mario Vavti | 2017-09-27 | 1 | -1/+1 |
| | |||||
* | whitespace | zotlabs | 2017-09-25 | 1 | -2/+0 |
| | |||||
* | move the Link header initialisation from Router (where it does not really ↵ | zotlabs | 2017-09-25 | 1 | -10/+5 |
| | | | | belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch() | ||||
* | tagging changes - provides ability to mention a forum by using !forumname as ↵ | zotlabs | 2017-09-24 | 1 | -18/+21 |
| | | | | well as the traditional red style (@forumname+). This should probably not be advertised on a wide scale until after a critical mass of sites have updated to a version containing these changes. This adds yet another option type to the ACL module which probably needs refactoring soon since it is turning into option type spaghetti. | ||||
* | pubsites broken and directory server admin selection includes known dead sites | zotlabs | 2017-09-21 | 2 | -2/+3 |
| | |||||
* | nav_set_selected() and minor whitespace for mod pubstream | Mario Vavti | 2017-09-21 | 1 | -1/+3 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-20 | 1 | -1/+2 |
|\ | |||||
| * | wiki: translateable strings and move page mimetype selector to options submenu | Mario Vavti | 2017-09-20 | 1 | -1/+2 |
| | | |||||
* | | we need this in the plugin, not in core | zotlabs | 2017-09-20 | 1 | -0/+1 |
|/ | |||||
* | turn common friends into a widget | zotlabs | 2017-09-19 | 1 | -1/+1 |
| | |||||
* | call the follow_accept hook when desired | zotlabs | 2017-09-19 | 1 | -0/+4 |
| | |||||
* | anonymous comments are not implemented for photos. | Mario Vavti | 2017-09-18 | 1 | -3/+3 |
| | |||||
* | acl issue with some ActivityPub completions | zotlabs | 2017-09-17 | 1 | -3/+8 |
| | |||||
* | wiki download: only include the latest page revision | zotlabs | 2017-09-16 | 1 | -1/+7 |
| | |||||
* | implement wiki editing | Mario | 2017-09-15 | 1 | -15/+20 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-09-15 | 1 | -4/+39 |
|\ | |||||
| * | wiki: lock mimetype | zotlabs | 2017-09-14 | 1 | -0/+7 |
| | | |||||
| * | bring back wiki download | zotlabs | 2017-09-14 | 1 | -4/+32 |
| | | |||||
* | | some work on wiki acl | git-marijus | 2017-09-15 | 1 | -0/+42 |
|/ | |||||
* | add text/plain type to wiki | zotlabs | 2017-09-13 | 1 | -6/+13 |
| | |||||
* | more zot6 | zotlabs | 2017-09-13 | 1 | -1/+8 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-13 | 1 | -7/+10 |
|\ | |||||
| * | wiki mimetype selection. We can add text/plain as soon as we add code to ↵ | zotlabs | 2017-09-12 | 1 | -3/+4 |
| | | | | | | | | purify and render it specifically. | ||||
| * | wiki mimetype selection | zotlabs | 2017-09-12 | 1 | -4/+6 |
| | | |||||
* | | hubzilla issue #855: fix for some problems with displaying selected theme ↵ | Sergey Lukin | 2017-09-12 | 1 | -34/+38 |
|/ | | | | after panel Settings->Display loading | ||||
* | remove item_thread_top from simple_update query - we're already fetching ↵ | zotlabs | 2017-09-10 | 2 | -2/+3 |
| | | | | distinct(parent) and this prevented comments from displaying after submission when remote-authed. | ||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-10 | 2 | -24/+7 |
|\ | |||||
| * | owa cleanup | zotlabs | 2017-09-09 | 2 | -24/+7 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-09 | 1 | -9/+9 |
|\| | |||||
| * | owa: missed the set-observer stuff | zotlabs | 2017-09-08 | 1 | -9/+9 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-08 | 4 | -7/+131 |
|\| | |||||
| * | provide root discovery for owa | zotlabs | 2017-09-07 | 1 | -4/+31 |
| | | |||||
| * | provide owa discovery | zotlabs | 2017-09-07 | 1 | -0/+7 |
| | | |||||
| * | initial testing success with owa | zotlabs | 2017-09-07 | 1 | -1/+1 |
| | |