aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-191-0/+8
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-192-1118/+1155
| |\
| * | fix contextualHelpFocus() to work wit sticky asideMario Vavti2016-12-191-0/+8
* | | zidify private mailzotlabs2016-12-192-6/+6
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devjeroenpraat2016-12-1924-1284/+1525
|\|
| * make sticky aside available for small screens. we had to get rid of the trans...Mario Vavti2016-12-193-22/+28
| * this is not neededMario Vavti2016-12-191-2/+0
| * deprecate bb_iframezotlabs2016-12-181-9/+9
| * re-factor item_photo_menu - there is some room for future development, curren...zotlabs2016-12-184-8/+190
| * use darkorange.zotlabs2016-12-161-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-169-287/+306
| |\
| | * display inline instead of floatingMario Vavti2016-12-163-12/+7
| | * retrigger after fullscreenMario Vavti2016-12-161-0/+1
| | * move the sticky-kit^Cquery plugin to /lib and see if we want this for the who...Mario Vavti2016-12-167-290/+297
| | * some fixes for doco navMario Vavti2016-12-161-0/+16
| * | use lock colour to indicate that permissions have been set by the software to...zotlabs2016-12-163-1/+7
| * | string updatezotlabs2016-12-161-929/+959
| * | there are occasional sites which use different capitalisation of Content-Type...zotlabs2016-12-151-12/+7
| |/
| * use array_shift - it's cleanerzotlabs2016-12-151-1/+1
| * z_fetch_url incorrect variablezotlabs2016-12-151-5/+5
| * html2plain warningszotlabs2016-12-151-1/+1
| * note widget: whitespace and resize the textarea to reveal full contentMario Vavti2016-12-152-22/+27
* | Update NL stringsjeroenpraat2016-12-192-1118/+1155
|/
* reworked doco navigationMario Vavti2016-12-152-288/+246
* more wiki cleanupMario Vavti2016-12-152-29/+19
* Merge pull request #600 from toppoint/devzotlabs2016-12-151-0/+53
|\
| * Drop on switch for notificationsilu332016-12-151-5/+2
| * Missing single quotesilu332016-12-151-2/+2
| * Merge branch 'dev' of https://github.com/toppoint/hubzilla into devxxx2016-12-150-0/+0
| |\
| | * Configuring email notifications per channelilu332016-11-241-0/+56
| * | Configuring email notifications per channelilu332016-12-151-0/+56
* | | postgres is picky about this stuffzotlabs2016-12-141-2/+2
|/ /
* | issue #446 apps usability - disable app if attached to a plugin that is unins...zotlabs2016-12-149-30/+87
* | markdown regexzotlabs2016-12-141-2/+3
* | fix regexMario Vavti2016-12-141-1/+1
* | wiki: do not show revert buttons if we do not have write perms and minor cleanupMario Vavti2016-12-145-19/+13
* | fix btn-group renderingMario Vavti2016-12-141-16/+2
* | use absolute namespace in case this gets movedzotlabs2016-12-131-1/+1
* | tag and mention handling in private mail (which required refactoring the bbco...zotlabs2016-12-135-78/+76
* | update hook docozotlabs2016-12-132-0/+6
* | add plugin hook to zot_best_algorithm()zotlabs2016-12-131-0/+5
* | mail preview (basic functionality)zotlabs2016-12-133-1/+62
* | restructuring include/message for mail previewzotlabs2016-12-131-32/+44
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-1311-6763/+10553
|\ \
| * | update dutch stringsjeroenpraat2016-12-132-6631/+10513
| * | dropdown position fixesMario Vavti2016-12-132-4/+3
| * | bring lockview to wikilistMario Vavti2016-12-133-6/+14
| * | do not increase opacity to more than 1Mario Vavti2016-12-131-1/+1
| * | simplify wikilist widgetMario Vavti2016-12-132-120/+12
| * | Merge pull request #619 from anaqreon/devgit-marijus2016-12-131-1/+10
| |\ \