aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-081-0/+4
|\
| * better detection of when to show the feature button and document nav mode for...Mario Vavti2017-02-081-1/+4
| * do not show feature button if the app is shared. css fixesMario Vavti2017-02-081-0/+1
* | fix immediate issue with multiple login forms until I can figure out an elega...zotlabs2017-02-081-7/+1
|/
* initial permcat creation ability, in /settings/permcats; functional permcat c...zotlabs2017-02-072-1/+113
* atokens - we only need one permission columnzotlabs2017-02-072-5/+9
* move permcat initialisation to zlibzotlabs2017-02-072-45/+48
* provide a few system defined permcats; will require a permission editor page ...zotlabs2017-02-071-0/+10
* move permcat library functions to Zlibzotlabs2017-02-072-44/+71
* more background work for permcat supportzotlabs2017-02-073-5/+78
* default to manual conversation updatesMario Vavti2017-02-071-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-061-1/+1
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-02-061-281/+231
| |\
| * | only check for modeMario Vavti2017-02-061-1/+1
* | | don't add zid to app links if they're on this system and we're logged in alre...zotlabs2017-02-061-4/+10
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-062-6/+11
|\|
| * move icon stuff back to app_render() and send navapps through app_render()Mario Vavti2017-02-062-6/+5
| * make sure we do not remove other categories on app un-featureMario Vavti2017-02-061-2/+2
| * parse icons in get_system_apps()Mario Vavti2017-02-061-0/+3
| * merge devMario Vavti2017-02-061-8/+7
| |\
| * | check for app-icons in app_list() instead of app_render()Mario Vavti2017-02-031-3/+6
* | | import - get rid of 'step system', we should be able to process any import fi...zotlabs2017-02-051-258/+210
* | | make channel move an option (in addition to cloning)zotlabs2017-02-051-27/+25
| |/ |/|
* | better theming of rmagic pagezotlabs2017-02-051-8/+7
|/
* rename bb2diaspora.php to markdown.phpzotlabs2017-02-021-1/+1
* unused since 2012zotlabs2017-02-021-84/+0
* move firefox social api configuration to pluginzotlabs2017-02-022-72/+8
* move rsd service to twitter_api pluginzotlabs2017-02-021-17/+0
* move opensearch to pluginszotlabs2017-02-022-24/+2
* move dreamhost hack to pluginzotlabs2017-02-011-15/+10
* tested extensible permissions by adding wiki permissions. Discovered a couple...zotlabs2017-02-014-18/+50
* superfluous whitespace cleanupzotlabs2017-01-311-1/+1
* move diaspora account import to the diaspora pluginzotlabs2017-01-311-38/+40
* channel export - use a selected list of functional data categories to export;...zotlabs2017-01-313-7/+24
* hide featured app category in the app category widgetMario Vavti2017-01-311-2/+2
* fix typosMario Vavti2017-01-312-2/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-303-2/+54
|\
| * provide a feature/unfeature app buttonMario Vavti2017-01-302-2/+25
| * Merge remote-tracking branch 'upstream/dev' into affinity-settingsAndrew Manning2017-01-292-38/+25
| |\
| * | Add affinity slider tool settings for min and max defaults in settings/featuredAndrew Manning2017-01-291-0/+29
* | | consolidate hubloc storagezotlabs2017-01-306-33/+32
| |/ |/|
* | no quotes on dbutcnow() outputzotlabs2017-01-291-1/+1
* | finish remaining places where xchan_store_lowlevel needs to be usedzotlabs2017-01-291-19/+21
* | Alter the queue so that each queue item stores the scheduled time of the next...zotlabs2017-01-291-19/+4
|/
* more work on app-binMario Vavti2017-01-271-1/+0
* Fixed numerous bugs with the addon repo management GUI. Only show Manage Repo...Andrew Manning2017-01-261-7/+12
* better handling of html special chars in wiki and wikipage nameszotlabs2017-01-263-31/+28
* 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