aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflictMario Vavti2017-02-0216-166/+161
|\
| * move dreamhost hack to pluginzotlabs2017-02-011-15/+10
| * drug dealers have userszotlabs2017-02-011-5/+5
| * tested extensible permissions by adding wiki permissions. Discovered a couple...zotlabs2017-02-015-25/+59
| * Merge pull request #664 from anaqreon/docozotlabs2017-02-025-104/+69
| |\
| | * Remove old tags and mentions doco pagesAndrew Manning2017-02-012-99/+0
| | * Remove dead linksAndrew Manning2017-02-011-2/+2
| | * Integrate tags and mentions page doco into member guide. Fix bug when loading...Andrew Manning2017-02-012-4/+68
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-02-016-17/+18
| | |\ | | |/ | |/|
| * | fix a few style issues with nav login panelzotlabs2017-02-016-17/+18
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-02-0112-708/+682
| | |\ | | |/ | |/|
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-3124-101/+166
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-303-4/+55
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-2914-234/+324
| | |\ \ \
| | * | | | Link to Guest Access Tokens doco in context help.Andrew Manning2017-01-291-1/+1
* | | | | | Merge branch 'dev' into wip-app-binMario Vavti2017-02-011-0/+4
|\| | | | |
| * | | | | bookmarks missing from tags and mentions doczotlabs2017-02-011-0/+4
* | | | | | fix notifications badge positioning and rendering of submenus in collapsed modeMario Vavti2017-02-013-35/+36
* | | | | | nav dropdown-menu overridesMario Vavti2017-02-011-7/+0
* | | | | | remove experimental_app_bin config conditionalMario Vavti2017-02-012-151/+19
* | | | | | more work on app-binMario Vavti2017-02-014-26/+88
|/ / / / /
* | | | | superfluous whitespace cleanupzotlabs2017-01-313-352/+359
* | | | | 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
| |_|_|/ |/| | |
* | | | 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
| | |_|/ | |/| |
| * | | 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
| | | |/ | | |/|
* | / | consolidate hubloc storagezotlabs2017-01-3018-95/+130
|/ / /
* | / queue optimisations for sites that have lingered in the queue for more than a...zotlabs2017-01-291-1/+16
| |/ |/|
* | 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
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:46:02 +0000