Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 2.2RC2.2 | Mario Vavti | 2017-03-08 | 40 | -2008/+2585 |
|\ | |||||
| * | allow post_activity_item to be passed an empty ACL without resetting to ↵ | zotlabs | 2017-03-06 | 1 | -1/+2 |
| | | | | | | | | channel default | ||||
| * | correct fix for wiki anonymous read issue (items_permissions_sql checks ↵ | zotlabs | 2017-03-06 | 1 | -1/+2 |
| | | | | | | | | item.public_policy which was set for posts, not wikis) | ||||
| * | set minversion and maxversion for themes in ↵ | Mario Vavti | 2017-02-27 | 1 | -0/+2 |
| | | | | | | | | view/theme/themename/php/theme.php instead of separate file. | ||||
| * | yet one more place to use chanlink_hash() instead of chanlink_url() | Mario Vavti | 2017-02-23 | 1 | -2/+2 |
| | | |||||
| * | apps improvements | Mario Vavti | 2017-02-22 | 1 | -14/+0 |
| | | |||||
| * | change text back to 'add apps' | zotlabs | 2017-02-21 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #684 from anaqreon/dev | zotlabs | 2017-02-22 | 1 | -1/+2 |
| |\ | | | | | | | Change Add Apps to Manage Apps and support translation. | ||||
| | * | Change Add Apps to Manage Apps and support translation. | Andrew Manning | 2017-02-21 | 1 | -1/+2 |
| | | | |||||
| * | | use head_add_link() for feed discovery | zotlabs | 2017-02-21 | 1 | -3/+1 |
| |/ | |||||
| * | wrong permission | Mario Vavti | 2017-02-21 | 1 | -1/+1 |
| | | |||||
| * | detect no acl | zotlabs | 2017-02-20 | 1 | -4/+6 |
| | | |||||
| * | fix find_folder_hash_by_path() which was not safe against multiple attach ↵ | zotlabs | 2017-02-20 | 1 | -9/+23 |
| | | | | | | | | structures with the same filename but in different directories | ||||
| * | update fr translation | zotlabs | 2017-02-20 | 1 | -3/+3 |
| | | |||||
| * | don't search on empty filename - we shouldn't find it. The reason why this ↵ | zotlabs | 2017-02-20 | 1 | -4/+6 |
| | | | | | | | | change is being made is because we actually did find it due to a development glitch | ||||
| * | bug in adding main.js as a js source | zotlabs | 2017-02-19 | 1 | -1/+1 |
| | | |||||
| * | fix several places where head_add_(css|js) functions have been used ↵ | zotlabs | 2017-02-19 | 1 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work: - if there is no preceding / character, we look for the file within all the appropriate theme directories. - otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir - files beginning with // are considered to be schemeless URLs. Therefore 'foo.css' means find the best theme-able representation of foo.css. '/library/foo.css' means only use the version of foo.css that is in /library. | ||||
| * | css fixes and rename link to full docs to help since its app is also called help | Mario Vavti | 2017-02-17 | 1 | -1/+1 |
| | | |||||
| * | strip possible quotes from attribute_contains() haystacks | zotlabs | 2017-02-15 | 1 | -1/+3 |
| | | |||||
| * | provide HTTP header parser which honours continuation lines and despite the ↵ | zotlabs | 2017-02-14 | 1 | -5/+0 |
| | | | | | | | | fact that continuation lines have been deprecated - as they still exist in the wild. | ||||
| * | be consistent with the name | zotlabs | 2017-02-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-12 | 1 | -14/+18 |
| |\ | |||||
| | * | remove logger lines | Andrew Manning | 2017-02-11 | 1 | -1/+0 |
| | | | |||||
| | * | Webpage import tool works again after setting iconfig properly and following ↵ | Andrew Manning | 2017-02-11 | 1 | -14/+19 |
| | | | | | | | | | | | | the Impel class function example. More testing is needed. | ||||
| * | | testing and bug fixes virtual profile groups | zotlabs | 2017-02-12 | 2 | -2/+12 |
| | | | |||||
| * | | Create virtual privacy groups for private profile member lists | zotlabs | 2017-02-12 | 4 | -42/+153 |
| |/ | |||||
| * | more work on permcats and consolidating calls that try to discover connect ↵ | zotlabs | 2017-02-09 | 4 | -104/+157 |
| | | | | | | | | permissions, also create lowlevel store functions for abook and profile - since these currently may have issues with sql strict mode. | ||||
| * | bringer - all basic functionality is implemented | zotlabs | 2017-02-08 | 2 | -0/+17 |
| | | |||||
| * | fix immediate issue with multiple login forms until I can figure out an ↵ | zotlabs | 2017-02-08 | 1 | -1/+1 |
| | | | | | | | | elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked. | ||||
| * | sort the apps | Mario Vavti | 2017-02-07 | 1 | -0/+2 |
| | | |||||
| * | default to manual conversation updates | Mario Vavti | 2017-02-07 | 1 | -1/+3 |
| | | |||||
| * | bring back view links for all notification types (esp: network, channel) for ↵ | zotlabs | 2017-02-06 | 1 | -3/+5 |
| | | | | | | | | easy access | ||||
| * | move icon stuff back to app_render() and send navapps through app_render() | Mario Vavti | 2017-02-06 | 1 | -4/+3 |
| | | |||||
| * | import system apps on initial load | Mario Vavti | 2017-02-06 | 1 | -1/+5 |
| | | |||||
| * | merge dev | Mario Vavti | 2017-02-06 | 2 | -12/+57 |
| |\ | |||||
| | * | remove per-page login css (home, login); add support for alternative ↵ | zotlabs | 2017-02-05 | 1 | -1/+36 |
| | | | | | | | | | | | | markdown mention format | ||||
| | * | more work on nav-modal | zotlabs | 2017-02-03 | 1 | -11/+21 |
| | | | |||||
| * | | check for app-icons in app_list() instead of app_render() | Mario Vavti | 2017-02-03 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'dev' into wip-app-bin | Mario Vavti | 2017-02-03 | 3 | -5/+31 |
| |\| | |||||
| | * | rename bb2diaspora.php to markdown.php | zotlabs | 2017-02-02 | 2 | -2/+2 |
| | | | |||||
| | * | move opensearch to plugins | zotlabs | 2017-02-02 | 1 | -3/+29 |
| | | | |||||
| * | | remove apps from usermenu | Mario Vavti | 2017-02-02 | 1 | -14/+14 |
| | | | |||||
| * | | resolve merge conflict | Mario Vavti | 2017-02-02 | 1 | -1/+1 |
| |\| | |||||
| | * | fix a few style issues with nav login panel | zotlabs | 2017-02-01 | 1 | -1/+1 |
| | | | |||||
| * | | remove experimental_app_bin config conditional | Mario Vavti | 2017-02-01 | 1 | -19/+17 |
| |/ | |||||
| * | superfluous whitespace cleanup | zotlabs | 2017-01-31 | 2 | -351/+358 |
| | | |||||
| * | move diaspora account import to the diaspora plugin | zotlabs | 2017-01-31 | 1 | -148/+0 |
| | | |||||
| * | channel export - use a selected list of functional data categories to ↵ | zotlabs | 2017-01-31 | 3 | -164/+234 |
| | | | | | | | | 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 | 2 | -1/+2 |
| | | |||||
| * | fix typos | Mario Vavti | 2017-01-31 | 1 | -1/+1 |
| | |