zotlabs
|
68f6043d44
|
new content type
|
2017-08-14 17:34:47 -07:00 |
|
zotlabs
|
ba08555efc
|
contact_slider.tpl didn't get updated with one of the bootstrap changes where 'in' was renamed to 'show'
|
2017-08-13 19:44:26 -07:00 |
|
zotlabs
|
f99b62b516
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-08-12 16:11:07 -07:00 |
|
zotlabs
|
2f45182b48
|
add parent item (if applicable) to notifier plugin info
|
2017-08-12 15:42:42 -07:00 |
|
Mario Vavti
|
9da1439a4d
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-08-12 22:45:32 +02:00 |
|
git-marijus
|
4848dc5ec8
|
minor js and css changes
|
2017-08-12 22:29:57 +02:00 |
|
zotlabs
|
998bd585bb
|
add protocol selection to following feeds
|
2017-08-12 00:59:05 -07:00 |
|
Mario Vavti
|
ff1d900ccb
|
bump version
|
2017-08-11 20:46:25 +02:00 |
|
Mario Vavti
|
1808ffcdf2
|
update to bootstrap beta
|
2017-08-11 20:45:29 +02:00 |
|
zotlabs
|
86c4743ed9
|
deliverable_singleton - also check hubloc_hash in case we don't have an xchan_hash
|
2017-08-10 21:43:36 -07:00 |
|
zotlabs
|
1408e3da3b
|
prevent uploads to comments if the channel has a default private ACL.
|
2017-08-10 21:08:07 -07:00 |
|
zotlabs
|
5f6eedcc1a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-08-10 20:34:20 -07:00 |
|
zotlabs
|
7cec3f4dbf
|
include the mastodon summary in the post
|
2017-08-10 18:05:06 -07:00 |
|
Mario Vavti
|
7892ed9e77
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-10 21:59:41 +02:00 |
|
Mario Vavti
|
0e3b5536e2
|
create cdav principal also on client access and remove redundant pconfig check in authentication process
|
2017-08-10 21:58:44 +02:00 |
|
zotlabs
|
6c55e44f4c
|
when following, allow [network]follow_address syntax to connect with a specific network for multi-protocol services
|
2017-08-10 12:49:20 -07:00 |
|
git-marijus
|
5b88e9574f
|
update changelog
|
2017-08-10 11:59:12 +02:00 |
|
git-marijus
|
9411732c1b
|
do not show channel manager and nav channel select if we are in a delegate session
|
2017-08-10 11:41:00 +02:00 |
|
git-marijus
|
d1c7e78990
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-10 09:40:02 +02:00 |
|
Mario Vavti
|
0a96cdd950
|
merge red/master into dev
|
2017-08-10 08:09:02 +02:00 |
|
zotlabs
|
5686901869
|
some doco fixes and other real minor stuff to improve logreading ability
|
2017-08-09 22:45:52 -07:00 |
|
zotlabs
|
6531cbd1d2
|
libxml errors
|
2017-08-09 17:35:03 -07:00 |
|
git-marijus
|
09da109eba
|
update changelog
|
2017-08-09 20:45:59 +02:00 |
|
git-marijus
|
8ab3a4ebd7
|
App::get_channel() does not return the right channel if we are not looking at our own channel. fix issue #841
|
2017-08-09 20:39:59 +02:00 |
|
zotlabs
|
8eb6dafe31
|
only show upload button to those with write_storage permission
|
2017-08-08 23:12:08 -07:00 |
|
zotlabs
|
ca11d7b9a7
|
support upload of files and attachments into comments. This has some repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing.
|
2017-08-08 22:55:47 -07:00 |
|
zotlabs
|
a7a73a5150
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-08-08 17:53:53 -07:00 |
|
git-marijus
|
83b5bbfeea
|
changelog
|
2017-08-08 23:20:20 +02:00 |
|
zotlabs
|
59108b18ae
|
remove some no longer used images/icons
|
2017-08-07 18:19:02 -07:00 |
|
zotlabs
|
c00796d553
|
ostatus feed was missing comments
|
2017-08-06 19:33:51 -07:00 |
|
git-marijus
|
88a4889780
|
Merge pull request #838 from phellmes/dev
Update DE translation strings (also for 2.6RC)
|
2017-08-06 23:40:14 +02:00 |
|
git-marijus
|
3c73228d80
|
Merge pull request #839 from anaqreon/doco
Fix CSS for help page content list in sidebar.
|
2017-08-06 23:39:03 +02:00 |
|
git-marijus
|
1c0c01ccfe
|
make config requirements in apps more universal - provide key and value
|
2017-08-06 23:20:24 +02:00 |
|
git-marijus
|
b0d1fa09c1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2017-08-06 21:41:01 +02:00 |
|
git-marijus
|
68b32cd8f4
|
consolidate disable_discover_tab config if it was not yet set to either 1 or 0 in DB
|
2017-08-06 21:40:39 +02:00 |
|
phellmes
|
d5dcaacf2c
|
Update DE translation strings
|
2017-08-05 14:32:44 +02:00 |
|
Andrew Manning
|
03ca0bfa69
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into doco
|
2017-08-05 11:24:03 +00:00 |
|
zotlabs
|
3aa22c29fd
|
allow channel address to be changed
|
2017-08-04 19:02:41 -07:00 |
|
zotlabs
|
06a211704f
|
auto preview mail on media insertion also
|
2017-08-03 18:28:08 -07:00 |
|
git-marijus
|
a618f70f56
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-08-03 21:59:46 +02:00 |
|
git-marijus
|
9566eab934
|
missing observer hash
|
2017-08-03 21:36:26 +02:00 |
|
git-marijus
|
3c1dff3039
|
fix issue #836 - missing opening form tag
|
2017-08-03 20:35:42 +02:00 |
|
git-marijus
|
7b177be271
|
fix attachment upload for private mail
|
2017-08-03 15:30:40 +02:00 |
|
git-marijus
|
dc7c3f70eb
|
return preview also if we have no attachment
|
2017-08-03 14:08:34 +02:00 |
|
zotlabs
|
d06ce6294d
|
some bb-to-markdown issues
|
2017-08-03 04:55:56 -07:00 |
|
zotlabs
|
21ee29e46d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-08-02 22:12:38 -07:00 |
|
zotlabs
|
bee09a6d8b
|
minor activitypub rendering stuff
|
2017-08-02 22:11:46 -07:00 |
|
www-data
|
ba62f14482
|
Fix CSS for help page content list in sidebar.
|
2017-08-03 01:54:14 +00:00 |
|
git-marijus
|
4ea4a036ef
|
Merge pull request #834 from mjfriaza/dev
Updated the Spanish translation
|
2017-08-02 12:17:07 +02:00 |
|
Manuel Jiménez Friaza
|
2dbf8a5e00
|
Updated the Spanish translation
|
2017-08-02 08:57:30 +02:00 |
|