aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.0RC'Mario Vavti2016-12-23506-32290/+67844
|\
| * update changelogMario Vavti2016-12-231-2/+2
| * Merge pull request #626 from anaqreon/2.0RC-docozotlabs2016-12-234-285/+258
| |\
| | * Merge remote-tracking branch 'upstream/2.0RC' into 2.0RC-docoAndrew Manning2016-12-226-48/+67
| | |\ | | |/ | |/|
| * | move style info into css fileMario Vavti2016-12-224-43/+39
| * | another checkMario Vavti2016-12-221-3/+5
| * | a cleaner way to work around browser bugsMario Vavti2016-12-221-7/+4
| * | more robust crossbrowser supportMario Vavti2016-12-223-3/+26
| | * Continuing to revise and rearrange content for clarity and reduced redundancy.Andrew Manning2016-12-223-66/+61
| | * Forgot to complete the thoughtAndrew Manning2016-12-211-1/+1
| | * Merge remote-tracking branch 'upstream/2.0RC' into 2.0RC-docoAndrew Manning2016-12-2111-1206/+1282
| | |\ | | |/ | |/|
| * | css fixesMario Vavti2016-12-212-2/+7
| * | fix a glitch in sticky-kit and comment out alt_pager() in widget_conversation...Mario Vavti2016-12-214-5/+4
| * | update changelogMario Vavti2016-12-211-0/+11
| * | Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-205-20/+39
| |\ \
| | * | turns out we do need this in certain situationsMario Vavti2016-12-201-0/+2
| | * | some changes to heading sizes to make some sense in the doco (this will under...Mario Vavti2016-12-204-20/+37
| * | | Translated new strings into Spanish versionManuel Jiménez Friaza2016-12-202-1182/+1224
| |/ /
| * | Merge pull request #623 from anaqreon/2.0RC-docozotlabs2016-12-2012-243/+352
| |\ \
| | | * Separating Hubzilla project info from the initial About Hubzilla page. Heavil...Andrew Manning2016-12-213-228/+205
| | |/
| | * More heading work and some content rearrangement.Andrew Manning2016-12-192-72/+63
| | * Move headings down to start at H3 at Mario's directionAndrew Manning2016-12-1910-171/+289
| |/
| * fix contextualHelpFocus() to work wit sticky asideMario Vavti2016-12-191-0/+8
| * Update NL stringsjeroenpraat2016-12-192-1118/+1155
| * 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
| * Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-189-286/+306
| |\
| | * display inline instead of floatingMario Vavti2016-12-162-11/+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
| | * Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RCMario Vavti2016-12-161-5/+5
| | |\
| | * | some fixes for doco navMario Vavti2016-12-161-0/+16
| * | | deprecate bb_iframezotlabs2016-12-181-9/+9
| * | | there are occasional sites which use different capitalisation of Content-Type...zotlabs2016-12-151-12/+7
| | |/ | |/|
| * | Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-156-339/+292
| |\|
| | * note widget: whitespace and resize the textarea to reveal full contentMario Vavti2016-12-152-22/+27
| | * reworked doco navigationMario Vavti2016-12-152-288/+246
| | * more wiki cleanupMario Vavti2016-12-152-29/+19
| * | z_fetch_url incorrect variablezotlabs2016-12-151-5/+5
| |/
| * postgres is picky about this stuffzotlabs2016-12-141-2/+2
| * SQL error with app categorieszotlabs2016-12-141-2/+2
| * Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-145-19/+13
| |\
| | * 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
| * | markdown regexzotlabs2016-12-141-2/+3
| |/
| * Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_mergezotlabs2016-12-139-132/+40
| |\
| | * 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