aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #290 from git-marijus/masterfriendica2014-01-291-10/+39
|\ | | | | add image floating to bbcode
| * minor whitespace cleanupmarijus2014-01-301-1/+0
| |
| * add image floating to bbcodemarijus2014-01-301-10/+40
| |
* | Don't look for emoticons inside the matching angle brackets of HTML tags ↵toclimb2014-01-291-13/+12
|/ | | | (seriously)
* chatroom permissions enforcementfriendica2014-01-291-0/+19
|
* debug chatroom_list widgetfriendica2014-01-291-1/+2
|
* issues uncovered whilst testing the chatroom APIfriendica2014-01-291-8/+10
|
* chatroom list widget backendfriendica2014-01-292-0/+18
|
* basic chatroom management backendfriendica2014-01-291-0/+117
|
* online indication to the directory popupfriendica2014-01-281-0/+22
|
* online indication on profile sidebarfriendica2014-01-281-1/+27
|
* SECURITY: remove style and class bbcodesfriendica2014-01-281-8/+0
|
* undo pull request #287friendica2014-01-281-2/+2
|
* Don't look for text emoticons inside the matching angle brackets of a HTML tagtoclimb2014-01-291-0/+2
|
* preserve expiration when editingfriendica2014-01-272-1/+2
|
* cleanup include/menu in preparation for the next phase of bookmarkingfriendica2014-01-271-41/+9
|
* The final piece of the DAV authentication puzzle. Provide a directory view ↵friendica2014-01-261-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 featuresfriendica2014-01-261-0/+2
|
* don't prompt guests for a password if they're accessing an embedded public file.friendica2014-01-261-1/+1
|
* 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-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
| |
* | fix marital partner linkingfriendica2014-01-231-0/+10
| |
* | 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).
* | fix api/red/photos when supplied with an album namefriendica2014-01-221-1/+1
| |
* | API: provide a link to photo albums in api/red/albumsfriendica2014-01-221-1/+5
| |
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-222-7/+10
|\ \
| * \ Merge pull request #279 from git-marijus/masterfriendica2014-01-222-5/+5
| |\ \ | | | | | | | | make network tabs regard selected group (collection) and vice versa
| | * | update argument ?f=marijus2014-01-221-2/+2
| | | |
| | * | make network tabs regard selected group (collection) and vice versamarijus2014-01-222-4/+4
| | |/
| * / Give pages enough to construct a share button.Thomas Willingham2014-01-221-2/+5
| |/
* / try to reduce the number of simulaneous deliveries of the same post when ↵friendica2014-01-222-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.
* fix location of string file in Translations.md, fix some permissions and ↵friendica2014-01-211-15/+24
| | | | owner vagueness (potential bugs) in profile_tabs()
* seems you can't easily have a blank password for DAV guests, so the guest ↵friendica2014-01-211-0/+6
| | | | password is now +++
* add the quota and volume size codefriendica2014-01-211-1/+29
|
* fix the admin interface to pending registrationsfriendica2014-01-211-2/+2
|
* sql errorfriendica2014-01-211-1/+1
|
* added buttons to perform later hubloc actionsMichael Meer2014-01-201-1/+1
|
* zidify audio/video linksfriendica2014-01-201-7/+14
|