Commit graph

18822 commits

Author SHA1 Message Date
Mario Vavti
cfdf1def2a since we have the app bin we do not actually need the profile tabs for ourself 2017-03-20 14:09:27 +01:00
Mario Vavti
37d350c3f5 update to latest bs4 from git and change hidden-* classes to d-* 2017-03-20 11:18:23 +01:00
Mario Vavti
b10c519cc1 Merge branch 'dev' into bs4 2017-03-20 08:53:08 +01:00
zotlabs
1bdab6e633 Merge pull request #703 from dawnbreak/oauth2
⬆️ Update bshaffer/oauth2-server-php library.
2017-03-20 11:05:46 +11:00
zotlabs
1bf2a9d47b Merge pull request #702 from dawnbreak/dev
 Add unit test for purify_html().
2017-03-20 11:05:20 +11:00
Klaus Weidenbach
8b4b135036 ⬆️ Update bshaffer/oauth2-server-php library.
Manage oauth2-server-php library with composer.
Folder ./library/oauth2/ can be removed and includes removed with autoloading.
2017-03-20 00:43:09 +01:00
Klaus Weidenbach
d4bd4ca000 Add unit test for purify_html().
In preparation to update HTMLPurifier library add a unit test.
Please add more HTML that you need to have working and we can check
against regressions.
2017-03-19 23:07:16 +01:00
Mario Vavti
2f3f95d3a9 change the btn-outline-secondary:hover color to soething sane 2017-03-19 19:59:45 +01:00
Mario Vavti
d958f1099b Revert "update to bs-git"
This reverts commit 7b0f3d9e26.
2017-03-19 19:51:02 +01:00
Mario Vavti
7b0f3d9e26 update to bs-git 2017-03-19 19:40:08 +01:00
Mario Vavti
92d581a342 do not show the scrollbar before the animation has finished 2017-03-19 19:36:29 +01:00
Mario Vavti
8e11b2d6f0 fix some wrapping issues 2017-03-19 19:32:54 +01:00
Mario Vavti
79bd2ddd9c reflect count in modal 2017-03-19 17:53:33 +01:00
Mario Vavti
949ca844c5 open like-modal directly if more than 10 likes 2017-03-19 17:49:07 +01:00
Mario Vavti
f31af3c7c0 typo 2017-03-19 17:09:21 +01:00
Mario Vavti
a0245f3e93 css fixes 2017-03-19 17:06:55 +01:00
Mario Vavti
c85f1a208d a % example for font size 2017-03-19 14:29:09 +01:00
Mario Vavti
774923be1c fix jgrowl position and remove some redundant css 2017-03-19 14:20:21 +01:00
Mario Vavti
d78b64d5b3 fix narrow navbar setting and contextual-help position 2017-03-19 14:00:59 +01:00
Mario Vavti
0938db8f7b Merge branch 'dev' into bs4 2017-03-19 13:33:45 +01:00
Mario Vavti
d2c971eda9 fix php warning and remove logging 2017-03-19 13:33:02 +01:00
Mario Vavti
57584ea429 remove redundant css 2017-03-19 13:28:06 +01:00
Mario Vavti
49d84a364d css fixes 2017-03-19 13:21:30 +01:00
Mario Vavti
89b5507354 fix custom fontsize for app 2017-03-19 12:10:16 +01:00
Mario Vavti
2a25ddff36 bs4 fixes 2017-03-19 10:51:58 +01:00
zotlabs
8764cdf16a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-18 16:56:37 -07:00
zotlabs
a45dd09fc0 issue #699 2017-03-18 16:56:18 -07:00
Mario Vavti
b2ad4e8c2a bs4 fixes 2017-03-18 23:45:55 +01:00
Mario Vavti
2bdf63d069 more abook_edit and some css 2017-03-18 22:01:46 +01:00
Mario Vavti
b897fd8315 more abook_edit 2017-03-18 20:02:13 +01:00
Mario Vavti
82b35e2762 fix abook_edit and private mail 2017-03-18 20:00:32 +01:00
Mario Vavti
56f32104d5 Merge branch 'dev' into bs4 2017-03-18 17:29:38 +01:00
Mario Vavti
2556d05602 bs4 fixes 2017-03-18 17:28:46 +01:00
Klaus
7b06cb6682 Merge pull request #698 from dawnbreak/dev
Missed one old Markdown()
2017-03-18 14:19:47 +01:00
Klaus
cbd401c3e8 Missed one old Markdown() 2017-03-18 14:15:02 +01:00
Mario Vavti
9277806664 fix usermenu radius 2017-03-17 21:42:27 +01:00
Mario Vavti
828028259c css fixes 2017-03-17 20:48:06 +01:00
Mario Vavti
d10525a375 fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes 2017-03-17 14:22:10 +01:00
Mario Vavti
4c2bdc9dc0 Merge branch 'dev' into bs4 2017-03-16 09:46:09 +01:00
zotlabs
472a824a1e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 16:02:45 -07:00
zotlabs
16df1c1ad4 Merge pull request #569 from dawnbreak/QA_testing
[FEATURE] Extend Travis CI integration.
2017-03-16 10:02:17 +11:00
zotlabs
2dce86d38e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 15:55:33 -07:00
Mario Vavti
a73ea134cd re-add spaces between tags 2017-03-15 21:22:16 +01:00
Mario Vavti
e7a5aa7b9c js fixes 2017-03-15 17:28:00 +01:00
Mario Vavti
aa33cacb62 style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes 2017-03-15 16:42:55 +01:00
Mario Vavti
0c74c79b18 Merge branch 'dev' into bs4 2017-03-15 12:42:18 +01:00
Mario Vavti
0c973cc9fa various fixes 2017-03-15 12:41:37 +01:00
Mario Vavti
62c921815f better handling of mimetype security 2017-03-15 12:39:34 +01:00
Klaus Weidenbach
5c080ca4e8 👷 Add Travis' GitHub deployment steps.
Changed API documentation deployment to gh_pages to Travis's GitHub Pages
deployment.
Also add Travis GitHub Release Deployment step to offer API
documentation.
Both steps are optional and need to be activated in Travis by setting
GH_TOKEN.
2017-03-14 20:41:32 +01:00
Klaus Weidenbach
4a85726e55 👷 ⬆️ Update PHPUnit to current stable 6.
Update requirements to PHP7 for dev.
Add php-mock-phpunit to mock and stub global functions in a better way.
2017-03-14 20:41:29 +01:00