Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2017-01-02 | 5 | -6/+291 |
|\ | |||||
| * | feature: allow event creation in other timezones than your own. | zotlabs | 2017-01-01 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'pcard' into dev | zotlabs | 2017-01-01 | 3 | -0/+281 |
| |\ | |||||
| | * | profile vcard - preliminary work | zotlabs | 2017-01-01 | 3 | -0/+281 |
| | | | |||||
| * | | issue #636 - some localised (e.g. Italian) strings have single quotes which ↵ | zotlabs | 2017-01-01 | 1 | -6/+6 |
| |/ | | | | | | | throw JS errors when used in single quoted template constructs. | ||||
* / | Add guest access token section to member guide with screenshot of settings | Andrew Manning | 2017-01-01 | 1 | -0/+4 |
|/ | |||||
* | fix expand-aside button hiding if aside is empty | Mario Vavti | 2016-12-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-30 | 4 | -13/+5 |
|\ | |||||
| * | prevent eventual double scrollbar | Mario Vavti | 2016-12-30 | 1 | -2/+2 |
| | | |||||
| * | css fixes and get rid of a javascript workaround | Mario Vavti | 2016-12-30 | 3 | -11/+3 |
| | | |||||
* | | peoplefind widget should honour directory option settings (such as this site ↵ | zotlabs | 2016-12-30 | 1 | -1/+0 |
|/ | | | | only). | ||||
* | Add webpage doco to Member guide. Add nav menu highlighting when scrolling ↵ | Andrew Manning | 2016-12-27 | 1 | -0/+5 |
| | | | | past content | ||||
* | move style info into css file | Mario Vavti | 2016-12-22 | 2 | -9/+38 |
| | |||||
* | another check | Mario Vavti | 2016-12-22 | 1 | -3/+5 |
| | |||||
* | a cleaner way to work around browser bugs | Mario Vavti | 2016-12-22 | 1 | -7/+4 |
| | |||||
* | more robust crossbrowser support | Mario Vavti | 2016-12-22 | 3 | -3/+26 |
| | |||||
* | more vcard work | zotlabs | 2016-12-21 | 2 | -2/+1 |
| | |||||
* | css fixes | Mario Vavti | 2016-12-21 | 2 | -2/+7 |
| | |||||
* | fix a glitch in sticky-kit and comment out alt_pager() in ↵ | Mario Vavti | 2016-12-21 | 2 | -3/+2 |
| | | | | widget_conversations since it will not work there | ||||
* | provide call button on connections list if mobile|tablet and a phone number ↵ | zotlabs | 2016-12-20 | 2 | -1/+5 |
| | | | | exists | ||||
* | abook_vcard cleanup | zotlabs | 2016-12-20 | 2 | -30/+10 |
| | |||||
* | progress on abook_vcard | zotlabs | 2016-12-20 | 3 | -176/+179 |
| | |||||
* | more abook_vcard | zotlabs | 2016-12-20 | 1 | -0/+203 |
| | |||||
* | abook_vcard first commit | zotlabs | 2016-12-20 | 1 | -0/+279 |
| | |||||
* | turns out we do need this in certain situations | Mario Vavti | 2016-12-20 | 1 | -0/+2 |
| | |||||
* | some changes to heading sizes to make some sense in the doco (this will ↵ | Mario Vavti | 2016-12-20 | 2 | -5/+19 |
| | | | | undergo some refinement in the next release cycle when we possibly upgrade to bootstrap 4) and get rid of the accordion for now. | ||||
* | Move headings down to start at H3 at Mario's direction | Andrew Manning | 2016-12-19 | 1 | -3/+3 |
| | |||||
* | Merge pull request #622 from mjfriaza/dev | zotlabs | 2016-12-20 | 2 | -1182/+1224 |
|\ | | | | | Translated new strings into Spanish version | ||||
| * | Translated new strings into Spanish version | Manuel Jiménez Friaza | 2016-12-17 | 2 | -1182/+1224 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-12-19 | 2 | -1118/+1155 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | jeroenpraat | 2016-12-19 | 13 | -52/+99 |
| |\ \ | |||||
| * | | | Update NL strings | jeroenpraat | 2016-12-19 | 2 | -1118/+1155 |
| | | | | |||||
* | | | | fix contextualHelpFocus() to work wit sticky aside | Mario Vavti | 2016-12-19 | 1 | -0/+8 |
| |/ / |/| | | |||||
* | | | make sticky aside available for small screens. we had to get rid of the ↵ | Mario Vavti | 2016-12-19 | 3 | -22/+28 |
| | | | | | | | | | | | | transition effect for this to work reliably | ||||
* | | | this is not needed | Mario Vavti | 2016-12-19 | 1 | -2/+0 |
| | | | |||||
* | | | re-factor item_photo_menu - there is some room for future development, ↵ | zotlabs | 2016-12-18 | 2 | -7/+23 |
| | | | | | | | | | | | | currently it was made compatible with minimal template changes | ||||
* | | | use darkorange. | zotlabs | 2016-12-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-16 | 6 | -13/+29 |
|\ \ \ | |||||
| * | | | display inline instead of floating | Mario Vavti | 2016-12-16 | 3 | -12/+7 |
| | | | | |||||
| * | | | retrigger after fullscreen | Mario Vavti | 2016-12-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | move the sticky-kit^Cquery plugin to /lib and see if we want this for the ↵ | Mario Vavti | 2016-12-16 | 4 | -1/+21 |
| | | | | | | | | | | | | | | | | whole app | ||||
* | | | | use lock colour to indicate that permissions have been set by the software ↵ | zotlabs | 2016-12-16 | 3 | -1/+7 |
|/ / / | | | | | | | | | | to something you might not expect rather than an exclamation mark. This may not be the best colour in this page context, but it serves the intended purpose. Perhaps orange might be less intrusive and still convey the desired information. | ||||
* / / | note widget: whitespace and resize the textarea to reveal full content | Mario Vavti | 2016-12-15 | 2 | -22/+27 |
|/ / | |||||
* | | reworked doco navigation | Mario Vavti | 2016-12-15 | 1 | -9/+0 |
| | | |||||
* | | more wiki cleanup | Mario Vavti | 2016-12-15 | 1 | -20/+18 |
| | | |||||
* | | issue #446 apps usability - disable app if attached to a plugin that is ↵ | zotlabs | 2016-12-14 | 2 | -3/+4 |
| | | | | | | | | uninstalled, allow system apps to be soft deleted and undeleted from the edit pane. | ||||
* | | wiki: do not show revert buttons if we do not have write perms and minor cleanup | Mario Vavti | 2016-12-14 | 3 | -7/+7 |
| | | |||||
* | | fix btn-group rendering | Mario Vavti | 2016-12-14 | 1 | -16/+2 |
| | | |||||
* | | tag and mention handling in private mail (which required refactoring the ↵ | zotlabs | 2016-12-13 | 1 | -0/+1 |
| | | | | | | | | bbcode cleanup stuff in mod_item) | ||||
* | | mail preview (basic functionality) | zotlabs | 2016-12-13 | 2 | -1/+29 |
| | |