Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-03 | 4 | -54/+53 |
|\ | |||||
| * | import: special handling required for channel photo in the xchan record when ↵ | zotlabs | 2017-10-02 | 1 | -14/+25 |
| | | | | | | | | not seizing 'primary' | ||||
| * | remove server role selection details from install documentation, no longer ↵ | zotlabs | 2017-10-02 | 1 | -30/+10 |
| | | | | | | | | needed | ||||
| * | Hubzilla issue #866 allow navbar to be used when cover photo is displayed - ↵ | zotlabs | 2017-10-02 | 1 | -1/+2 |
| | | | | | | | | also scroll cover photo on keyup event. | ||||
| * | Clone sync deletions to comments (which belong to you) on wall posts (which ↵ | zotlabs | 2017-10-02 | 1 | -9/+16 |
| | | | | | | | | do not). | ||||
* | | fix community tags not preserved on post edit. issue #865 | Mario Vavti | 2017-10-02 | 1 | -1/+1 |
| | | |||||
* | | whitespace | Mario Vavti | 2017-10-02 | 1 | -3/+3 |
| | | |||||
* | | wiki: show save button and commit input field in all tabs if there is ↵ | Mario Vavti | 2017-10-02 | 1 | -25/+37 |
|/ | | | | unsaved content. fix #853 | ||||
* | 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 | 5 | -24/+24 |
|\ | |||||
| * | Merge pull request #863 from mjfriaza/dev | git-marijus | 2017-10-01 | 2 | -11/+11 |
| |\ | | | | | | | Fixed some errors in the Spanish translation | ||||
| | * | Fixed the Spanish translation | Manuel Jiménez Friaza | 2017-10-01 | 2 | -11/+11 |
| | | | |||||
| * | | card_edit: fix lockstate and current permissions not handed over to editor | Mario Vavti | 2017-10-01 | 1 | -0/+2 |
| | | | |||||
| * | | fix profile edit dropdown for multiple profiles | Mario Vavti | 2017-10-01 | 1 | -11/+9 |
| | | | |||||
| * | | Update administrator_guide.md | Andrew Manning | 2017-09-30 | 1 | -2/+2 |
| | | | |||||
* | | | use imagick converter for large photos | zotlabs | 2017-09-30 | 3 | -2/+81 |
|/ / | |||||
* | | remove double remote login button and slightly change appearence | Mario Vavti | 2017-09-28 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #860 from waitman/patch-2 | git-marijus | 2017-09-28 | 1 | -0/+1 |
|\ \ | | | | | | | add remote login to login form | ||||
| * | | add remote login to login form | Waitman Gobble | 2017-09-18 | 1 | -0/+1 |
| | | | | | | | | | This exists in nav login but not login.tpl | ||||
* | | | Merge pull request #861 from waitman/patch-3 | git-marijus | 2017-09-28 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | add remote login to login.tpl | ||||
| * | | | add remote login to login.tpl | Waitman Gobble | 2017-09-18 | 1 | -0/+1 |
| |/ / | | | | | | | Add Remote login option to login.tpl, this exists in nav login. | ||||
* | | | Merge pull request #862 from waitman/patch-4 | git-marijus | 2017-09-28 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | prevent 'my_address' being set with bogus info | ||||
| * | | | prevent 'my_address' being set with bogus info | Waitman Gobble | 2017-09-18 | 1 | -1/+5 |
| |/ / | | | | | | | After a user has authenticated, it is possible to set my_address in $_SESSION to 'anything' using zid= parameter in URL - if user is authenticated then zid is never set. This change kills the authenticated switch if a person sends a new zid through for processing, which will trigger remote authentication. | ||||
* | | | process activity deletes from OStatus which for whatever reason do not use ↵ | zotlabs | 2017-09-27 | 2 | -37/+59 |
| | | | | | | | | | | | | the industry standard tombstone mechanism | ||||
* | | | re-arrange some html | Mario Vavti | 2017-09-27 | 2 | -7/+7 |
| | | | |||||
* | | | make justifiedGallery even more happy | Mario Vavti | 2017-09-27 | 2 | -2/+2 |
| | | | |||||
* | | | make justifiedGallery happy again | Mario Vavti | 2017-09-27 | 3 | -2/+7 |
| | | | |||||
* | | | do not use our spinner css on the justifiedGallery spinner which has the ↵ | Mario Vavti | 2017-09-27 | 1 | -1/+3 |
| | | | | | | | | | | | | same classname hardcoded | ||||
* | | | fix some missing spinners | Mario Vavti | 2017-09-27 | 9 | -9/+20 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-26 | 6 | -44/+51 |
|\ \ \ | |||||
| * | | | whitespace | zotlabs | 2017-09-25 | 1 | -2/+0 |
| | | | | |||||
| * | | | move the Link header initialisation from Router (where it does not really ↵ | zotlabs | 2017-09-25 | 4 | -28/+36 |
| | | | | | | | | | | | | | | | | belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch() | ||||
| * | | | typo | zotlabs | 2017-09-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | more zot6 basic stuff | zotlabs | 2017-09-25 | 3 | -11/+12 |
| | | | | |||||
| * | | | zot_site_info - always sign the site block with the site private key | zotlabs | 2017-09-25 | 1 | -4/+4 |
| | | | | |||||
* | | | | bump version | Mario Vavti | 2017-09-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | get rid of spinner.js in use a lightweight css spinner instead | Mario Vavti | 2017-09-26 | 22 | -558/+175 |
|/ / / | |||||
* | | | extend activity_match to work with arrays | zotlabs | 2017-09-24 | 1 | -2/+10 |
| | | | |||||
* | | | doc page for the new channel_links hook | zotlabs | 2017-09-24 | 1 | -0/+12 |
| | | | |||||
* | | | update the trusted CA cert database | zotlabs | 2017-09-24 | 2 | -560/+740 |
| | | | |||||
* | | | missing Zlib file | zotlabs | 2017-09-24 | 1 | -0/+25 |
| | | | |||||
* | | | server/hub config storage for zot6 | zotlabs | 2017-09-24 | 1 | -0/+16 |
| | | | |||||
* | | | ostatus - support likes of comments | zotlabs | 2017-09-24 | 1 | -11/+19 |
| | | | |||||
* | | | handle jsonld parse errors and send them to the app log instead of the php log. | zotlabs | 2017-09-24 | 1 | -1/+9 |
| | | | |||||
* | | | Merge branch 'tagging' | zotlabs | 2017-09-24 | 7 | -48/+119 |
|\ \ \ | |||||
| * | | | tagging changes - provides ability to mention a forum by using !forumname as ↵ | zotlabs | 2017-09-24 | 7 | -46/+110 |
| | | | | | | | | | | | | | | | | 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. | ||||
| * | | | typo | zotlabs | 2017-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into tagging | zotlabs | 2017-09-24 | 39 | -128/+364 |
| |\ \ \ | |||||
| * | | | | acl issue with some ActivityPub completions | zotlabs | 2017-09-17 | 1 | -3/+8 |
| | | | | | |||||
| * | | | | more tag stuff | zotlabs | 2017-09-17 | 1 | -1/+1 |
| | | | | |