Commit graph

9241 commits

Author SHA1 Message Date
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
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
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
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
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
Michael Meer
524fff3a17 preperation for ping, need training in SQL :( 2014-01-23 12:09:35 +01:00
tobiasd
420b330e55 the bootstrap theme is obsolete, use clean instead 2014-01-23 11:58:56 +01:00
friendica
bf8e73ca73 missing filename in uploaded photos (we don't really use this, but we will need to have a filename to export via DAV or API and the original filename would be the most likely choice). 2014-01-22 23:54:14 -08:00
Michael Meer
aec78b3284 Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
2014-01-23 08:50:27 +01:00
friendica
bc98f4ddf4 fix api/red/photos when supplied with an album name 2014-01-22 23:04:19 -08:00
friendica
43f2d6972c API: provide a link to photo albums in api/red/albums 2014-01-22 22:56:16 -08:00
friendica
79c287916f Merge https://github.com/friendica/red into zpull 2014-01-22 22:15:30 -08:00
friendica
66baa3cab0 try to reduce the number of simulaneous deliveries of the same post when dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. 2014-01-22 22:07:47 -08:00
Thomas Willingham
b8ae9014e7 Nobody seems to be using that anymore 2014-01-23 00:23:49 +00:00
friendica
e4bce90b53 Merge pull request #279 from git-marijus/master
make network tabs regard selected group (collection) and vice versa
2014-01-22 14:52:31 -08:00
friendica
927098ae19 Merge pull request #280 from beardy-unixer/master
Give pages enough to construct a share button.
2014-01-22 14:48:22 -08:00
marijus
040d87c999 update argument ?f= 2014-01-22 23:24:09 +01:00