Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-26 | 2 | -3/+15 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-25 | 1 | -3/+16 |
| |\ | |||||
| * | | do not overwrite abook flags if we are not owner | Mario Vavti | 2018-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | mark connections where we do not have post_comments permissions with an no ↵ | Mario Vavti | 2018-02-24 | 2 | -2/+14 |
| | | | | | | | | | | | | entry sign. | ||||
* | | | require directory servers to be using some modern form of encryption; which ↵ | zotlabs | 2018-02-26 | 1 | -1/+2 |
| |/ |/| | | | | | means we only currently have 2. | ||||
* | | make the profile photo image picker work correctly with multiple profiles. | zotlabs | 2018-02-24 | 1 | -3/+16 |
|/ | |||||
* | open_pubstream logic was messy and wrong | zotlabs | 2018-02-23 | 1 | -1/+7 |
| | |||||
* | style the 'use existing' button a wee bit | zotlabs | 2018-02-23 | 2 | -2/+2 |
| | |||||
* | use embed photos javascript widget to select existing photos for profile and ↵ | zotlabs | 2018-02-23 | 4 | -7/+15 |
| | | | | cover photos | ||||
* | Usability and member experience: remove street address info from the default ↵ | zotlabs | 2018-02-23 | 3 | -2/+3 |
| | | | | basic profile fields, mention that the site banner can be full HTML, mention on the techlevel setting that this also controls what additional features may be visible. | ||||
* | handle error logging in on cloud page (post method not implemented), ↵ | zotlabs | 2018-02-22 | 1 | -0/+3 |
| | | | | politely ask viewer to refresh the page rather than alert 'unknown error'. | ||||
* | also sort by id to not make mysql change the queryplan if offset is > 0 ↵ | Mario Vavti | 2018-02-22 | 1 | -1/+1 |
| | | | | after recent index changes | ||||
* | move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org | zotlabs | 2018-02-21 | 2 | -2/+2 |
| | |||||
* | Add 'Validate' button to new_channel page and disable submit until ↵ | zotlabs | 2018-02-20 | 1 | -0/+1 |
| | | | | validated. This is to get around the issue that clicking submit without ever focusing and blurring the nickname field won't actually submit the form but only provide validation. It needs to be clicked again to submit. The first click processed the blur but remained on the page with no feedback. If somebody has better workarounds, please provide. The goal is to ensure that the name and the nickname are both validated before we can submit. | ||||
* | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 2 | -27/+27 |
|\ | | | | | Refactor OAuth2Server a bit. | ||||
| * | Refactor OAuth2Server a bit. | Klaus Weidenbach | 2018-02-17 | 2 | -27/+27 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-16 | 2 | -7/+7 |
|\| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 2 | -54/+47 |
| |\ | |||||
| * | | some more DB tuning. | Mario Vavti | 2018-02-15 | 2 | -7/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 2 | -5/+6 |
| |\ \ | |||||
* | | | | refactor of the DB update system. Updates are now stored individually in ↵ | zotlabs | 2018-02-16 | 1 | -25/+29 |
| |_|/ |/| | | | | | | | | Zotlabs/Update/_nnnn.php and are objects; so only the pending updates need to be loaded and executed rather than all historical updates. There is one single number (DB_UPDATE_VERSION) representing the current version and it is EQUAL TO the last known update. A dummy update _1201 was created to address the difference in counting behaviour; it will be executed on the next change of DB_UPDATE_VERSION as well as the next update. The database config values are also loaded from disk on every update immediately before setting the update lock in order to reduce timing conflicts and race conditions. | ||||
* | | | extend the oauth2 storage driver so that we can use our own channel table | zotlabs | 2018-02-15 | 2 | -54/+47 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-14 | 1 | -1/+12 |
|\| | | |/ |/| | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-14 | 3 | -2/+21 |
| |\ | |||||
| * | | since we only save the parent mid in notify we must look for thr_parent when ↵ | Mario Vavti | 2018-02-13 | 1 | -1/+12 |
| | | | | | | | | | | | | dealing with likes | ||||
* | | | provide option to block the public stream unless authenticated, since there ↵ | zotlabs | 2018-02-14 | 2 | -5/+6 |
| |/ |/| | | | | | could be legal issues with unmoderated content | ||||
* | | Merge branch 'share' | zotlabs | 2018-02-13 | 2 | -1/+20 |
|\ \ | |||||
| * | | turn shares into activities - make certain to pull addons or JSON-LD will ↵ | zotlabs | 2018-02-13 | 2 | -4/+8 |
| | | | | | | | | | | | | chuck a wobbly | ||||
| * | | initial share refactor | zotlabs | 2018-02-12 | 1 | -1/+16 |
| |/ | |||||
* / | defperms: bad query | zotlabs | 2018-02-13 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 2 | -20/+20 |
|\ | |||||
| * | finally fix channel query | Mario Vavti | 2018-02-09 | 1 | -4/+4 |
| | | |||||
| * | use distinct in channel item query and minor notification cache improvement | Mario Vavti | 2018-02-09 | 1 | -5/+5 |
| | | |||||
| * | more db and queries finetuning | Mario Vavti | 2018-02-08 | 1 | -13/+13 |
| | | |||||
* | | second part of hubzilla issue #972 | zotlabs | 2018-02-11 | 1 | -5/+4 |
| | | |||||
* | | use new forum tag style in forum search postings | zotlabs | 2018-02-11 | 1 | -1/+1 |
| | | |||||
* | | hubzilla issue #975 (searching for title as well as body could present a ↵ | zotlabs | 2018-02-09 | 1 | -1/+1 |
|/ | | | | performance issue, so perhaps the tradeoffs should be debated) | ||||
* | remove mobile_detect (outdated and unmaintainable) | zotlabs | 2018-02-05 | 3 | -24/+5 |
| | |||||
* | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 1 | -6/+6 |
| | |||||
* | this will fix the cards query and keep the rest intact | Mario Vavti | 2018-02-04 | 1 | -1/+1 |
| | |||||
* | remove some never used indices which prevented our item queries to find the ↵ | Mario Vavti | 2018-02-04 | 5 | -32/+37 |
| | | | | right query execution plan in mysql and adjust some queries to optimze the result | ||||
* | some feed cleanup | zotlabs | 2018-02-01 | 1 | -8/+9 |
| | |||||
* | more separation of complex code into separate functions | zotlabs | 2018-02-01 | 1 | -20/+3 |
| | |||||
* | remove logging | zotlabs | 2018-01-29 | 1 | -2/+0 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-29 | 1 | -38/+41 |
|\ | |||||
| * | Fix a PHP7.2 warning when a channel has no cards. | Klaus Weidenbach | 2018-01-28 | 1 | -38/+41 |
| | | |||||
* | | unable to delete accounts using tickboxes on admin/accounts - make all the ↵ | zotlabs | 2018-01-29 | 1 | -3/+6 |
| | | | | | | | | action names consistent | ||||
* | | redirect to the email_validation page if login was attempted after account ↵ | zotlabs | 2018-01-29 | 1 | -0/+1 |
| | | | | | | | | creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it. | ||||
* | | fix workflow for form based email validation when auto_channel_create is in ↵ | zotlabs | 2018-01-29 | 1 | -0/+9 |
| | | | | | | | | effect. Eventually we will need to rework the workflow logic because it is getting a bit tangled. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-28 | 3 | -6/+14 |
|\| |