Michael Meer
aa285b83c1
to make visible what I try, ping still won't work, but I'm confused about get_channel
2014-01-28 10:58:31 +01:00
Michael Meer
8ddee71c2b
Merge branch 'master' of https://github.com/friendica/red
...
to be in sync with main repro
2014-01-28 09:49:09 +01:00
friendica
f104b4dc27
preserve expiration when editing
2014-01-27 23:49:42 -08:00
friendica
8c80589b5a
chat data structures
2014-01-27 21:02:57 -08:00
friendica
eb21bbdd55
Ajaxchat package has way too many incompatible assumptions - after a lot of review, we can't work with it without re-writing huge chunks. Think I'll just start fresh. Ajax chat isn't that hard and we can do stuff with it that you just can't do with other chat clients because - well we've got zot.
2014-01-27 18:37:06 -08:00
friendica
3100b5d93e
photo tagging still broken - but at least don't create a new linked item every time a photo is edited.
2014-01-27 18:06:09 -08:00
friendica
d9794b981d
In order to provide ajax chat accessible by remote visitors (xchans), we need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration.
2014-01-27 15:55:08 -08:00
friendica
24bac92acd
after rposting - if there's no remote_return, go to your matrix page rather than leave you on a blank rpost page.
2014-01-27 15:25:04 -08:00
friendica
9551f6b404
Merge https://github.com/friendica/red into zpull
2014-01-27 14:47:58 -08:00
friendica
d6a9497e4a
cleanup include/menu in preparation for the next phase of bookmarking
2014-01-27 14:46:39 -08:00
Michael Meer
904db593df
add a temporary logger command at remote server side
2014-01-27 12:01:53 +01:00
marijus
b39475db86
Merge branch 'master' of https://github.com/friendica/red
2014-01-27 10:57:46 +01:00
Michael Meer
a3bf272753
Merge branch 'master' of https://github.com/MicMee/red
...
to be in sync
2014-01-27 10:37:15 +01:00
friendica
d67fdd1299
add davguest param to cut/paste link for directories in mod/filestorage
2014-01-26 14:41:43 -08:00
friendica
d296b02b0e
The final piece of the DAV authentication puzzle. Provide a directory view to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied.
2014-01-26 14:15:57 -08:00
marijus
4ce6335364
Revert "disable feature setting for collections and make feature settings for personal and new tab working."
...
This reverts commit ed00301bb6
.
2014-01-26 14:44:55 +01:00
marijus
44658f7b7f
Merge branch 'master' of https://github.com/friendica/red
2014-01-26 14:43:07 +01:00
friendica
0948c3c3ca
allow site defaults for enabled features
2014-01-26 03:27:36 -08:00
friendica
f90b3b60cb
don't prompt guests for a password if they're accessing an embedded public file.
2014-01-26 02:58:03 -08:00
marijus
7b52295f8b
Merge branch 'master' of https://github.com/friendica/red
2014-01-26 05:04:29 +01:00
friendica
b5c6db1205
Merge https://github.com/friendica/red into zpull
2014-01-25 15:51:32 -08:00
friendica
339a0f69c1
some tweaks to items_fetch for the api
2014-01-25 15:51:10 -08:00
root
8b399b2fb8
Typo
2014-01-25 23:06:44 +00:00
friendica
6911439f0e
Merge pull request #284 from cvogeley/master
...
API changes
2014-01-25 15:03:23 -08:00
friendica
e68c01cc48
set session['my_address'] to current site in change channel, not primary hub location. Also remove all the old Friendica-style authentication code.
2014-01-25 14:39:09 -08:00
Christian Vogeley
a25b8c951b
Check user_info['self] in api user_timeline
2014-01-25 22:56:15 +01:00
marijus
ed00301bb6
disable feature setting for collections and make feature settings for personal and new tab working.
2014-01-25 14:50:05 +01:00
Christian Vogeley
b71e855c5b
remove wall restriction
...
original didn’t have that
2014-01-25 13:44:31 +01:00
friendica
f3fd9535a4
Merge https://github.com/friendica/red into zpull
2014-01-25 02:55:17 -08:00
friendica
4b66a399e4
get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden
2014-01-25 02:53:31 -08:00
tobiasd
79f3d46fe8
Merge pull request #285 from tobiasd/de20140125
...
DE: update to the strings
2014-01-24 22:32:12 -08:00
Tobias Diekershoff
88f25191e0
DE: update to the strings
2014-01-25 07:28:30 +01:00
friendica
c71a1f0796
Merge pull request #283 from beardy-unixer/master
...
Add admin info to admin panel and site info.
2014-01-24 21:20:00 -08:00
Christian Vogeley
6b3ea9dc14
API My wall posts
2014-01-25 03:50:47 +01:00
Thomas Willingham
692822bdf0
Left over line from placeholder.
2014-01-25 00:13:29 +00:00
Thomas Willingham
d3a0d37b0d
Add admin info to admin panel and site info.
...
Since we can have multiple admins, this is freeform bbcode.
2014-01-24 23:58:41 +00:00
friendica
3869b16298
prettyphoto (js|css) not found
2014-01-24 14:35:32 -08:00
Michael Meer
844df11058
Merge branch 'master' of https://github.com/friendica/red
...
to be in sync with master repro
2014-01-24 11:59:15 +01:00
friendica
21f6549204
Merge https://github.com/friendica/red into zpull
2014-01-23 23:47:08 -08:00
friendica
3490604926
add zid to audio/video (again)
2014-01-23 23:46:43 -08:00
Thomas Willingham
ad67d3e483
Ooops, included site specific hack
2014-01-24 03:48:54 +00:00
Thomas Willingham
d57361ea4a
Make share previews a bit longer. We can't go any longer than this
...
without suhosin starting to break things for channels with long names
- this limit works with the channel with the longest name in the matrix
today, but we may need to make this a pconfig anyway.
2014-01-24 03:44:50 +00:00
friendica
357ddd1bf7
display a somewhat more pleasant hovertip on qr codes
2014-01-23 15:53:29 -08:00
friendica
de061efefa
Merge https://github.com/friendica/red into zpull
2014-01-23 15:43:59 -08:00
friendica
ab6b6794b4
fix marital partner linking
2014-01-23 15:43:35 -08:00
friendica
108d49e603
Merge pull request #281 from beardy-unixer/master
...
Kill prettyphoto
2014-01-23 14:54:20 -08:00
friendica
9402be6cdc
Merge https://github.com/friendica/red into zpull
2014-01-23 14:36:55 -08:00
friendica
5e4f45c03a
mod_profperm migrated
2014-01-23 14:35:59 -08:00
Michael Meer
a2b07ed281
build url, deleted logger commands
2014-01-23 13:58:14 +01:00
Michael Meer
f870de31a4
Merge branch 'master' of https://github.com/friendica/red
...
to be in sync with main repro
2014-01-23 12:11:45 +01:00