Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve merge conflict | Mario Vavti | 2017-02-02 | 16 | -166/+161 |
|\ | |||||
| * | move dreamhost hack to plugin | zotlabs | 2017-02-01 | 1 | -15/+10 |
| | | |||||
| * | drug dealers have users | zotlabs | 2017-02-01 | 1 | -5/+5 |
| | | |||||
| * | tested extensible permissions by adding wiki permissions. Discovered a ↵ | zotlabs | 2017-02-01 | 5 | -25/+59 |
| | | | | | | | | couple of issues that needed attention in the process. | ||||
| * | Merge pull request #664 from anaqreon/doco | zotlabs | 2017-02-02 | 5 | -104/+69 |
| |\ | | | | | | | Doco updates | ||||
| | * | 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 ↵ | Andrew Manning | 2017-02-01 | 2 | -4/+68 |
| | | | | | | | | | | | | loading page with section link. Change URL when scrolling to stay current with viewed section to facilitate easy help page link sharing. | ||||
| | * | 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 |
| | |\ | | |/ | |/| | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-31 | 24 | -101/+166 |
| | |\ | |||||
| | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-30 | 3 | -4/+55 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-29 | 14 | -234/+324 |
| | |\ \ \ | |||||
| | * | | | | Link to Guest Access Tokens doco in context help. | Andrew Manning | 2017-01-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'dev' into wip-app-bin | Mario Vavti | 2017-02-01 | 1 | -0/+4 |
|\| | | | | | |||||
| * | | | | | bookmarks missing from tags and mentions doc | zotlabs | 2017-02-01 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | fix notifications badge positioning and rendering of submenus in collapsed mode | Mario Vavti | 2017-02-01 | 3 | -35/+36 |
| | | | | | | |||||
* | | | | | | nav dropdown-menu overrides | Mario Vavti | 2017-02-01 | 1 | -7/+0 |
| | | | | | | |||||
* | | | | | | remove experimental_app_bin config conditional | Mario Vavti | 2017-02-01 | 2 | -151/+19 |
| | | | | | | |||||
* | | | | | | more work on app-bin | Mario Vavti | 2017-02-01 | 4 | -26/+88 |
|/ / / / / | |||||
* | | | | | 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 ↵ | zotlabs | 2017-01-31 | 9 | -171/+280 |
| |_|_|/ |/| | | | | | | | | | | | export; this allows one to export single data sets instead of always exporting everything we know about | ||||
* | | | | 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 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #662 from anaqreon/affinity-settings | zotlabs | 2017-01-30 | 2 | -3/+39 |
| |\ \ \ | | | | | | | | | | | Affinity settings | ||||
| | * | | | 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 |
| | | |/ | | |/| | |||||
* | / | | consolidate hubloc storage | zotlabs | 2017-01-30 | 18 | -95/+130 |
|/ / / | |||||
* | / | queue optimisations for sites that have lingered in the queue for more than ↵ | zotlabs | 2017-01-29 | 1 | -1/+16 |
| |/ |/| | | | | | a couple of days. | ||||
* | | 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 ↵ | zotlabs | 2017-01-29 | 6 | -26/+70 |
| | | | | | | | | | | | | | | | | next delivery. This keeps the query for queued items simple. We no longer group by posturl; as the queue update function will only keep one item per destination scheduled for shorter term processing. Others (multiple queued items for a single destination) will be scheduled for delivery far into the future and only delivered if the hub responds to the "active" or short term queue item. | ||||
* | | provide lowlevel xchan storage function to ensure that all non-null rows are ↵ | zotlabs | 2017-01-28 | 8 | -180/+236 |
|/ | | | | initialised | ||||
* | 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 |
|\| | | | | | Addon repo management GUI | ||||
| * | Fixed numerous bugs with the addon repo management GUI. Only show Manage ↵ | Andrew Manning | 2017-01-26 | 3 | -10/+38 |
|/ | | | | Repos button if webserver has write permission on extend/addon/. | ||||
* | 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 |
| |