aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #313 from git-marijus/masterfriendica2014-02-144-20/+38
| |\ \
| | * | This makes advanced privacy settings adjustable in expert mode only. Also the...marijus2014-02-134-20/+38
| |/ /
* / / more debugging dav in windows, windows never forgets your dav credentials eve...friendica2014-02-131-0/+1
|/ /
* | reddav - disable assetsfriendica2014-02-131-1/+1
* | don't fix the height of the archive widget - fix the maximum heightfriendica2014-02-131-1/+1
* | very simple schemefriendica2014-02-132-1/+6
* | oops - still using the !@#$ youtube bbcodesfriendica2014-02-121-29/+29
* | remove some obsolete bbcode tagsfriendica2014-02-121-65/+30
* | return the expected arrayfriendica2014-02-121-3/+3
* | Merge pull request #312 from git-marijus/masterfriendica2014-02-131-0/+3
|\ \
| * | dont show onlinestatus if block_public is onmarijus2014-02-121-0/+3
* | | make activities optional for profile things, clean up the formsfriendica2014-02-124-54/+62
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-122-5/+7
|\ \
| * \ Merge pull request #311 from git-marijus/masterfriendica2014-02-132-5/+7
| |\ \
| | * | whitespacemarijus2014-02-121-3/+0
| | * | make chatrooms in /chat/channel visible to observers aswellmarijus2014-02-122-5/+10
| |/ /
* / / another bbcode addition for the demo, however this one is potentially useful ...friendica2014-02-121-0/+14
|/ /
* | bbcode element of where you are on a site. perhaps this is less than generall...friendica2014-02-121-1/+1
* | ui improvements on the manage pagefriendica2014-02-123-9/+17
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-122-3988/+4119
|\ \
| * \ Merge pull request #310 from tobiasd/20140212tobiasd2014-02-122-3988/+4119
| |\ \
| | * | DE: update to the stringsTobias Diekershoff2014-02-122-3988/+4119
| |/ /
* / / dav issue when listing protected contents from OS interfacefriendica2014-02-122-8/+27
|/ /
* | better auth logging in davfriendica2014-02-111-0/+12
* | fix a mysql error which popped up in the dbfail logfriendica2014-02-112-3/+3
* | use profile photo on vcard before reverting to xchan photofriendica2014-02-112-2/+2
* | shamelessly steal, and cut/paste from the settings page to get mod_photos edi...friendica2014-02-113-12/+25
* | fixes to thing profile assignmentsfriendica2014-02-115-6/+9
* | move expiration of notifications to the equivalent of "cron daily" to try and...friendica2014-02-111-9/+10
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-111-1/+5
|\ \
| * \ Merge pull request #309 from beardy-unixer/masterfriendica2014-02-121-1/+5
| |\ \
| | * | Clear out old notifications in the poller.Thomas Willingham2014-02-111-1/+5
| |/ /
* / / implement a forced directory update mode where we unconditionally create a di...friendica2014-02-116-19/+33
|/ /
* | typos in authtestfriendica2014-02-101-1/+1
* | reversed args in update_modtime, incorrect ud_guid and ud_hashfriendica2014-02-104-5/+5
* | Check for the correct DB name before pushing.friendica2014-02-101-1/+1
* | add channel_notify_flags to list of things which should *not* be synced acros...friendica2014-02-101-1/+1
* | fix ambiguous result message from authtestfriendica2014-02-101-1/+1
* | The scenario is that you're authenticated via magic-auth on a remote hub and ...friendica2014-02-101-3/+5
* | add chanview mode to settingsfriendica2014-02-102-1/+6
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-101-1/+1
|\ \
| * | s/Options All/AllowOverride AllThomas Willingham2014-02-101-1/+1
* | | getting bookmark support in tinymce is left as a FIXME. I've got something th...friendica2014-02-103-0/+224
|/ /
* | more bookmark fixesfriendica2014-02-102-2/+2
* | better bookmark escapingfriendica2014-02-102-5/+11
* | don't add bookmark tags to naked links inside code blocksfriendica2014-02-103-1/+15
* | since the project donate section was added to siteinfo - add a way for the hu...friendica2014-02-091-6/+12
* | perform remote discovery on abook sync of nomadic clones if remote channel (x...friendica2014-02-091-0/+27
* | backend for chatroom activity monitor - honours permissions and returns (json...friendica2014-02-091-0/+43
* | Merge pull request #307 from git-marijus/masterfriendica2014-02-103-5/+39
|\ \