79bd2ddd9c
reflect count in modal
2017-03-19 17:53:33 +01:00
949ca844c5
open like-modal directly if more than 10 likes
2017-03-19 17:49:07 +01:00
f31af3c7c0
typo
2017-03-19 17:09:21 +01:00
a0245f3e93
css fixes
2017-03-19 17:06:55 +01:00
c85f1a208d
a % example for font size
2017-03-19 14:29:09 +01:00
774923be1c
fix jgrowl position and remove some redundant css
2017-03-19 14:20:21 +01:00
d78b64d5b3
fix narrow navbar setting and contextual-help position
2017-03-19 14:00:59 +01:00
0938db8f7b
Merge branch 'dev' into bs4
2017-03-19 13:33:45 +01:00
d2c971eda9
fix php warning and remove logging
2017-03-19 13:33:02 +01:00
57584ea429
remove redundant css
2017-03-19 13:28:06 +01:00
49d84a364d
css fixes
2017-03-19 13:21:30 +01:00
89b5507354
fix custom fontsize for app
2017-03-19 12:10:16 +01:00
2a25ddff36
bs4 fixes
2017-03-19 10:51:58 +01:00
8764cdf16a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-18 16:56:37 -07:00
a45dd09fc0
issue #699
2017-03-18 16:56:18 -07:00
b2ad4e8c2a
bs4 fixes
2017-03-18 23:45:55 +01:00
2bdf63d069
more abook_edit and some css
2017-03-18 22:01:46 +01:00
b897fd8315
more abook_edit
2017-03-18 20:02:13 +01:00
82b35e2762
fix abook_edit and private mail
2017-03-18 20:00:32 +01:00
56f32104d5
Merge branch 'dev' into bs4
2017-03-18 17:29:38 +01:00
2556d05602
bs4 fixes
2017-03-18 17:28:46 +01:00
7b06cb6682
Merge pull request #698 from dawnbreak/dev
...
Missed one old Markdown()
2017-03-18 14:19:47 +01:00
cbd401c3e8
Missed one old Markdown()
2017-03-18 14:15:02 +01:00
9277806664
fix usermenu radius
2017-03-17 21:42:27 +01:00
828028259c
css fixes
2017-03-17 20:48:06 +01:00
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
4c2bdc9dc0
Merge branch 'dev' into bs4
2017-03-16 09:46:09 +01:00
472a824a1e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-15 16:02:45 -07:00
16df1c1ad4
Merge pull request #569 from dawnbreak/QA_testing
...
[FEATURE] Extend Travis CI integration.
2017-03-16 10:02:17 +11:00
2dce86d38e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-15 15:55:33 -07:00
a73ea134cd
re-add spaces between tags
2017-03-15 21:22:16 +01:00
e7a5aa7b9c
js fixes
2017-03-15 17:28:00 +01:00
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
0c74c79b18
Merge branch 'dev' into bs4
2017-03-15 12:42:18 +01:00
0c973cc9fa
various fixes
2017-03-15 12:41:37 +01:00
62c921815f
better handling of mimetype security
2017-03-15 12:39:34 +01:00
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
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
cb2eee1d2e
👷 Add old MySQL 5.5 to Travis CI again.
...
The trusty distro contains MySQL 5.6. Add a precise distro with MySQL 5.5.
Unfortunately 5.7 is not yet provided, which would be interesting
because of the enabled strict SQL mode.
2017-03-14 20:40:53 +01:00
8e80500ee6
👷 use PHP7.1 and add PostgreSQL9.6
...
Use newer distro for Travis CI runs.
New environment provides PostgreSQL9.6.
Also no need to install custom Doxygen, made it optional.
Changed default PHP environment from PHP7.0 to current PHP7.1.
Changed codecoverage reporting.
2017-03-14 20:39:57 +01:00
03db9833e8
💚 Update Travis CI's Doxygen.
...
Travis CI has Doxygen 1.7. We need 1.8 to generate our API
documentation. Get a static version and use it.
Always build API Documentation, but changed Doxygen configuration to
only print out errors in the documentation generation, so these can be
reviewed.
2017-03-14 20:36:38 +01:00
33153b8f3a
[FEATURE] 👷 Extend Travis CI integration.
...
Testing several Travis CI features.
Add DBs to travis execution matrix.
Doxygen API docu generation and deployment to gh-pages.
Update phpunit to 5.7.
2017-03-14 20:31:13 +01:00
3b2398ed01
css fixes
2017-03-14 18:59:27 +01:00
a0a376e95e
hide nav search behind a button, css fixes and cleanup
2017-03-14 18:31:19 +01:00
7b9df1d401
css fixes
2017-03-14 14:12:44 +01:00
41c2f74772
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-13 15:13:31 -07:00
700c05a55b
many class fixes and revive shiny class for item titles in a new way
2017-03-13 16:34:23 +01:00
188782c461
merge dev into bs4
2017-03-13 11:11:20 +01:00
bdfdd23b36
Merge pull request #697 from anaqreon/dev
...
Add id to app-menu for JS access
2017-03-13 11:00:19 +01:00
9f0c3b496b
we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
2017-03-13 10:30:41 +01:00
Mario Vavti
zotlabs
Klaus