aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #685 from phellmes/devzotlabs2017-02-232-6067/+6490
|\
| * Update DE translation stringsphellmes2017-02-222-6067/+6490
|/
* apps improvementsMario Vavti2017-02-228-31/+19
* change text back to 'add apps'zotlabs2017-02-212-3/+3
* Merge pull request #684 from anaqreon/devzotlabs2017-02-222-3/+4
|\
| * Change Add Apps to Manage Apps and support translation.Andrew Manning2017-02-212-3/+4
* | use head_add_link() for feed discoveryzotlabs2017-02-217-33/+45
|/
* display page not updating after commentzotlabs2017-02-212-23/+29
* do not lock out channels with only read perms from all post actions. we check...Mario Vavti2017-02-211-5/+0
* wrong permissionMario Vavti2017-02-211-1/+1
* detect no aclzotlabs2017-02-201-4/+6
* fix find_folder_hash_by_path() which was not safe against multiple attach str...zotlabs2017-02-202-10/+30
* update fr translationzotlabs2017-02-204-7838/+12559
* don't search on empty filename - we shouldn't find it. The reason why this ch...zotlabs2017-02-201-4/+6
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-201-0/+1
|\
| * width must be 100% hereMario Vavti2017-02-201-0/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-201-1/+1
|\|
| * if we slide to left aside make the overlay darker and leave aside as isMario Vavti2017-02-201-1/+1
* | wiki page permissions issuezotlabs2017-02-201-3/+11
|/
* bug in adding main.js as a js sourcezotlabs2017-02-191-1/+1
* fix several places where head_add_(css|js) functions have been used incorrect...zotlabs2017-02-196-63/+68
* this icon also appears to require the fixed-width attributezotlabs2017-02-191-2/+2
* change primary directory per requestzotlabs2017-02-181-2/+1
* string updatezotlabs2017-02-171-405/+415
* add the generic-icons-nav classMario Vavti2017-02-171-10/+10
* add register button for collapsed stateMario Vavti2017-02-172-11/+16
* fixed width icons for item dropdownMario Vavti2017-02-171-10/+10
* css fixes and rename link to full docs to help since its app is also called helpMario Vavti2017-02-172-3/+3
* strip possible quotes from attribute_contains() haystackszotlabs2017-02-151-1/+3
* typozotlabs2017-02-151-1/+1
* provide HTTP header parser which honours continuation lines and despite the f...zotlabs2017-02-142-5/+46
* util/pconfig - don't enumerate empty arrays, mod_acl - add more commentszotlabs2017-02-132-10/+26
* Merge pull request #676 from anaqreon/docozotlabs2017-02-1427-999/+388
|\
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-02-1324-3665/+4067
| |\ | |/ |/|
* | Merge pull request #675 from mjfriaza/devzotlabs2017-02-149-2699/+2902
|\ \
| * | Fix 'settings/channel' page in Spanish contextual helpManuel Jiménez Friaza2017-02-131-24/+24
| * | Updated the Spanish contextual helpManuel Jiménez Friaza2017-02-137-0/+150
| * | Updated the Spanish translationManuel Jiménez Friaza2017-02-132-2699/+2752
|/ /
* | be consistent with the namezotlabs2017-02-121-1/+1
* | add default permcat to channel settings formzotlabs2017-02-122-1/+22
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-124-19/+30
|\ \
| * | css fixMario Vavti2017-02-121-1/+1
* | | testing and bug fixes virtual profile groupszotlabs2017-02-123-4/+49
* | | Create virtual privacy groups for private profile member listszotlabs2017-02-129-961/+1094
| | * Integrated more content and deleted the original locations where applicable.Andrew Manning2017-02-1313-838/+180
| | * Some more work converting api_zot to bbcode. This page needs some serious for...Andrew Manning2017-02-121-4/+4
| | * Reformat code of conduct for developers and integrate.Andrew Manning2017-02-127-179/+470
| | * Deleting original help content pages that have been integrated into the new docoAndrew Manning2017-02-1211-293/+49
| |/
| * Merge pull request #671 from anaqreon/webimportzotlabs2017-02-121-14/+18
| |\
| | * remove logger linesAndrew Manning2017-02-112-2/+0