zotlabs
08e21fd0b8
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-05-10 17:11:17 -07:00
Mario Vavti
582d075c45
missing clearfix
2017-05-10 17:39:49 +02:00
zotlabs
f840082aae
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-05-05 16:58:46 -07:00
Mario Vavti
3ccefa20e8
collapse sysapps if viewing a remote channel
2017-05-05 16:33:28 +02:00
Mario Vavti
5dd501e0ea
css fix
2017-05-05 12:58:27 +02:00
zotlabs
7acb068590
profile_sidebar hook ignored the updated html content
2017-05-02 18:24:18 -07:00
zotlabs
80ec92ce8d
Revert "move theme specific files to theme dir"
...
This reverts commit e332d1074f
2017-05-02 12:46:50 -07:00
zotlabs
e332d1074f
move theme specific files to theme dir
2017-05-01 21:10:04 -07:00
zotlabs
42ed73ed4a
add cdav files
2017-05-01 21:07:11 -07:00
zotlabs
88149f56bb
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-26 20:11:12 -07:00
Mario Vavti
d1c84ad9f0
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-04-26 14:20:16 +02:00
zotlabs
7667c630a4
provide a broken feed for services which require a broken feed
2017-04-26 14:12:11 +02:00
zotlabs
b88be137ca
provide a broken feed for services which require a broken feed
2017-04-25 20:48:38 -07:00
Andrew Manning
8ad2b3e7a1
When template "none" is used in a webpage layout, then the contents of the page should be the sole output, with no other code before or after the page element content.
2017-04-23 21:22:40 -04:00
zotlabs
397fef519c
give the item_obscured flag a new lease on life by using it to designate third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends.
2017-04-18 21:18:49 -07:00
zotlabs
a037758245
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-18 18:18:53 -07:00
Mario Vavti
ab369ab91d
more lock carets
2017-04-18 14:29:56 +02:00
Mario Vavti
9ce5e25507
the caret beside the lock seems a little overkill
2017-04-18 14:15:38 +02:00
zotlabs
7a31c039fb
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-17 16:04:17 -07:00
Mario Vavti
7cca2b7fb0
missing clearfix
2017-04-16 12:09:09 +02:00
Klaus Weidenbach
b6459e6172
⬆️ Update SimplePie library.
...
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.
2017-04-15 00:41:42 +02:00
Mario Vavti
0f0fba0e9e
missing includes
2017-04-13 23:20:09 +02:00
zotlabs
e682b93883
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-07 15:00:31 -07:00
zotlabs
dbef80f7bd
fix from downstream
2017-04-07 13:37:18 -07:00
Mario Vavti
df4e193990
the string was there but the template var was wrong
2017-04-07 13:35:17 +02:00
Mario Vavti
28207c3313
css fixes and missing string
2017-04-07 11:31:10 +02:00
zotlabs
7256579c16
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-31 17:27:18 -07:00
Mario Vavti
1bcee2f11c
various form css fixes
2017-03-31 16:13:58 +02:00
Mario Vavti
d9ee8b2c32
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2017-03-31 13:59:43 +02:00
Mario Vavti
614366e499
css fixes
2017-03-31 13:59:28 +02:00
git-marijus
89e3f3210f
Merge pull request #710 from dawnbreak/importcsrf
...
🔒 Add CSRF protection for import and import_items.
2017-03-31 13:40:02 +02:00
Mario Vavti
dc55c710da
add max height to #navbar-collapse-2
2017-03-31 13:38:55 +02:00
zotlabs
c4f5d17db6
Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf
2017-03-30 21:05:31 -07:00
Klaus Weidenbach
81736a0129
🔒 Add CSRF protection for import and import_items.
2017-03-30 23:17:32 +02:00
zotlabs
2d4f84563b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-29 16:11:50 -07:00
zotlabs
a8a6d807ff
allow setting the system email name/address/reply
2017-03-29 14:14:40 +02:00
zotlabs
b03cd330e5
begin the process of using the relevant attach directory/path for photo albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact
2017-03-29 14:09:19 +02:00
zotlabs
542fa4a08c
more markdown purification
2017-03-29 14:05:12 +02:00
zotlabs
e97dd48b4c
even more fine tuning of the markdown purifier - especially when used with the wiki
2017-03-29 14:03:24 +02:00
zotlabs
d5525a38f1
various input filter fixes
2017-03-29 13:56:31 +02:00
zotlabs
ee46faff1a
dim class was un-themed
2017-03-29 13:42:17 +02:00
zotlabs
3ee4dd0d52
remove the unimplemented upload limit site settings
2017-03-29 13:33:15 +02:00
zotlabs
d12b360e92
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-28 14:58:48 -07:00
Mario Vavti
5564b47dbc
minor bs4 fixes
2017-03-28 23:44:50 +02:00
Mario Vavti
171b6a222d
fixes for latest bootstrap
2017-03-28 15:41:12 +02:00
zotlabs
8292553a20
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-27 14:11:25 -07:00
Mario Vavti
f66aa336ac
fix app rendering
2017-03-27 12:55:11 +02:00
Mario Vavti
eab9040ee7
unify css classes
2017-03-27 11:20:59 +02:00
Mario Vavti
099b30afbf
css fixes
2017-03-27 10:29:26 +02:00
zotlabs
5cbf603203
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-26 14:40:20 -07:00
