aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵zotlabs2017-02-061-4/+10
| |/ |/| | | | | already. This messes up the null arg detection in mod_network.
* | 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 ↵zotlabs2017-02-051-258/+210
| | | | | | | | | | | | file at any time.
* | | 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 ↵zotlabs2017-02-014-18/+50
| | | | couple of issues that needed attention in the process.
* 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 ↵zotlabs2017-01-313-7/+24
| | | | 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 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 ↵zotlabs2017-01-291-19/+4
|/ | | | | | | | 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.
* more work on app-binMario Vavti2017-01-271-1/+0
|
* Fixed numerous bugs with the addon repo management GUI. Only show Manage ↵Andrew Manning2017-01-261-7/+12
| | | | Repos button if webserver has write permission on extend/addon/.
* 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
|
* fix renaming of wiki pagesMario Vavti2017-01-262-12/+16
|
* resolve the linked item delete issue by declaring what types of linked items ↵zotlabs2017-01-251-2/+2
| | | | cannot be deleted
* only allow wiki owner to delete pageszotlabs2017-01-251-0/+6
|
* fixes for wiki create/delete pageMario Vavti2017-01-252-24/+10
|
* typozotlabs2017-01-241-1/+1
|
* always sync parent wiki when syncing pages, just in case the original wiki ↵zotlabs2017-01-242-9/+13
| | | | creation wasn't synced.
* initial selections for extensible permission categories ("permcats")zotlabs2017-01-241-0/+42
|
* remnant code that checked for version to see if an app was installed. We do ↵zotlabs2017-01-231-2/+1
| | | | that differently now.
* basic support for clone syncing of wikis and wiki pagesHubzilla2017-01-224-16/+41
|
* use icons for app photos.Hubzilla2017-01-221-2/+5
|