aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-28209-24210/+141
|\ | | | | | | to be in sync with main repro
| * preserve expiration when editingfriendica2014-01-273-4/+11
| |
| * chat data structuresfriendica2014-01-273-11/+110
| |
| * Ajaxchat package has way too many incompatible assumptions - after a lot of ↵friendica2014-01-27197-24152/+0
| | | | | | | | 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.
| * photo tagging still broken - but at least don't create a new linked item ↵friendica2014-01-273-1/+7
| | | | | | | | every time a photo is edited.
| * In order to provide ajax chat accessible by remote visitors (xchans), we ↵friendica2014-01-271-5/+5
| | | | | | | | 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.
| * after rposting - if there's no remote_return, go to your matrix page rather ↵friendica2014-01-271-2/+4
| | | | | | | | than leave you on a blank rpost page.
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-272-4/+27
| |\
| * | cleanup include/menu in preparation for the next phase of bookmarkingfriendica2014-01-273-42/+11
| | |
* | | add a temporary logger command at remote server sideMichael Meer2014-01-271-0/+1
| |/ |/|
* | Merge branch 'master' of https://github.com/MicMee/redMichael Meer2014-01-2766-1685/+1831
|\| | | | | | | to be in sync
| * add davguest param to cut/paste link for directories in mod/filestoragefriendica2014-01-262-4/+2
| |
| * The final piece of the DAV authentication puzzle. Provide a directory view ↵friendica2014-01-262-6/+10
| | | | | | | | 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.
| * allow site defaults for enabled featuresfriendica2014-01-262-1/+3
| |
| * don't prompt guests for a password if they're accessing an embedded public file.friendica2014-01-263-4/+24
| |
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-251-2/+3
| |\
| | * Typoroot2014-01-251-2/+3
| | |
| * | some tweaks to items_fetch for the apifriendica2014-01-252-19/+21
| |/
| * Merge pull request #284 from cvogeley/masterfriendica2014-01-252-24/+47
| |\ | | | | | | API changes
| | * Check user_info['self] in api user_timelineChristian Vogeley2014-01-251-4/+13
| | |
| | * remove wall restrictionChristian Vogeley2014-01-251-2/+1
| | | | | | | | | | | | original didn’t have that
| | * API My wall postsChristian Vogeley2014-01-252-21/+33
| | |
| | * Add $since_id to items_fetchChristian Vogeley2014-01-221-2/+5
| | |
| * | set session['my_address'] to current site in change channel, not primary hub ↵friendica2014-01-251-85/+1
| | | | | | | | | | | | location. Also remove all the old Friendica-style authentication code.
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-256-1307/+1332
| |\ \
| | * \ Merge pull request #285 from tobiasd/de20140125tobiasd2014-01-242-1302/+1309
| | |\ \ | | | | | | | | | | DE: update to the strings
| | | * | DE: update to the stringsTobias Diekershoff2014-01-252-1302/+1309
| | |/ /
| | * | Merge pull request #283 from beardy-unixer/masterfriendica2014-01-244-5/+23
| | |\ \ | | | | | | | | | | Add admin info to admin panel and site info.
| | | * | Left over line from placeholder.Thomas Willingham2014-01-251-1/+0
| | | | |
| | | * | Add admin info to admin panel and site info.Thomas Willingham2014-01-244-5/+24
| | |/ / | | | | | | | | | | | | Since we can have multiple admins, this is freeform bbcode.
| * / / get rid of bootstrap's blockqote margin css which is just bloody wrong and ↵friendica2014-01-253-2/+3
| |/ / | | | | | | | | | can't easily be over-ridden
| * | prettyphoto (js|css) not foundfriendica2014-01-2449-259/+413
| | |
* | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2452-972/+605
|\| | | | | | | | | | | to be in sync with master repro
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-2/+3
| |\ \
| | * | Ooops, included site specific hackThomas Willingham2014-01-241-6/+0
| | | |
| | * | Make share previews a bit longer. We can't go any longer than thisThomas Willingham2014-01-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | add zid to audio/video (again)friendica2014-01-232-13/+50
| |/ /
| * | display a somewhat more pleasant hovertip on qr codesfriendica2014-01-231-1/+1
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-2344-411/+0
| |\ \
| | * \ Merge pull request #281 from beardy-unixer/masterfriendica2014-01-2344-411/+0
| | |\ \ | | | | | | | | | | Kill prettyphoto
| | | * | Nobody seems to be using that anymoreThomas Willingham2014-01-2344-411/+0
| | | | |
| * | | | fix marital partner linkingfriendica2014-01-232-26/+24
| |/ / /
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-1/+1
| |\ \ \
| * | | | mod_profperm migratedfriendica2014-01-234-519/+527
| | | | |
* | | | | build url, deleted logger commandsMichael Meer2014-01-231-4/+3
| | | | |
* | | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-233-2/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | to be in sync with main repro
| * | | | the bootstrap theme is obsolete, use clean insteadtobiasd2014-01-231-1/+1
| |/ / /
| * | | missing filename in uploaded photos (we don't really use this, but we will ↵friendica2014-01-222-1/+2
| | | | | | | | | | | | | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice).
* | | | preperation for ping, need training in SQL :(Michael Meer2014-01-231-1/+6
| | | |
* | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-236-24/+58
|\| | | | | | | | | | | | | | | to be in sync with main repro
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 12:44:57 +0000