Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-07 | 1 | -1/+1 | |
|\| | | ||||||
| * | | channel import failing to provide channel_password value | zotlabs | 2018-04-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | rename button label in editpost from edit to submit | Mario Vavti | 2018-04-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | rename relation to relationship - issue #1044 | Mario Vavti | 2018-04-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | use Title instead of Caption - issue #1037 | Mario Vavti | 2018-04-07 | 1 | -3/+3 | |
| | | | ||||||
* | | | Use Add Files/Photos instead of Upload to open the upload dialog | Mario Vavti | 2018-04-07 | 5 | -6/+6 | |
|/ / | ||||||
* | | put directory server in siteinfo - there are a lot of sites using broken ↵ | zotlabs | 2018-04-06 | 1 | -0/+1 | |
| | | | | | | | | directories | |||||
* | | bring back the dnt policy document, not sure when it was lost | zotlabs | 2018-04-05 | 2 | -1/+222 | |
| | | ||||||
* | | oauth2 client settings page | zotlabs | 2018-04-05 | 7 | -9/+242 | |
| | | ||||||
* | | use profile_store_lowlevel() when importing profile structures to ensure all ↵ | zotlabs | 2018-04-05 | 2 | -5/+8 | |
| | | | | | | | | non-null fields are present | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-05 | 7 | -1/+387 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-05 | 9 | -57/+51 | |
| |\ \ | ||||||
| * \ \ | Merge pull request #1039 from phellmes/doco-feat-add | git-marijus | 2018-04-05 | 7 | -1/+387 | |
| |\ \ \ | | |_|/ | |/| | | add basic structure for additional features documentation | |||||
| | * | | add basic structure for additional features documentation | phellmes | 2018-04-04 | 7 | -1/+387 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the raw frame with overview, short descriptions like in code and already revealing skill levels. Based on the current (recently modified) structure of the feature settings. Detailed descriptions in work and coming with later commits as well as a dedicated admin section for that topic. Better menu integration may be possible with Andrew's new doco structure work in progress later. | |||||
* | | | | fix permalinks to children of articles and cards | zotlabs | 2018-04-05 | 4 | -3/+6 | |
| |_|/ |/| | | ||||||
* | | | bbcode() - ensure that $options is always an array, as the interface has ↵ | zotlabs | 2018-04-04 | 1 | -0/+4 | |
| | | | | | | | | | | | | changed slightly | |||||
* | | | oauth2 dynamic client registration update | zotlabs | 2018-04-04 | 1 | -19/+11 | |
| | | | ||||||
* | | | private forum mentions | zotlabs | 2018-04-04 | 3 | -4/+8 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-04 | 1 | -1/+4 | |
|\| | | ||||||
| * | | do not use punify() in get_baseurl() due to performance issues | Mario Vavti | 2018-04-04 | 1 | -1/+4 | |
| |/ | ||||||
* | | allow the profile recrods to be cloned separately | zotlabs | 2018-04-04 | 2 | -2/+3 | |
| | | ||||||
* | | allow the link target attribute to be modified in bbcode() from much further ↵ | zotlabs | 2018-04-04 | 4 | -32/+25 | |
|/ | | | | up the call stack in prepare_page() which will usually refer to a local item. | |||||
* | disable the oauth2testvehicle completely until it is safe | zotlabs | 2018-04-03 | 1 | -1/+3 | |
| | ||||||
* | get rid of dangerous test code | zotlabs | 2018-04-03 | 1 | -68/+0 | |
| | ||||||
* | OAuth2 integration | zotlabs | 2018-04-03 | 6 | -11/+195 | |
| | ||||||
* | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 9 | -84/+87 | |
|\ | ||||||
| * | community tags: allow signature of either author or owner so that it stands ↵ | zotlabs | 2018-04-03 | 1 | -1/+1 | |
| | | | | | | | | a chance of working across multiple delivery chains | |||||
| * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 2 | -2/+6 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-02 | 2 | -6/+6 | |
| |\ | ||||||
| | * | fix missing login/out buttons for medium screensize | Mario Vavti | 2018-04-01 | 2 | -6/+6 | |
| | | | ||||||
| * | | community tagging refactor - we no longer send an edited post/comment to ↵ | zotlabs | 2018-04-02 | 1 | -11/+9 | |
| | | | | | | | | | | | | everybody. The post owner approves the tag and this is transmitted along with the tag activity. Recipients check the signature of the approval and add the tag to their local copy of the post. | |||||
| * | | commtag refactor | zotlabs | 2018-04-02 | 1 | -35/+58 | |
| | | | ||||||
| * | | missing year on profile birthday input, some optimisations to stats | zotlabs | 2018-04-02 | 3 | -39/+17 | |
| | | | ||||||
| * | | obscurify chats | zotlabs | 2018-04-01 | 2 | -3/+3 | |
| |/ | ||||||
* | | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | zotlabs | 2018-03-31 | 8 | -51/+372 | |
|\ \ | |/ |/| | ||||||
| * | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 24 | -50/+99 | |
| |\ | ||||||
| * \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-27 | 864 | -27843/+50994 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-12 | 5 | -24/+31 | |
| |\ \ \ | ||||||
| * | | | | Fixed access_token request bug and returned oauth2-server-php library to ↵ | Andrew Manning | 2018-03-10 | 2 | -8/+9 | |
| | | | | | | | | | | | | | | | | | | | | unmodified state. | |||||
| * | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-10 | 24 | -211/+493 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 12 | -1486/+1863 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 93 | -1686/+3030 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 13 | -202/+305 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-26 | 813 | -140847/+4362 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵ | Andrew Manning | 2018-02-26 | 5 | -82/+137 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticated API call using an access_token. | |||||
| * | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 14 | -16/+79 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | An authorization token is received, but I had to modify the Request class in ↵ | Andrew Manning | 2018-02-25 | 4 | -16/+64 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST. | |||||
| * | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-24 | 22 | -21/+306 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about ↵ | Andrew Manning | 2018-02-24 | 4 | -15/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic client registration protocol. | |||||
| * | | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 19 | -159/+162 | |
| |\ \ \ \ \ \ \ \ \ \ \ |