Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-20 | 10 | -2503/+350 |
|\ | |||||
| * | update bs4-dev and use min version of popper | Mario Vavti | 2017-06-20 | 10 | -2503/+350 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-07 | 15 | -462/+3369 |
|\| | |||||
| * | update bs-dev | Mario Vavti | 2017-06-07 | 15 | -462/+3369 |
| | | |||||
| * | move code syntax highlighting to plugin | zotlabs | 2017-06-07 | 52 | -23379/+0 |
| | | |||||
* | | move code syntax highlighting to plugin | zotlabs | 2017-05-30 | 52 | -23379/+0 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-01 | 6 | -14/+50 |
|\| | |||||
| * | update bs4-dev | Mario Vavti | 2017-05-01 | 6 | -14/+50 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-18 | 10 | -70/+35 |
|\| | |||||
| * | update to bs-git | Mario Vavti | 2017-04-18 | 10 | -70/+35 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 25 | -18180/+334 |
|\| | |||||
| * | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 11 | -17377/+0 |
| | | | | | | | | | | | | | | | | | | | | | | As a follow up to issue #699 update SimplePie from 1.2.1-dev (around 6years old) to current git master (1.4.4-dev). We use the master branch until the next release because it contains our patch for enclosure titles already. The other patches in the library from us can be done by configuring the SimplePie object in our code instead. Used composer to manage this library and use class autoloading. Add some unit tests for include/feedutils.php, but the interesting parts are unfortunately not testable with the current code. | ||||
| * | update bs-dev | Mario Vavti | 2017-04-13 | 14 | -803/+334 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-05 | 7 | -53/+64 |
|\| | |||||
| * | update bd-dev and remove hotfix | Mario Vavti | 2017-04-05 | 7 | -53/+64 |
| | | |||||
* | | 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 |
| |