Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into red | zotlabs | 2017-03-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #697 from anaqreon/dev | git-marijus | 2017-03-13 | 1 | -1/+1 |
| |\ | | | | | | | Add id to app-menu for JS access | ||||
| | * | Add id to app-menu for JS access | Andrew Manning | 2017-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | we need to have this even if we are not the owner. otherwise we loose the ↵ | Mario Vavti | 2017-03-13 | 1 | -1/+1 |
| |/ | | | | | | | acl if e.g. not-owner edits a webpage. should probably find a better solution for this though. | ||||
* | | db issues | zotlabs | 2017-03-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 1 | -1/+25 |
|\| | |||||
| * | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 |
| | | |||||
* | | one role. | zotlabs | 2017-03-09 | 1 | -1/+0 |
|/ | |||||
* | Big 2.2 string update Dutch | jeroenpraat | 2017-03-07 | 2 | -6864/+7305 |
| | |||||
* | do not collapse long nsfw content | Mario Vavti | 2017-03-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #689 from mjfriaza/dev | zotlabs | 2017-03-05 | 2 | -2329/+2378 |
|\ | | | | | Translated the last strings into Spanish version | ||||
| * | Translated the last strings into Spanish version | Manuel Jiménez Friaza | 2017-03-05 | 2 | -2329/+2378 |
| | | |||||
* | | fix badge position for narrow navbar | Mario Vavti | 2017-03-03 | 1 | -4/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 8 | -27/+22 |
|\ \ | |||||
| * | | provide info if there are no sche,es available | Mario Vavti | 2017-03-02 | 1 | -4/+9 |
| | | | |||||
| * | | reset schema value after we empty and repopulate it. second half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | reset schema value after we empty and repopulate it. first half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -0/+2 |
| | | | |||||
| * | | setting top position of contextual-help in schemes does not work with narrow ↵ | Mario Vavti | 2017-03-02 | 4 | -5/+0 |
| | | | | | | | | | | | | navbar setting. schema css is always called last. | ||||
| * | | add title to connect button | Mario Vavti | 2017-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | minor template fixes | Mario Vavti | 2017-03-01 | 3 | -19/+12 |
| | | | |||||
* | | | activity widget - like the forum widget but represents unseen activity by ↵ | zotlabs | 2017-03-02 | 1 | -0/+2 |
|/ / | | | | | | | author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding. | ||||
* | | missing css class | Mario Vavti | 2017-02-28 | 1 | -1/+1 |
| | | |||||
* | | fetch profile vcard for connection | zotlabs | 2017-02-27 | 1 | -1/+5 |
| | | |||||
* | | add file size notes to /cloud actions panel | zotlabs | 2017-02-27 | 1 | -1/+1 |
| | | |||||
* | | fix js issue in markdown mimetype wikis if content contains quotes | Mario Vavti | 2017-02-27 | 1 | -1/+1 |
| | | |||||
* | | missing clear | Mario Vavti | 2017-02-27 | 1 | -1/+1 |
| | | |||||
* | | lower version requirement to 2.2RC | Mario Vavti | 2017-02-27 | 1 | -1/+1 |
| | | |||||
* | | 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 | 2 | -1/+2 |
|/ / | | | | | | | 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 | 2 | -1/+2 |
| | | | | | | | | met. mark incompatible themes in the theme selector | ||||
* | | more work on profile vcards - still a lot of work to go | zotlabs | 2017-02-23 | 4 | -4/+150 |
| | | |||||
* | | move collapsed login and register buttons to the left | Mario Vavti | 2017-02-23 | 2 | -3/+12 |
| | | |||||
* | | Update DE translation strings | phellmes | 2017-02-22 | 2 | -6067/+6490 |
| | | |||||
* | | apps improvements | Mario Vavti | 2017-02-22 | 4 | -13/+9 |
| | | |||||
* | | change text back to 'add apps' | zotlabs | 2017-02-21 | 1 | -2/+2 |
| | | |||||
* | | Change Add Apps to Manage Apps and support translation. | Andrew Manning | 2017-02-21 | 1 | -2/+2 |
| | | |||||
* | | display page not updating after comment | zotlabs | 2017-02-21 | 1 | -0/+7 |
| | | |||||
* | | update fr translation | zotlabs | 2017-02-20 | 2 | -7833/+12556 |
| | | |||||
* | | width must be 100% here | Mario Vavti | 2017-02-20 | 1 | -0/+1 |
| | | |||||
* | | if we slide to left aside make the overlay darker and leave aside as is | Mario Vavti | 2017-02-20 | 1 | -1/+1 |
| | | |||||
* | | fix several places where head_add_(css|js) functions have been used ↵ | zotlabs | 2017-02-19 | 2 | -46/+38 |
| | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | |||||
* | | add the generic-icons-nav class | Mario Vavti | 2017-02-17 | 1 | -10/+10 |
| | | |||||
* | | add register button for collapsed state | Mario Vavti | 2017-02-17 | 2 | -11/+16 |
| | | |||||
* | | fixed width icons for item dropdown | Mario Vavti | 2017-02-17 | 1 | -10/+10 |
| | | |||||
* | | css fixes and rename link to full docs to help since its app is also called help | Mario Vavti | 2017-02-17 | 1 | -2/+2 |
|/ | |||||
* | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-02-13 | 2 | -2699/+2752 |
| | |||||
* | add default permcat to channel settings form | zotlabs | 2017-02-12 | 1 | -0/+4 |
| |