Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-15 | 12 | -541/+35 |
|\ | |||||
| * | bump minor version because of jquery update | Mario Vavti | 2016-07-15 | 2 | -10/+3 |
| | | |||||
| * | round up height | Mario Vavti | 2016-07-15 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-15 | 5 | -1818/+1888 |
| |\ | |||||
| * | | add jquery migrate for version 3 | Mario Vavti | 2016-07-15 | 1 | -0/+2 |
| | | | |||||
| * | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 10 | -531/+30 |
| | | | |||||
* | | | login isn't always your email. | redmatrix | 2016-07-15 | 1 | -1/+1 |
| | | | |||||
* | | | mod_home: if using an atoken login on the home page redirect to the channel ↵ | redmatrix | 2016-07-15 | 1 | -0/+13 |
| |/ |/| | | | | | page of the channel that owns the atoken. | ||||
* | | make lockview work with throwaway identities | redmatrix | 2016-07-15 | 1 | -2/+33 |
| | | |||||
* | | more cleanup of atoken UI | redmatrix | 2016-07-15 | 3 | -2/+9 |
| | | |||||
* | | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 3 | -4/+12 |
| | | |||||
* | | enforce non-empty name and token/password on access tokens until better ↵ | redmatrix | 2016-07-15 | 2 | -1812/+1836 |
|/ | | | | checks are instituted. | ||||
* | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 3 | -1/+114 |
| | |||||
* | make the xchan_hash for the access token location independent | redmatrix | 2016-07-14 | 2 | -16/+21 |
| | |||||
* | missing brace | redmatrix | 2016-07-14 | 1 | -1/+1 |
| | |||||
* | schema updates for zot access tokens | redmatrix | 2016-07-14 | 4 | -2/+77 |
| | |||||
* | add zat to acl | redmatrix | 2016-07-14 | 1 | -1/+26 |
| | |||||
* | more ZAT work | redmatrix | 2016-07-14 | 4 | -3/+37 |
| | |||||
* | first cut at zot access tokens | redmatrix | 2016-07-14 | 2 | -24/+85 |
| | |||||
* | markdown is whitespace sensitive | redmatrix | 2016-07-14 | 1 | -1/+1 |
| | |||||
* | who are we | redmatrix | 2016-07-14 | 1 | -0/+12 |
| | |||||
* | let abconfig specify a family | redmatrix | 2016-07-13 | 2 | -4/+6 |
| | |||||
* | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 4 | -28/+62 |
| | | | | consolidate the various options | ||||
* | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 |
| | |||||
* | update_remote_id - updated to work with iconfig | redmatrix | 2016-07-12 | 1 | -18/+5 |
| | |||||
* | don't try to send sync packets to dead sites. | redmatrix | 2016-07-12 | 1 | -1/+6 |
| | |||||
* | the abconfig defaults weren't changed in the schema files when they were ↵ | redmatrix | 2016-07-12 | 2 | -2/+2 |
| | | | | changed in the code | ||||
* | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 11 | -26/+12 |
| | |||||
* | use the get_hostname function rather than parse the url | redmatrix | 2016-07-11 | 1 | -1/+1 |
| | |||||
* | document the new change_channel hook | redmatrix | 2016-07-11 | 2 | -0/+14 |
| | |||||
* | create change_channel hook | redmatrix | 2016-07-11 | 1 | -0/+4 |
| | |||||
* | force non-null sess_data | redmatrix | 2016-07-11 | 1 | -1/+2 |
| | |||||
* | use the profile_uid here. | redmatrix | 2016-07-11 | 1 | -7/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-11 | 8 | -18/+16 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-11 | 1 | -5/+0 |
| |\ | |||||
| | * | Merge pull request #451 from git-marijus/dev | hubzilla | 2016-07-11 | 1 | -5/+0 |
| | |\ | | | | | | | | | remove check for mcrypt | ||||
| | | * | remove check for mcrypt | Mario Vavti | 2016-07-10 | 1 | -5/+0 |
| | | | | |||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-10 | 5 | -1284/+1313 |
| | | |\ | | | |/ | | |/| | |||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-07 | 2 | -19/+10 |
| | | |\ | |||||
| * | | | | do not use visibility for fullscreen button and move fullscreen button to ↵ | Mario Vavti | 2016-07-11 | 7 | -13/+16 |
| |/ / / | | | | | | | | | | | | | the right | ||||
* / / / | more sql fine tuning | redmatrix | 2016-07-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | some work on the forum widget queries | redmatrix | 2016-07-09 | 2 | -1273/+1292 |
| | | | |||||
* | | | gak one more typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | | | |||||
* | | | typo | redmatrix | 2016-07-07 | 1 | -1/+1 |
| | | | |||||
* | | | duplicate supression SQL query was horribly inefficient and could cause ↵ | redmatrix | 2016-07-07 | 1 | -11/+13 |
| | | | | | | | | | | | | issues in resource deprived environments. | ||||
* | | | Merge pull request #450 from git-marijus/dev | hubzilla | 2016-07-08 | 3 | -14/+2 |
|\| | | | | | | | | fix /cloud after recent changes | ||||
| * | | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 3 | -13/+2 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 10 | -345/+386 |
| |\ \ | |||||
| * | | | fix /cloud after recent changes | Mario Vavti | 2016-07-06 | 1 | -2/+1 |
| | | | | |||||
* | | | | hide the redeliver option one level down since it should rarely be needed by ↵ | redmatrix | 2016-07-07 | 2 | -1/+9 |
| |_|/ |/| | | | | | | | | folks outside of shared hosting. |