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
Mario Vavti
c327b00efa
fix app-icon color and use bs class for w100
2017-03-26 13:45:27 +02:00
Mario Vavti
7634d4ce69
fix nav menu caret
2017-03-26 13:27:46 +02:00
Mario Vavti
98c6548d64
fix and cleanup custom theme settings
2017-03-26 13:15:15 +02:00
zotlabs
e5e0a6b31f
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2017-03-25 14:40:31 -07:00
Mario Vavti
90ab050493
fix active state
2017-03-24 19:41:58 +01:00
Mario Vavti
aadfb97d5a
missing badge-default class
2017-03-24 15:50:54 +01:00
Mario Vavti
cb6c21ce90
do not return false here. it can lead to unresponsive links under certain situations.
2017-03-24 10:09:02 +01:00
Mario Vavti
1171e1dd9c
fix viewconnections
2017-03-23 14:15:08 +01:00
Mario Vavti
43a794a905
bs4 fixes for events
2017-03-23 13:11:27 +01:00
zotlabs
c3c1572683
allow setting the system email name/address/reply
2017-03-22 21:40:43 -07:00
Mario Vavti
3a7db8ec60
fix embed image modals
2017-03-22 13:15:53 +01:00
Mario Vavti
efdd95fe7f
css fixes
2017-03-22 11:52:22 +01:00
zotlabs
bedc393425
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-21 20:11:48 -07:00
Mario Vavti
a7d184ba54
add generic-icons-nav class
2017-03-21 13:59:44 +01:00
Mario Vavti
546867c102
add icon, name and thumb to profile tabs. remove login app - we have login in the panel now.
2017-03-21 13:38:44 +01:00
Mario Vavti
42fbc28b11
missing template
2017-03-21 12:00:19 +01:00
zotlabs
82631c3413
more markdown purification
2017-03-21 00:40:19 -07:00
zotlabs
35fc7328de
even more fine tuning of the markdown purifier - especially when used with the wiki
2017-03-20 19:41:03 -07:00
zotlabs
7a611c6d47
create channel_store_lowlevel() and remove more diaspora stuff from core.
2017-03-20 18:14:50 -07:00
Mario Vavti
a6f232f2b0
really fix fullscreen and fix some issues in chat
2017-03-20 23:20:14 +01:00
Mario Vavti
cbcd195461
fix webpages widgets
2017-03-20 22:39:29 +01:00
Mario Vavti
837efcf5e7
fix fullscreen and bbco_autocomplete popup rendering
2017-03-20 20:59:46 +01:00
Mario Vavti
8b0bcdb2a5
minor fixes
2017-03-20 20:13:10 +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
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
2a25ddff36
bs4 fixes
2017-03-19 10:51:58 +01:00
zotlabs
4afeefb5ce
various input filter fixes
2017-03-18 16:41:43 -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
2556d05602
bs4 fixes
2017-03-18 17:28:46 +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
a73ea134cd
re-add spaces between tags
2017-03-15 21:22:16 +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
0c973cc9fa
various fixes
2017-03-15 12:41:37 +01:00
zotlabs
32a9487ff9
use dim for the button border also
2017-03-14 18:46:50 -07:00
zotlabs
e891380ed5
dim class was un-themed
2017-03-14 18:42:51 -07: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
41fd729209
remove the unimplemented upload limit site settings
2017-03-13 18:40:07 -07:00
zotlabs
02b390d7b8
Merge branch 'dev' into red
2017-03-13 15:13:59 -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
zotlabs
6f3493bb3c
db issues
2017-03-12 15:50:47 -07: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
Mario Vavti
83d07b9551
font size and post title adjust
2017-03-11 15:07:30 +01: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
zotlabs
1a49f0d164
one role.
2017-03-09 18:54:10 -08: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
7445f1881e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-03-02 17:36:14 -08:00
zotlabs
e58dc726c5
activity widget - like the forum widget but represents unseen activity by author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding.
2017-03-02 17:32:43 -08:00
Mario Vavti
d4a957ca16
add title to connect button
2017-03-01 11:39:26 +01:00
Mario Vavti
e08e6c182c
minor template fixes
2017-03-01 11:37:02 +01:00
Mario Vavti
360397b2ed
missing css class
2017-02-28 13:23:42 +01:00
zotlabs
85082ea509
fetch profile vcard for connection
2017-02-27 21:14:09 -08:00
zotlabs
1325a81e9a
add file size notes to /cloud actions panel
2017-02-27 15:13:49 -08:00
Mario Vavti
a6d13f290b
fix js issue in markdown mimetype wikis if content contains quotes
2017-02-27 13:52:08 +01:00
Mario Vavti
a41603ed85
missing clear
2017-02-27 10:54:43 +01:00
zotlabs
b1ff5367e7
more work on profile vcards - still a lot of work to go
2017-02-23 19:07:01 -08:00
Mario Vavti
9bab858fd1
move collapsed login and register buttons to the left
2017-02-23 12:32:27 +01:00
Mario Vavti
55924f5c5b
apps improvements
2017-02-22 11:22:43 +01:00
zotlabs
956f0043fc
change text back to 'add apps'
2017-02-21 23:16:05 -08:00
Andrew Manning
3e144baacd
Change Add Apps to Manage Apps and support translation.
2017-02-21 20:32:13 -05:00
zotlabs
02e487f306
this icon also appears to require the fixed-width attribute
2017-02-19 14:14:58 -08:00
Mario Vavti
d4f8a8dedd
add the generic-icons-nav class
2017-02-17 18:32:18 +01:00
Mario Vavti
f23c380cae
add register button for collapsed state
2017-02-17 16:31:36 +01:00
Mario Vavti
7151467db7
fixed width icons for item dropdown
2017-02-17 16:08:18 +01:00
Mario Vavti
16a8416495
css fixes and rename link to full docs to help since its app is also called help
2017-02-17 15:07:20 +01:00
zotlabs
321241da02
add default permcat to channel settings form
2017-02-12 18:40:26 -08:00
Mario Vavti
bc3605a502
whitespace
2017-02-10 10:50:16 +01:00
Mario Vavti
ce4daad431
do not use modal-sm class
2017-02-10 10:02:48 +01:00
Mario Vavti
0360d42d30
add a login button for collapsed state and refine login modal
2017-02-10 10:01:43 +01:00
Mario Vavti
242eede258
wrap resizing in document ready function
2017-02-09 12:01:55 +01:00
zotlabs
91819bfc2d
bringer - all basic functionality is implemented
2017-02-08 17:21:32 -08:00
Mario Vavti
ace0a1cb75
do not show feature button if the app is shared. css fixes
2017-02-08 10:56:03 +01:00
zotlabs
6ceaea8478
open permission tab by default - when you're creating permission categories
2017-02-07 21:03:14 -08:00
zotlabs
30659aef50
initial permcat creation ability, in /settings/permcats; functional permcat creation for testing but still needs a lot of UX work before promoting the ability
2017-02-07 20:29:03 -08:00
zotlabs
46d0e23e7b
atokens - we only need one permission column
2017-02-07 19:49:15 -08:00
zotlabs
723b51c931
provide a few system defined permcats; will require a permission editor page to define new (personal) ones.
2017-02-07 17:17:38 -08:00
zotlabs
6a083e8452
bring back view links for all notification types (esp: network, channel) for easy access
2017-02-06 14:32:50 -08:00
Mario Vavti
c75357faa3
also take care of the collapsed state apps
2017-02-06 20:36:26 +01:00
zotlabs
00cfc4be44
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2017-02-06 11:14:59 -08:00
Mario Vavti
70edcabca1
move icon stuff back to app_render() and send navapps through app_render()
2017-02-06 20:10:10 +01:00
Mario Vavti
5aa1146fe9
minor fixes
2017-02-06 13:58:49 +01:00
Mario Vavti
91bc8d473f
update templates
2017-02-06 13:30:56 +01:00
Mario Vavti
e70c87ed41
merge dev
2017-02-06 10:08:05 +01:00
zotlabs
56a08f0d17
make channel move an option (in addition to cloning)
2017-02-05 20:26:06 -08:00
zotlabs
201a6b8742
nav_login element width was page dependent. Put this in theme css
2017-02-05 14:55:46 -08:00
zotlabs
e2ee4ae024
better theming of rmagic page
2017-02-05 14:45:28 -08:00
zotlabs
73845e01ed
cleanup
2017-02-04 14:58:13 -08:00
Mario Vavti
178e3d5bc8
allow featuring of apps in /apps and update some more apd files
2017-02-04 18:36:50 +01:00
zotlabs
fc4083346e
more work on nav-modal
2017-02-03 15:31:01 -08:00
zotlabs
f79a11cbf7
trying nav-login as modal
2017-02-03 13:47:29 -08:00