Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | clean up logger commands. Placed apostrophs at the end from some comments to ↵ | Michael Meer | 2014-01-30 | 2 | -9/+2 |
| | | | | keep the syntax highlighting in vi working | ||||
* | attempt with fix URL for testing works | Michael Meer | 2014-01-30 | 2 | -3/+10 |
| | |||||
* | a bit more ajax work on chat and chatsvc and some fiddling with layouts | friendica | 2014-01-30 | 1 | -1/+1 |
| | |||||
* | chatroom management front-end stuff | friendica | 2014-01-29 | 1 | -1/+2 |
| | |||||
* | apply service class limits (at the account level) to chatroom creation as ↵ | friendica | 2014-01-29 | 1 | -0/+12 |
| | | | | chat has the potential to adversely affect system performance. In the future we may also want to service_class restrict the number of participants in a room. | ||||
* | more chat infrastructure | friendica | 2014-01-29 | 1 | -6/+9 |
| | |||||
* | more testing of chatroom interfaces, also corrected a function call that ↵ | friendica | 2014-01-29 | 3 | -3/+6 |
| | | | | should have been a class instantiation in reddav | ||||
* | Merge pull request #290 from git-marijus/master | friendica | 2014-01-29 | 1 | -10/+39 |
|\ | | | | | add image floating to bbcode | ||||
| * | minor whitespace cleanup | marijus | 2014-01-30 | 1 | -1/+0 |
| | | |||||
| * | add image floating to bbcode | marijus | 2014-01-30 | 1 | -10/+40 |
| | | |||||
* | | Don't look for emoticons inside the matching angle brackets of HTML tags ↵ | toclimb | 2014-01-29 | 1 | -13/+12 |
|/ | | | | (seriously) | ||||
* | chatroom permissions enforcement | friendica | 2014-01-29 | 1 | -0/+19 |
| | |||||
* | debug chatroom_list widget | friendica | 2014-01-29 | 1 | -1/+2 |
| | |||||
* | issues uncovered whilst testing the chatroom API | friendica | 2014-01-29 | 1 | -8/+10 |
| | |||||
* | chatroom list widget backend | friendica | 2014-01-29 | 2 | -0/+18 |
| | |||||
* | basic chatroom management backend | friendica | 2014-01-29 | 1 | -0/+117 |
| | |||||
* | online indication to the directory popup | friendica | 2014-01-28 | 1 | -0/+22 |
| | |||||
* | online indication on profile sidebar | friendica | 2014-01-28 | 1 | -1/+27 |
| | |||||
* | SECURITY: remove style and class bbcodes | friendica | 2014-01-28 | 1 | -8/+0 |
| | |||||
* | undo pull request #287 | friendica | 2014-01-28 | 1 | -2/+2 |
| | |||||
* | Don't look for text emoticons inside the matching angle brackets of a HTML tag | toclimb | 2014-01-29 | 1 | -0/+2 |
| | |||||
* | preserve expiration when editing | friendica | 2014-01-27 | 2 | -1/+2 |
| | |||||
* | cleanup include/menu in preparation for the next phase of bookmarking | friendica | 2014-01-27 | 1 | -41/+9 |
| | |||||
* | The final piece of the DAV authentication puzzle. Provide a directory view ↵ | friendica | 2014-01-26 | 1 | -1/+1 |
| | | | | 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 | 1 | -0/+2 |
| | |||||
* | don't prompt guests for a password if they're accessing an embedded public file. | friendica | 2014-01-26 | 1 | -1/+1 |
| | |||||
* | 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-23 | 1 | -2/+3 |
|\ \ | |||||
| * | | Ooops, included site specific hack | Thomas Willingham | 2014-01-24 | 1 | -6/+0 |
| | | | |||||
| * | | Make share previews a bit longer. We can't go any longer than this | Thomas Willingham | 2014-01-24 | 1 | -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) | friendica | 2014-01-23 | 2 | -13/+50 |
|/ / | |||||
* | | display a somewhat more pleasant hovertip on qr codes | friendica | 2014-01-23 | 1 | -1/+1 |
| | | |||||
* | | fix marital partner linking | friendica | 2014-01-23 | 1 | -0/+10 |
| | | |||||
* | | missing filename in uploaded photos (we don't really use this, but we will ↵ | friendica | 2014-01-22 | 2 | -1/+2 |
| | | | | | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice). | ||||
* | | fix api/red/photos when supplied with an album name | friendica | 2014-01-22 | 1 | -1/+1 |
| | | |||||
* | | API: provide a link to photo albums in api/red/albums | friendica | 2014-01-22 | 1 | -1/+5 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-22 | 2 | -7/+10 |
|\ \ | |||||
| * \ | Merge pull request #279 from git-marijus/master | friendica | 2014-01-22 | 2 | -5/+5 |
| |\ \ | | | | | | | | | make network tabs regard selected group (collection) and vice versa | ||||
| | * | | update argument ?f= | marijus | 2014-01-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | make network tabs regard selected group (collection) and vice versa | marijus | 2014-01-22 | 2 | -4/+4 |
| | |/ | |||||
| * / | Give pages enough to construct a share button. | Thomas Willingham | 2014-01-22 | 1 | -2/+5 |
| |/ | |||||
* / | try to reduce the number of simulaneous deliveries of the same post when ↵ | friendica | 2014-01-22 | 2 | -15/+42 |
|/ | | | | 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. |