Commit graph

18878 commits

Author SHA1 Message Date
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
Klaus Weidenbach
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
Klaus Weidenbach
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
Klaus Weidenbach
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
Klaus Weidenbach
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
Mario Vavti
3b2398ed01 css fixes 2017-03-14 18:59:27 +01:00
Mario Vavti
a0a376e95e hide nav search behind a button, css fixes and cleanup 2017-03-14 18:31:19 +01:00
Mario Vavti
7b9df1d401 css fixes 2017-03-14 14:12:44 +01:00
zotlabs
41c2f74772 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-13 15:13:31 -07:00
Mario Vavti
700c05a55b many class fixes and revive shiny class for item titles in a new way 2017-03-13 16:34:23 +01:00
Mario Vavti
188782c461 merge dev into bs4 2017-03-13 11:11:20 +01:00
git-marijus
bdfdd23b36 Merge pull request #697 from anaqreon/dev
Add id to app-menu for JS access
2017-03-13 11:00:19 +01:00
Mario Vavti
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
61257094b7 fix help menu 2017-03-12 22:21:49 +01:00
Mario Vavti
8aabc6bc3d many dropdown and class fixes. still a long way to go... 2017-03-12 21:11:28 +01:00
Andrew Manning
f68148b7e0 Add id to app-menu for JS access 2017-03-12 13:57:45 -04:00
zotlabs
4a24a8de43 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-11 18:02:38 -08:00
jeroenpraat
b8ad22f525 Login-box css-fix for Bluegrid scheme 2017-03-11 21:09:42 +01:00
Mario Vavti
d9ecca8591 Merge branch 'dev' into bs4 2017-03-11 15:08:54 +01:00
Mario Vavti
83d07b9551 font size and post title adjust 2017-03-11 15:07:30 +01:00
git-marijus
ee03391293 Merge pull request #693 from anaqreon/dev
Take me home instead of get me home
2017-03-11 10:58:03 +01:00
zotlabs
30503d6533 strings 2017-03-10 12:45:40 -08:00
Mario Vavti
0f9ddbf3b2 fixing classes 2017-03-10 17:02:55 +01:00
Mario Vavti
b1c97dfcfd some sed magic on button class names 2017-03-10 10:47:30 +01:00
Andrew Manning
a2371d56fd Take me home instead of get me home 2017-03-09 20:43:16 -05:00
Mario Vavti
14d1912115 upgrade bs to latest git and some more progress 2017-03-09 22:04:17 +01:00
Mario Vavti
c42cbda904 remove navbar-toggler-left class 2017-03-09 10:45:55 +01:00
Mario Vavti
39d56fd08f initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again 2017-03-09 10:17:57 +01:00
zotlabs
403f4c1a6b Monday is a proper name and should be capitalised (except in private conversation amongst unix geeks). 2017-03-08 19:23:11 -08:00
Mario Vavti
8e3a026276 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-03-07 12:08:43 +01:00
jeroenpraat
b5ddd08630 Big 2.2 string update Dutch 2017-03-07 12:08:16 +01:00
zotlabs
a037590ce3 allow post_activity_item to be passed an empty ACL without resetting to channel default 2017-03-06 21:01:17 -08:00
zotlabs
a18e8e1ede add public_policy to the nwiki container also. This should not affect the recent bug as presented, but is being added for consistency. 2017-03-06 17:59:34 -08:00
zotlabs
595cb13d8f correct fix for wiki anonymous read issue (items_permissions_sql checks item.public_policy which was set for posts, not wikis) 2017-03-06 15:33:10 -08:00
Mario Vavti
9e44b07275 allow unauthenticated access to public wiki pages 2017-03-06 22:32:05 +01:00
Mario Vavti
99e681c09f do not collapse long nsfw content 2017-03-06 11:52:07 +01:00
zotlabs
4f5e9d77b2 remove include/probe.php which has never completed development and has never been used 2017-03-05 20:45:21 -08:00
zotlabs
4c0c153b8f move emoji emoticons (not reactions) to plugin 2017-03-05 16:18:09 -08:00
zotlabs
384db9d10d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-05 11:02:19 -08:00
zotlabs
5d8b0acc16 Merge pull request #689 from mjfriaza/dev
Translated the last strings into Spanish version
2017-03-05 19:25:41 +11:00
Manuel Jiménez Friaza
3d23f4ec77 Translated the last strings into Spanish version 2017-03-05 08:50:53 +01:00
zotlabs
215bd07f0b Merge pull request #688 from dawnbreak/markdown
⬆️ 🔨 Upgrade Markdownify library.
2017-03-05 18:22:37 +11:00
Klaus Weidenbach
6c79e0c077 ⬆️ 🔨 Upgrade Markdownify library.
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.
2017-03-05 01:14:15 +01:00
zotlabs
b2ea61ea3e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-04 11:57:20 -08:00
zotlabs
47d2467e24 minor feed issue 2017-03-04 11:56:59 -08:00