aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | move diaspora account import to the diaspora pluginzotlabs2017-01-312-186/+40
| * | channel export - use a selected list of functional data categories to export;...zotlabs2017-01-319-171/+280
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-3124-101/+166
| | |\ | | |/ | |/|
| * | hide featured app category in the app category widgetMario Vavti2017-01-313-3/+4
| * | fix typosMario Vavti2017-01-313-3/+3
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-306-8/+73
| |\ \
| | * | provide a feature/unfeature app buttonMario Vavti2017-01-304-5/+34
| * | | consolidate hubloc storagezotlabs2017-01-3018-95/+130
| | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-303-4/+55
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #662 from anaqreon/affinity-settingszotlabs2017-01-302-3/+39
| |/| |
| | * | Remove unrelated chatroom panel stuff that was included accidentallyAndrew Manning2017-01-291-69/+0
| | * | Merge remote-tracking branch 'upstream/dev' into affinity-settingsAndrew Manning2017-01-2914-234/+324
| | |\ \
| | * | | Add affinity slider tool settings for min and max defaults in settings/featuredAndrew Manning2017-01-292-3/+108
| * | | | queue optimisations for sites that have lingered in the queue for more than a...zotlabs2017-01-291-1/+16
| | |/ / | |/| |
| | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-2914-234/+324
| | | |\ | | |_|/ | |/| |
| * | | no quotes on dbutcnow() outputzotlabs2017-01-291-1/+1
| * | | finish remaining places where xchan_store_lowlevel needs to be usedzotlabs2017-01-292-31/+21
| * | | Alter the queue so that each queue item stores the scheduled time of the next...zotlabs2017-01-296-26/+70
| * | | provide lowlevel xchan storage function to ensure that all non-null rows are ...zotlabs2017-01-288-180/+236
| |/ /
| | * Link to Guest Access Tokens doco in context help.Andrew Manning2017-01-291-1/+1
| |/
| * string updatezotlabs2017-01-271-1278/+1352
| * more work on app-binMario Vavti2017-01-274-9/+14
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-01-272-4/+7
| |\
| | * Merge remote-tracking branch 'upstream/dev' into addon-repo-guiAndrew Manning2017-01-270-0/+0
| | |\
| | * | Improve context help with screenshot and replace "addon" with "plugin".Andrew Manning2017-01-272-4/+7
| * | | add icons and links to appman and apps edit to app-binMario Vavti2017-01-271-1/+4
| | |/ | |/|
| * | Merge pull request #655 from anaqreon/addon-repo-guizotlabs2017-01-273-10/+38
| |\|
| | * Fixed numerous bugs with the addon repo management GUI. Only show Manage Repo...Andrew Manning2017-01-263-10/+38
| |/
| * better handling of html special chars in wiki and wikipage nameszotlabs2017-01-264-36/+33
| * missing single quote in queryMario Vavti2017-01-261-1/+1
| * minor cleanupMario Vavti2017-01-261-4/+1
| * query for item_hidden is not needed anymoreMario Vavti2017-01-261-1/+1
| * fix wiki list templateMario Vavti2017-01-262-6/+6
| * haystack/needle mixupMario Vavti2017-01-261-1/+1
| * fix renaming of wiki pagesMario Vavti2017-01-262-12/+16
| * missing quote in nav templatezotlabs2017-01-251-1/+1
| * resolve the linked item delete issue by declaring what types of linked items ...zotlabs2017-01-252-3/+8
| * only allow wiki owner to delete pageszotlabs2017-01-254-3/+12
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-253-26/+15
| |\
| | * Merge pull request #653 from git-marijus/devzotlabs2017-01-263-26/+15
| | |\
| | | * fixes for wiki create/delete pageMario Vavti2017-01-253-26/+15
| | |/
| * / initialise item['postopts'] for mysql >= 5.7zotlabs2017-01-251-0/+1
| |/
| * typozotlabs2017-01-241-1/+1
| * always sync parent wiki when syncing pages, just in case the original wiki cr...zotlabs2017-01-242-9/+13
| * minorzotlabs2017-01-241-3/+3
| * block well-known from oembedzotlabs2017-01-241-0/+3
| * initial selections for extensible permission categories ("permcats")zotlabs2017-01-241-0/+42
| * do not show location row on small viewports.Mario Vavti2017-01-241-2/+2
| * nav-login - basic, crude themingzotlabs2017-01-232-4/+15
| * put login form into the nav bar. Proof of concept - needs a bit of UI tweaks.zotlabs2017-01-235-4/+28