Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-25 | 1 | -2/+2 |
|\ | |||||
| * | make tag autocomplete less scary looking in the editor. If this works out we ↵ | zotlabs | 2018-04-24 | 1 | -2/+2 |
| | | | | | | | | can simplify and get rid of a huge amount of spaghetti tag logic. | ||||
* | | fix php warnings | Mario Vavti | 2018-04-24 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-23 | 1 | -1/+1 |
|\ | |||||
| * | possible fix for issue #1101 | Mario Vavti | 2018-04-23 | 1 | -1/+1 |
| | | |||||
* | | provide a short term compatibility mapping between social_party and ↵ | zotlabs | 2018-04-23 | 1 | -0/+8 |
|/ | | | | social_federation | ||||
* | owa: attempt channel discovery if not found | zotlabs | 2018-04-22 | 1 | -0/+9 |
| | |||||
* | use consistent naming for 'Channel role and privacy' | zotlabs | 2018-04-22 | 1 | -1/+1 |
| | |||||
* | imagemagick preserves exif when scaling. GD does not. We do not want to ↵ | zotlabs | 2018-04-22 | 1 | -23/+5 |
| | | | | preserve exif on thumbnails which we have rotated, as a browser reading the exif information could rotate them yet again. This checkin adds an abstract function to the generic photo driver which makes the behaviour consistent by stripping EXIF from imagick processed images. However, we will attempt to preserve any ICC colour profiles. See http://php.net/manual/en/imagick.stripimage.php | ||||
* | fix link to renamed permission roles doc subsection | zotlabs | 2018-04-19 | 1 | -1/+1 |
| | |||||
* | rename social - party to social - federation. Cleanup some of the ↵ | zotlabs | 2018-04-19 | 1 | -2/+2 |
| | | | | documentation surrounding channels. This checkin contains translatable string changes. | ||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-19 | 8 | -9/+13 |
|\ | |||||
| * | add alt_pager to mod_moderate, remove legacy $a parameter from all ↵ | zotlabs | 2018-04-17 | 8 | -9/+13 |
| | | | | | | | | occurrences of alt_pager | ||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-18 | 2 | -1/+8 |
|\| | |||||
| * | public stream tag enhancements | zotlabs | 2018-04-17 | 1 | -1/+7 |
| | | |||||
| * | when changing cover photo, show existing | zotlabs | 2018-04-17 | 1 | -0/+1 |
| | | |||||
* | | fix closing parenthesis in wrong spot | Mario Vavti | 2018-04-17 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-16 | 2 | -11/+6 |
|\ | |||||
| * | remove some more distinct in queries and observe any regressions. this is ↵ | Mario Vavti | 2018-04-16 | 2 | -7/+2 |
| | | | | | | | | related to issue #1079 and commit d47ea20aa8bb8219f7a0760e81ba3db542392390 | ||||
| * | fix regression where in the starred tab only top level posts were visible | Mario Vavti | 2018-04-15 | 1 | -4/+4 |
| | | |||||
* | | don't save a permcat with empty name | zotlabs | 2018-04-16 | 1 | -0/+5 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-11 | 2 | -2/+16 |
|\ | |||||
| * | allow to toggle visibility of likes/dislikes in notifications | Mario Vavti | 2018-04-11 | 2 | -2/+16 |
| | | |||||
* | | channel delegation: push current identity and pop it on logout from the ↵ | zotlabs | 2018-04-11 | 2 | -1/+8 |
|/ | | | | delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel. | ||||
* | last commented expiration setting in admin | zotlabs | 2018-04-10 | 1 | -0/+3 |
| | |||||
* | Show "Unseen public activity" channel setting when site only public streams ↵ | Julian Schweinsberg | 2018-04-09 | 1 | -2/+3 |
| | | | | are activated | ||||
* | more intelligent handling of level 0 - and remove an extraneous logging function | zotlabs | 2018-04-08 | 1 | -2/+7 |
| | |||||
* | more work merging techlevels and features | zotlabs | 2018-04-08 | 1 | -25/+32 |
| | |||||
* | first cut of feature/techlevel merge | zotlabs | 2018-04-08 | 1 | -4/+24 |
| | |||||
* | extend AC | zotlabs | 2018-04-08 | 2 | -1/+5 |
| | |||||
* | hubzilla issue #1050 pubstream notifications visible when pubstream is not | zotlabs | 2018-04-08 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-08 | 1 | -1/+1 |
|\ | |||||
| * | we shouldn't need distinct here, since ids_to_querystr() will filter ↵ | zotlabs | 2018-04-07 | 1 | -1/+1 |
| | | | | | | | | duplicates. It might have an effect on pager totals. Need to monitor for a few days. | ||||
* | | 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 | 1 | -2/+2 |
|/ | |||||
* | bring back the dnt policy document, not sure when it was lost | zotlabs | 2018-04-05 | 1 | -1/+4 |
| | |||||
* | oauth2 client settings page | zotlabs | 2018-04-05 | 2 | -5/+166 |
| | |||||
* | fix permalinks to children of articles and cards | zotlabs | 2018-04-05 | 4 | -3/+6 |
| | |||||
* | private forum mentions | zotlabs | 2018-04-04 | 1 | -1/+1 |
| | |||||
* | allow the profile recrods to be cloned separately | zotlabs | 2018-04-04 | 1 | -1/+2 |
| | |||||
* | 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 | 2 | -10/+10 |
| | |||||
* | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 2 | -3/+7 |
|\ | |||||
| * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 1 | -1/+5 |
| | | |||||
| * | obscurify chats | zotlabs | 2018-04-01 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | zotlabs | 2018-03-31 | 3 | -33/+280 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 10 | -19/+34 |
| |\ |