| Commit message (Expand) | Author | Age | Files | Lines |
* | tested extensible permissions by adding wiki permissions. Discovered a couple... | zotlabs | 2017-02-01 | 5 | -25/+59 |
* | Merge pull request #664 from anaqreon/doco | zotlabs | 2017-02-02 | 5 | -104/+69 |
|\ |
|
| * | Remove old tags and mentions doco pages | Andrew Manning | 2017-02-01 | 2 | -99/+0 |
| * | Remove dead links | Andrew Manning | 2017-02-01 | 1 | -2/+2 |
| * | Integrate tags and mentions page doco into member guide. Fix bug when loading... | Andrew Manning | 2017-02-01 | 2 | -4/+68 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-02-01 | 6 | -17/+18 |
| |\
| |/
|/| |
|
* | | fix a few style issues with nav login panel | zotlabs | 2017-02-01 | 6 | -17/+18 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-02-01 | 12 | -708/+682 |
| |\
| |/
|/| |
|
* | | bookmarks missing from tags and mentions doc | zotlabs | 2017-02-01 | 1 | -0/+4 |
* | | superfluous whitespace cleanup | zotlabs | 2017-01-31 | 3 | -352/+359 |
* | | move diaspora account import to the diaspora plugin | zotlabs | 2017-01-31 | 2 | -186/+40 |
* | | channel export - use a selected list of functional data categories to export;... | zotlabs | 2017-01-31 | 9 | -171/+280 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-31 | 24 | -101/+166 |
| |\
| |/
|/| |
|
* | | hide featured app category in the app category widget | Mario Vavti | 2017-01-31 | 3 | -3/+4 |
* | | fix typos | Mario Vavti | 2017-01-31 | 3 | -3/+3 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-30 | 6 | -8/+73 |
|\ \ |
|
| * | | provide a feature/unfeature app button | Mario Vavti | 2017-01-30 | 4 | -5/+34 |
* | | | consolidate hubloc storage | zotlabs | 2017-01-30 | 18 | -95/+130 |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-30 | 3 | -4/+55 |
| | |\
| | |/
| |/| |
|
| * | | Merge pull request #662 from anaqreon/affinity-settings | zotlabs | 2017-01-30 | 2 | -3/+39 |
|/| | |
|
| * | | Remove unrelated chatroom panel stuff that was included accidentally | Andrew Manning | 2017-01-29 | 1 | -69/+0 |
| * | | Merge remote-tracking branch 'upstream/dev' into affinity-settings | Andrew Manning | 2017-01-29 | 14 | -234/+324 |
| |\ \ |
|
| * | | | Add affinity slider tool settings for min and max defaults in settings/featured | Andrew Manning | 2017-01-29 | 2 | -3/+108 |
* | | | | queue optimisations for sites that have lingered in the queue for more than a... | zotlabs | 2017-01-29 | 1 | -1/+16 |
| |/ /
|/| | |
|
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-29 | 14 | -234/+324 |
| | |\
| |_|/
|/| | |
|
* | | | no quotes on dbutcnow() output | zotlabs | 2017-01-29 | 1 | -1/+1 |
* | | | finish remaining places where xchan_store_lowlevel needs to be used | zotlabs | 2017-01-29 | 2 | -31/+21 |
* | | | Alter the queue so that each queue item stores the scheduled time of the next... | zotlabs | 2017-01-29 | 6 | -26/+70 |
* | | | provide lowlevel xchan storage function to ensure that all non-null rows are ... | zotlabs | 2017-01-28 | 8 | -180/+236 |
|/ / |
|
| * | Link to Guest Access Tokens doco in context help. | Andrew Manning | 2017-01-29 | 1 | -1/+1 |
|/ |
|
* | string update | zotlabs | 2017-01-27 | 1 | -1278/+1352 |
* | more work on app-bin | Mario Vavti | 2017-01-27 | 4 | -9/+14 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-01-27 | 2 | -4/+7 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into addon-repo-gui | Andrew Manning | 2017-01-27 | 0 | -0/+0 |
| |\ |
|
| * | | Improve context help with screenshot and replace "addon" with "plugin". | Andrew Manning | 2017-01-27 | 2 | -4/+7 |
* | | | add icons and links to appman and apps edit to app-bin | Mario Vavti | 2017-01-27 | 1 | -1/+4 |
| |/
|/| |
|
* | | Merge pull request #655 from anaqreon/addon-repo-gui | zotlabs | 2017-01-27 | 3 | -10/+38 |
|\| |
|
| * | Fixed numerous bugs with the addon repo management GUI. Only show Manage Repo... | Andrew Manning | 2017-01-26 | 3 | -10/+38 |
|/ |
|
* | better handling of html special chars in wiki and wikipage names | zotlabs | 2017-01-26 | 4 | -36/+33 |
* | missing single quote in query | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
* | minor cleanup | Mario Vavti | 2017-01-26 | 1 | -4/+1 |
* | query for item_hidden is not needed anymore | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
* | fix wiki list template | Mario Vavti | 2017-01-26 | 2 | -6/+6 |
* | haystack/needle mixup | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
* | fix renaming of wiki pages | Mario Vavti | 2017-01-26 | 2 | -12/+16 |
* | missing quote in nav template | zotlabs | 2017-01-25 | 1 | -1/+1 |
* | resolve the linked item delete issue by declaring what types of linked items ... | zotlabs | 2017-01-25 | 2 | -3/+8 |
* | only allow wiki owner to delete pages | zotlabs | 2017-01-25 | 4 | -3/+12 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-25 | 3 | -26/+15 |
|\ |
|
| * | Merge pull request #653 from git-marijus/dev | zotlabs | 2017-01-26 | 3 | -26/+15 |
| |\ |
|