Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-02-27 | 2 | -4827/+4862 | |
|\ \ | ||||||
| * | | Merge pull request #687 from mjfriaza/dev | zotlabs | 2017-02-27 | 2 | -4827/+4862 | |
| |\| | | | | | | | Updated the Spanish translation | |||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-02-26 | 2 | -4827/+4862 | |
| | | | ||||||
* | | | set minversion and maxversion for themes in ↵ | Mario Vavti | 2017-02-27 | 6 | -7/+13 | |
|/ / | | | | | | | view/theme/themename/php/theme.php instead of separate file. | |||||
* | | add a minversion to the theme and fallback to default if requirement is not ↵ | Mario Vavti | 2017-02-26 | 6 | -7/+26 | |
| | | | | | | | | met. mark incompatible themes in the theme selector | |||||
* | | move admin permission decision out of the router - it is already provided in ↵ | zotlabs | 2017-02-25 | 2 | -7/+1 | |
| | | | | | | | | the module and the higher level check is causing some oembed redirect issues. | |||||
* | | send sync packet on profile photo permissions change | zotlabs | 2017-02-25 | 1 | -0/+9 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-25 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | bump version | Mario Vavti | 2017-02-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | escape tags on viewsrc output in case it is not text/bbcode. | zotlabs | 2017-02-25 | 1 | -1/+3 | |
|/ / | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-24 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | use chanlink_url() in directory since the xchan might not yet be available ↵ | Mario Vavti | 2017-02-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | on our server | |||||
* | | | We've passed the deadline for allowing unsigned zot finger tokens. It is now ↵ | zotlabs | 2017-02-24 | 3 | -3041/+3041 | |
|/ / | | | | | | | a protocol requirement. | |||||
* | | deleting profile vcard entries was pretty well borked | zotlabs | 2017-02-23 | 1 | -2/+4 | |
| | | ||||||
* | | more work on profile vcards - still a lot of work to go | zotlabs | 2017-02-23 | 6 | -14/+178 | |
| | | ||||||
* | | nativewiki: only apply markdown filter to markdown input | zotlabs | 2017-02-23 | 1 | -4/+12 | |
| | | ||||||
* | | move some functions to more appropriate places | zotlabs | 2017-02-23 | 3 | -236/+233 | |
| | | ||||||
* | | minor edits | zotlabs | 2017-02-23 | 1 | -6/+8 | |
| | | ||||||
* | | parse bbcode events which use the "new" vcalendar format. work in progress. | zotlabs | 2017-02-23 | 1 | -3/+144 | |
| | | ||||||
* | | update changelog | Mario Vavti | 2017-02-23 | 1 | -0/+86 | |
| | | ||||||
* | | move collapsed login and register buttons to the left | Mario Vavti | 2017-02-23 | 2 | -3/+12 | |
| | | ||||||
* | | yet one more place to use chanlink_hash() instead of chanlink_url() | Mario Vavti | 2017-02-23 | 1 | -2/+2 | |
| | | ||||||
* | | one more place to use chanlink_hash() instead of chanlink_url() | Mario Vavti | 2017-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | more places to use chanlink_hash() instead of chanlink_url() for profile_link | Mario Vavti | 2017-02-23 | 3 | -3/+3 | |
| | | ||||||
* | | use chanlink_hash() instead of chanlink_url() for $profile_link | Mario Vavti | 2017-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #685 from phellmes/dev | zotlabs | 2017-02-23 | 2 | -6067/+6490 | |
|\ \ | | | | | | | Update DE translation strings | |||||
| * | | Update DE translation strings | phellmes | 2017-02-22 | 2 | -6067/+6490 | |
|/ / | ||||||
* | | apps improvements | Mario Vavti | 2017-02-22 | 8 | -31/+19 | |
| | | ||||||
* | | change text back to 'add apps' | zotlabs | 2017-02-21 | 2 | -3/+3 | |
| | | ||||||
* | | Merge pull request #684 from anaqreon/dev | zotlabs | 2017-02-22 | 2 | -3/+4 | |
|\ \ | | | | | | | Change Add Apps to Manage Apps and support translation. | |||||
| * | | Change Add Apps to Manage Apps and support translation. | Andrew Manning | 2017-02-21 | 2 | -3/+4 | |
| | | | ||||||
* | | | use head_add_link() for feed discovery | zotlabs | 2017-02-21 | 7 | -33/+45 | |
|/ / | ||||||
* | | display page not updating after comment | zotlabs | 2017-02-21 | 2 | -23/+29 | |
| | | ||||||
* | | do not lock out channels with only read perms from all post actions. we ↵ | Mario Vavti | 2017-02-21 | 1 | -5/+0 | |
| | | | | | | | | check read/write permissions for each command later in the process | |||||
* | | 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 | 2 | -10/+30 | |
| | | | | | | | | structures with the same filename but in different directories | |||||
* | | update fr translation | zotlabs | 2017-02-20 | 4 | -7838/+12559 | |
| | | ||||||
* | | 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 | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-20 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | width must be 100% here | Mario Vavti | 2017-02-20 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-20 | 1 | -1/+1 | |
|\| | | ||||||
| * | | if we slide to left aside make the overlay darker and leave aside as is | Mario Vavti | 2017-02-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | wiki page permissions issue | zotlabs | 2017-02-20 | 1 | -3/+11 | |
|/ / | ||||||
* | | 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 | 6 | -63/+68 | |
| | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | this icon also appears to require the fixed-width attribute | zotlabs | 2017-02-19 | 1 | -2/+2 | |
| | | ||||||
* | | change primary directory per request | zotlabs | 2017-02-18 | 1 | -2/+1 | |
| | | ||||||
* | | string update | zotlabs | 2017-02-17 | 1 | -405/+415 | |
| | | ||||||
* | | add the generic-icons-nav class | Mario Vavti | 2017-02-17 | 1 | -10/+10 | |
| | |