Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-30 | 12 | -58/+2786 |
|\ | |||||
| * | add some missing files | Mario Vavti | 2017-03-30 | 8 | -0/+2661 |
| | | |||||
| * | update to textcomplete v 1.8.0 | Mario Vavti | 2017-03-30 | 4 | -58/+125 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 6 | -128/+177 |
|\| | |||||
| * | update to latest bs-dev | Mario Vavti | 2017-03-28 | 6 | -128/+177 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 366 | -33395/+0 |
|\| | |||||
| * | :arrow_up: Update HTML Purifier library. | Klaus Weidenbach | 2017-03-26 | 366 | -33395/+0 |
| | | | | | | | | | | Updated HTML Purifier from 4.6.0 to 4.9.2 with better PHP7 compatibility. Used composer to manage this library. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 25 | -8105/+11179 |
|\| | |||||
| * | update fullcalendar library to version 3.2.0 | Mario Vavti | 2017-03-23 | 10 | -388/+802 |
| | | |||||
| * | update to latest bs4 from git and change hidden-* classes to d-* | Mario Vavti | 2017-03-20 | 6 | -277/+246 |
| | | |||||
| * | Revert "update to bs-git" | Mario Vavti | 2017-03-19 | 4 | -163/+231 |
| | | | | | | | | This reverts commit 7b0f3d9e26b8c666440de09c5eb33dc6360472c6. | ||||
| * | update to bs-git | Mario Vavti | 2017-03-19 | 4 | -231/+163 |
| | | |||||
| * | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-19 | 49 | -1651/+0 |
| |\ | |||||
| | * | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
| | | | |||||
| * | | upgrade bs to latest git and some more progress | Mario Vavti | 2017-03-09 | 6 | -349/+202 |
| | | | |||||
| * | | initial commit for the bootstrap version 4 branch - upgrade lib and make ↵ | Mario Vavti | 2017-03-09 | 15 | -7611/+10449 |
| |/ | | | | | | | nav.tpl kind of working again | ||||
* | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 |
| | | |||||
* | | move oauth2 to vendor | zotlabs | 2017-03-14 | 121 | -14970/+0 |
|/ | |||||
* | move emoji emoticons (not reactions) to plugin | zotlabs | 2017-03-05 | 1 | -1/+0 |
| | |||||
* | :arrow_up: :hammer: Upgrade Markdownify library. | Klaus Weidenbach | 2017-03-05 | 7 | -2921/+0 |
| | | | | | | | | The current version 2.0.0 (alpha) throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the HTML to Markdown converter for PHP to the current Markdownify 2.2.1. Used composer to manage this library. | ||||
* | Move library/markdown.php to keep history. | Klaus Weidenbach | 2017-02-27 | 1 | -2932/+0 |
| | |||||
* | fix text highlighter for PHP version 7.1 | Mario Vavti | 2017-01-21 | 1 | -2/+4 |
| | |||||
* | font awesome 4.7.0 | Mario Vavti | 2017-01-10 | 545 | -2093/+112780 |
| | |||||
* | update fullcalendar to version 3.1 | Mario Vavti | 2016-12-30 | 10 | -724/+1461 |
| | |||||
* | fix a glitch in sticky-kit and comment out alt_pager() in ↵ | Mario Vavti | 2016-12-21 | 1 | -1/+1 |
| | | | | widget_conversations since it will not work there | ||||
* | move the sticky-kit^Cquery plugin to /lib and see if we want this for the ↵ | Mario Vavti | 2016-12-16 | 2 | -0/+275 |
| | | | | whole app | ||||
* | another fix to readmore.js and update patch file | Mario Vavti | 2016-10-10 | 2 | -3/+21 |
| | |||||
* | fix readmorejs collapsing on scrolldirection change in mobile browsers | Mario Vavti | 2016-10-10 | 1 | -1/+1 |
| | |||||
* | add oauth2/oidc lib | zotlabs | 2016-10-07 | 121 | -0/+14970 |
| | |||||
* | bugfixrelease fullcalendar-3.0.1 | Mario Vavti | 2016-10-05 | 8 | -45/+138 |
| | |||||
* | add bootstrap .css.map files | Mario Vavti | 2016-09-22 | 4 | -0/+4 |
| | |||||
* | add new locale file | Mario Vavti | 2016-09-14 | 1 | -0/+5 |
| | |||||
* | upgrade fullcalendar to version 3 | Mario Vavti | 2016-09-14 | 9 | -949/+1720 |
| | |||||
* | update justifiedGallery 3.6.1 -> 3.6.3 | Mario Vavti | 2016-09-09 | 4 | -184/+140 |
| | |||||
* | patch foundation-6.2.3 to work with jquery-3.1 | Mario Vavti | 2016-09-08 | 1 | -2/+2 |
| | |||||
* | missing file | Mario Vavti | 2016-09-07 | 1 | -0/+9069 |
| | |||||
* | upgrade foundation to version 6.2.3 | Mario Vavti | 2016-09-07 | 19 | -12206/+3085 |
| | |||||
* | incutio xmlrpc library uses old-style (php4) constructors which have been ↵ | redmatrix | 2016-09-04 | 1 | -13/+13 |
| | | | | deprecated for some time. They should still work on 7.0, but it's only a matter of time before they go away. | ||||
* | update bootstrap 3.3.5 > 3.3.7 | Mario Vavti | 2016-08-14 | 6 | -138/+111 |
| | |||||
* | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | |||||
* | rename the patch so that it explains what it does | Mario Vavti | 2016-07-22 | 1 | -0/+0 |
| | |||||
* | apply our custom patch to readmore.js | Mario Vavti | 2016-07-22 | 2 | -1/+14 |
| | |||||
* | upgrade readmore.js and improve collapsing a little | Mario Vavti | 2016-07-22 | 2 | -14/+38 |
| | |||||
* | update moment.js to version 2.13 | Mario Vavti | 2016-06-30 | 4 | -50/+423 |
| | |||||
* | update fullcalendar to version 2.8.0 | Mario Vavti | 2016-06-28 | 8 | -63/+267 |
| | |||||
* | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 3 | -685/+433 |
| | | | | registrations | ||||
* | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -0/+386 |
| | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | ||||
* | update 3rd party lib fullcalendar to version 2.7.3 | Mario Vavti | 2016-06-16 | 9 | -536/+1491 |
| | |||||
* | improve readability of comments | redmatrix | 2016-06-15 | 1 | -1/+1 |
| | |||||
* | This was the reason for the large line widths - an extra linefeed after each ↵ | redmatrix | 2016-06-15 | 1 | -3/+0 |
| | | | | li element |