Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | chatroom permissions enforcement | friendica | 2014-01-29 | 1 | -0/+19 | |
| | | | | | | | | | ||||||
* | | | | | | | | | debug chatroom_list widget | friendica | 2014-01-29 | 2 | -4/+5 | |
| | | | | | | | | | ||||||
* | | | | | | | | | prevent runaway presence indication | friendica | 2014-01-29 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | issues uncovered whilst testing the chatroom API | friendica | 2014-01-29 | 2 | -11/+17 | |
| | | | | | | | | | ||||||
* | | | | | | | | | add template for chatroomlist widget | friendica | 2014-01-29 | 1 | -0/+11 | |
| | | | | | | | | | ||||||
* | | | | | | | | | chatroom list widget backend | friendica | 2014-01-29 | 2 | -0/+18 | |
| | | | | | | | | | ||||||
* | | | | | | | | | basic chatroom management backend | friendica | 2014-01-29 | 3 | -2/+119 | |
| | | | | | | | | | ||||||
* | | | | | | | | | chatpresence timing out too quickly | friendica | 2014-01-28 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | missing file in checkin | friendica | 2014-01-28 | 1 | -0/+11 | |
| | | | | | | | | | ||||||
* | | | | | | | | | online indication to the directory popup | friendica | 2014-01-28 | 3 | -1/+27 | |
| | | | | | | | | | ||||||
* | | | | | | | | | online indication on profile sidebar | friendica | 2014-01-28 | 4 | -2/+33 | |
| | | | | | | | | | ||||||
* | | | | | | | | | SECURITY: remove style and class bbcodes | friendica | 2014-01-28 | 1 | -8/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | undo pull request #287 | friendica | 2014-01-28 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #287 from toclimb/testing | friendica | 2014-01-28 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't look for text emoticons inside the matching angle brackets of a HTML tag | |||||
| * | | | | | | | | | Don't look for text emoticons inside the matching angle brackets of a HTML tag | toclimb | 2014-01-29 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | fix sql query and provide setting to hide online status | friendica | 2014-01-28 | 3 | -1/+11 | |
| | | | | | | | | | ||||||
* | | | | | | | | | basic presence indication | friendica | 2014-01-28 | 1 | -0/+25 | |
| | | | | | | | | | ||||||
* | | | | | | | | | add client field to chatpresence - which will give us a place to put IP ↵ | friendica | 2014-01-28 | 5 | -5/+12 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so. | |||||
* | | | | | | | | preserve expiration when editing | friendica | 2014-01-27 | 3 | -4/+11 | |
| | | | | | | | | ||||||
* | | | | | | | | chat data structures | friendica | 2014-01-27 | 3 | -11/+110 | |
| | | | | | | | | ||||||
* | | | | | | | | Ajaxchat package has way too many incompatible assumptions - after a lot of ↵ | friendica | 2014-01-27 | 197 | -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 ↵ | friendica | 2014-01-27 | 3 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | every time a photo is edited. | |||||
* | | | | | | | | In order to provide ajax chat accessible by remote visitors (xchans), we ↵ | friendica | 2014-01-27 | 1 | -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 ↵ | friendica | 2014-01-27 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than leave you on a blank rpost page. | |||||
* | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-27 | 2 | -4/+27 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of https://github.com/MicMee/red | Michael Meer | 2014-01-27 | 66 | -1685/+1831 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | to be in sync | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-24 | 52 | -972/+605 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with master repro | |||||
| * | | | | | | | | build url, deleted logger commands | Michael Meer | 2014-01-23 | 1 | -4/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-23 | 3 | -2/+3 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro | |||||
| * | | | | | | | | | preperation for ping, need training in SQL :( | Michael Meer | 2014-01-23 | 1 | -1/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-23 | 6 | -24/+58 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be in sync with main repro | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-22 | 2 | -9/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to keep the repros in sync | |||||
| * | | | | | | | | | | | reorg formula data for hubloc checks | Michael Meer | 2014-01-22 | 2 | -5/+15 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | start with hubloc ping | Michael Meer | 2014-01-22 | 1 | -0/+9 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | cleanup include/menu in preparation for the next phase of bookmarking | friendica | 2014-01-27 | 3 | -42/+11 | |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | add davguest param to cut/paste link for directories in mod/filestorage | friendica | 2014-01-26 | 2 | -4/+2 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | The final piece of the DAV authentication puzzle. Provide a directory view ↵ | friendica | 2014-01-26 | 2 | -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 features | friendica | 2014-01-26 | 2 | -1/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | don't prompt guests for a password if they're accessing an embedded public file. | friendica | 2014-01-26 | 3 | -4/+24 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Typo | root | 2014-01-25 | 1 | -2/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | some tweaks to items_fetch for the api | friendica | 2014-01-25 | 2 | -19/+21 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #284 from cvogeley/master | friendica | 2014-01-25 | 2 | -24/+47 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | API changes | |||||
| * | | | | | | | | | Check user_info['self] in api user_timeline | Christian Vogeley | 2014-01-25 | 1 | -4/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | remove wall restriction | Christian Vogeley | 2014-01-25 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original didn’t have that | |||||
| * | | | | | | | | | API My wall posts | Christian Vogeley | 2014-01-25 | 2 | -21/+33 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add $since_id to items_fetch | Christian Vogeley | 2014-01-22 | 1 | -2/+5 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | set session['my_address'] to current site in change channel, not primary hub ↵ | friendica | 2014-01-25 | 1 | -85/+1 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | location. Also remove all the old Friendica-style authentication code. | |||||
* | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 6 | -1307/+1332 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge pull request #285 from tobiasd/de20140125 | tobiasd | 2014-01-24 | 2 | -1302/+1309 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | DE: update to the strings |