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
Mario Vavti
10e5cf01cc
css fixes
2017-04-16 10:59:26 +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
Mario Vavti
54f25609c9
bs font set might work better for win and mac
2017-04-13 12:28:38 +02:00
git-marijus
1f951e2bd3
Merge pull request #714 from mjfriaza/dev
...
Updated the Spanish translation
2017-04-11 06:55:12 +02:00
Manuel Jiménez Friaza
10f9f9cc80
Updated the Spanish translation
2017-04-10 12:50:42 +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
git-marijus
06b0c89aee
Merge pull request #712 from zotlabs/fr_update
...
Fr update (Monret)
2017-04-07 21:00:37 +02: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
8cb4a29a51
revert grid and bars icon size change
2017-04-05 19:21:27 -07:00
zotlabs
6710a77c26
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-04-05 17:14:11 -07:00
Mario Vavti
a4f6c24273
we should probably stick to 0.875rem font-size (this is equal to 14px with a default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size.
2017-04-05 21:34:36 +02:00
Mario Vavti
53853814ff
adjust font-size
2017-04-05 21:13:48 +02:00
Mario Vavti
fb31f629c6
update bd-dev and remove hotfix
2017-04-05 14:12:18 +02:00
zotlabs
d2bafdb2bf
fr strings update (Monret)
2017-04-03 15:56:47 -07:00
zotlabs
2d9ae8ff2c
Revert "fr strings update (Monret)"
...
This reverts commit 4e4d406d23
2017-04-03 15:55:03 -07:00
zotlabs
4e4d406d23
fr strings update (Monret)
2017-04-03 15:53:48 -07: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
95f4f14dca
triple a is more sane
2017-03-31 19:14:24 +02:00
Mario Vavti
391854058e
minor css adjustments
2017-03-31 18:13:36 +02:00
Mario Vavti
1bcee2f11c
various form css fixes
2017-03-31 16:13:58 +02:00
Mario Vavti
572a04b40a
make btn-outline-secondary color slightly darker
2017-03-31 14:20:13 +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
zotlabs
a9cceea850
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-30 16:10:59 -07:00
Klaus Weidenbach
81736a0129
🔒 Add CSRF protection for import and import_items.
2017-03-30 23:17:32 +02:00
Mario Vavti
5abe7d2dfb
more css fixes
2017-03-30 12:08:10 +02:00
Mario Vavti
4da65183e0
css fixes
2017-03-30 11:45:16 +02:00
zotlabs
2d4f84563b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-29 16:11:50 -07:00
Mario Vavti
e90e4e4a59
css fixes
2017-03-29 14:45:50 +02: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
