Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | default to manual conversation updates | Mario Vavti | 2017-02-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-06 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-02-06 | 1 | -281/+231 |
| |\ | |||||
| * | | only check for mode | Mario Vavti | 2017-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | don't add zid to app links if they're on this system and we're logged in ↵ | zotlabs | 2017-02-06 | 1 | -4/+10 |
| |/ |/| | | | | | already. This messes up the null arg detection in mod_network. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-06 | 2 | -6/+11 |
|\| | |||||
| * | move icon stuff back to app_render() and send navapps through app_render() | Mario Vavti | 2017-02-06 | 2 | -6/+5 |
| | | |||||
| * | make sure we do not remove other categories on app un-feature | Mario Vavti | 2017-02-06 | 1 | -2/+2 |
| | | |||||
| * | parse icons in get_system_apps() | Mario Vavti | 2017-02-06 | 1 | -0/+3 |
| | | |||||
| * | merge dev | Mario Vavti | 2017-02-06 | 1 | -8/+7 |
| |\ | |||||
| * | | check for app-icons in app_list() instead of app_render() | Mario Vavti | 2017-02-03 | 1 | -3/+6 |
| | | | |||||
* | | | import - get rid of 'step system', we should be able to process any import ↵ | zotlabs | 2017-02-05 | 1 | -258/+210 |
| | | | | | | | | | | | | file at any time. | ||||
* | | | make channel move an option (in addition to cloning) | zotlabs | 2017-02-05 | 1 | -27/+25 |
| |/ |/| | |||||
* | | better theming of rmagic page | zotlabs | 2017-02-05 | 1 | -8/+7 |
|/ | |||||
* | rename bb2diaspora.php to markdown.php | zotlabs | 2017-02-02 | 1 | -1/+1 |
| | |||||
* | unused since 2012 | zotlabs | 2017-02-02 | 1 | -84/+0 |
| | |||||
* | move firefox social api configuration to plugin | zotlabs | 2017-02-02 | 2 | -72/+8 |
| | |||||
* | move rsd service to twitter_api plugin | zotlabs | 2017-02-02 | 1 | -17/+0 |
| | |||||
* | move opensearch to plugins | zotlabs | 2017-02-02 | 2 | -24/+2 |
| | |||||
* | move dreamhost hack to plugin | zotlabs | 2017-02-01 | 1 | -15/+10 |
| | |||||
* | tested extensible permissions by adding wiki permissions. Discovered a ↵ | zotlabs | 2017-02-01 | 4 | -18/+50 |
| | | | | couple of issues that needed attention in the process. | ||||
* | superfluous whitespace cleanup | zotlabs | 2017-01-31 | 1 | -1/+1 |
| | |||||
* | move diaspora account import to the diaspora plugin | zotlabs | 2017-01-31 | 1 | -38/+40 |
| | |||||
* | channel export - use a selected list of functional data categories to ↵ | zotlabs | 2017-01-31 | 3 | -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 widget | Mario Vavti | 2017-01-31 | 1 | -2/+2 |
| | |||||
* | fix typos | Mario Vavti | 2017-01-31 | 2 | -2/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-30 | 3 | -2/+54 |
|\ | |||||
| * | provide a feature/unfeature app button | Mario Vavti | 2017-01-30 | 2 | -2/+25 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into affinity-settings | Andrew Manning | 2017-01-29 | 2 | -38/+25 |
| |\ | |||||
| * | | Add affinity slider tool settings for min and max defaults in settings/featured | Andrew Manning | 2017-01-29 | 1 | -0/+29 |
| | | | |||||
* | | | consolidate hubloc storage | zotlabs | 2017-01-30 | 6 | -33/+32 |
| |/ |/| | |||||
* | | 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 | 1 | -19/+21 |
| | | |||||
* | | Alter the queue so that each queue item stores the scheduled time of the ↵ | zotlabs | 2017-01-29 | 1 | -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-bin | Mario Vavti | 2017-01-27 | 1 | -1/+0 |
| | |||||
* | Fixed numerous bugs with the addon repo management GUI. Only show Manage ↵ | Andrew Manning | 2017-01-26 | 1 | -7/+12 |
| | | | | 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 | 3 | -31/+28 |
| | |||||
* | 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 |
| | |||||
* | fix renaming of wiki pages | Mario Vavti | 2017-01-26 | 2 | -12/+16 |
| | |||||
* | resolve the linked item delete issue by declaring what types of linked items ↵ | zotlabs | 2017-01-25 | 1 | -2/+2 |
| | | | | cannot be deleted | ||||
* | only allow wiki owner to delete pages | zotlabs | 2017-01-25 | 1 | -0/+6 |
| | |||||
* | fixes for wiki create/delete page | Mario Vavti | 2017-01-25 | 2 | -24/+10 |
| | |||||
* | typo | zotlabs | 2017-01-24 | 1 | -1/+1 |
| | |||||
* | always sync parent wiki when syncing pages, just in case the original wiki ↵ | zotlabs | 2017-01-24 | 2 | -9/+13 |
| | | | | creation wasn't synced. | ||||
* | initial selections for extensible permission categories ("permcats") | zotlabs | 2017-01-24 | 1 | -0/+42 |
| | |||||
* | remnant code that checked for version to see if an app was installed. We do ↵ | zotlabs | 2017-01-23 | 1 | -2/+1 |
| | | | | that differently now. | ||||
* | basic support for clone syncing of wikis and wiki pages | Hubzilla | 2017-01-22 | 4 | -16/+41 |
| | |||||
* | use icons for app photos. | Hubzilla | 2017-01-22 | 1 | -2/+5 |
| |