aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'route'friendica2014-03-315-14/+57
|\
| * docofriendica2014-03-311-0/+5
| * finish up the source route storage so we can prevent messages from flowing up...friendica2014-03-314-30/+31
| * source routing stufffriendica2014-03-292-0/+37
* | this is a mess and makes a complicated security model that one can probably d...friendica2014-03-312-5/+7
* | photo timestamp was missing from main profile photo url which prevents photo ...friendica2014-03-312-1/+9
* | issue #378, failure to correctly link tags where one tag contains a substring...friendica2014-03-302-1/+18
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-03-305-7/+7
|\ \
| * \ Merge pull request #387 from beardy-unixer/masterRedMatrix2014-03-315-7/+7
| |\ \
| | * | Missed oneThomas Willingham2014-03-301-1/+1
| | * | Default discover to on.Thomas Willingham2014-03-305-7/+7
* | | | notes widget: jquery.live is deprecated, replacing with jquery.on and binding...friendica2014-03-301-1/+1
|/ / /
* / / revise the sandboxfriendica2014-03-303-3/+3
|/ /
* | typofriendica2014-03-291-1/+1
* | issue #384friendica2014-03-291-28/+35
* | make the discover tab enabled by default the first you use the admin panel, t...friendica2014-03-291-1/+1
|/
* Merge pull request #385 from solstag/masterRedMatrix2014-03-305-12/+18
|\
| * Let the site admin choose whether to display the Discover tab.Alexandre Hannud Abdo2014-03-305-12/+18
|/
* check that aside actually exists before querying the html lengthfriendica2014-03-293-3/+3
* Merge https://github.com/friendica/red into zpullfriendica2014-03-281-1/+3
|\
| * Merge pull request #382 from git-marijus/masterRedMatrix2014-03-291-1/+3
| |\
| | * provide some info to not local usersmarijus2014-03-281-1/+3
| |/
* / externals/discover: try up to 3 times to find a site that actually has conten...friendica2014-03-281-36/+41
|/
* external -> discoverfriendica2014-03-281-1/+1
* another complication to deletionfriendica2014-03-281-3/+10
* fix delete missing permission checkfriendica2014-03-282-3/+8
* doc updatefriendica2014-03-2887-1829/+2251
* don't include standalone test sites in external host listfriendica2014-03-271-2/+3
* a few more delete fixesfriendica2014-03-271-3/+12
* try and sort out the item delete messfriendica2014-03-275-21/+88
* this should work a bit betterfriendica2014-03-271-3/+6
* change wording of new connection request notification settingfriendica2014-03-271-2/+2
* Merge https://github.com/friendica/red into zpullfriendica2014-03-271-1/+1
|\
| * typoThomas Willingham2014-03-281-1/+1
* | new connection notificationfriendica2014-03-273-4/+13
|/
* firehose: provide system prefs to allow folks to fine tune to their needsfriendica2014-03-272-3/+16
* this will probably fix the uploaded photo permission issue, if not it should ...friendica2014-03-271-2/+2
* Merge https://github.com/friendica/red into zpullfriendica2014-03-273-0/+35
|\
| * more css fixesmarijus2014-03-271-1/+16
| * css fixesmarijus2014-03-273-0/+20
* | firehose fixes and optimisations. In particular get rid of the unresponsive ...friendica2014-03-276-74/+82
|/
* add fh to other page templatesfriendica2014-03-273-0/+3
* link in the firehosefriendica2014-03-271-1/+14
* superfluous commafriendica2014-03-272-3/+2
* catch the "new" view as wellfriendica2014-03-261-3/+3
* firehose testing (network?f=&fh=1) - some possible security bugs so testing p...friendica2014-03-264-114/+22
* need includefriendica2014-03-261-0/+2
* let's limit this to two weeks so it doesn't pound servers and waste too much ...friendica2014-03-261-1/+1
* there's the problemfriendica2014-03-261-4/+5
* more work on firehosefriendica2014-03-266-10/+44