aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2014-02-1716-1603/+1674
|\
| * Merge pull request #316 from dawnbreak/masterfriendica2014-02-172-21/+1
| |\
| | * removed unused function posted_date_widgetKlaus2014-02-161-20/+0
| | * Make asset icons work in subdir installs as well.Klaus2014-02-151-1/+1
| * | Merge pull request #314 from zzottel/masterfriendica2014-02-171-0/+6
| |\ \
| * | | several things were not working correctly w/r/t community tagging. The prefer...friendica2014-02-164-5/+19
| * | | don't include deleted channels in number of channels service class checksfriendica2014-02-162-6/+11
| * | | don't show deleted channels on admin account summary pagefriendica2014-02-161-2/+3
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-02-164-1558/+1621
| |\ \ \
| | * | | Windows hack for proc_run() from MarshallThomas Willingham2014-02-161-2/+7
| | * | | Merge pull request #318 from tobiasd/20140216tobiasd2014-02-162-1556/+1604
| | |\ \ \
| | | * | | DE: update to the stringsTobias Diekershoff2014-02-162-1556/+1604
| | |/ / /
| | * | | Merge pull request #315 from dawnbreak/masterfriendica2014-02-161-0/+10
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix call to asset icons in RedBrowser.Klaus2014-02-151-0/+10
| | |/ /
| * / / strip hard-wired zids from posted links as they will have the wrong identity ...friendica2014-02-166-12/+20
| |/ /
* | / Merge remote-tracking branch 'upstream/master'zottel2014-02-1575-930/+1258
|\| | | |/ |/|
| * preserve attachments when editing a postfriendica2014-02-141-0/+9
| * rev update and a minor fix (missing param) to force_refreshfriendica2014-02-144-766/+805
| * doc and assets update. There is what seems to be a controversial powerpoint i...friendica2014-02-1470-164/+444
* | make sure the user can't inadvertently send a post with @!-tags to anzottel2014-02-141-0/+6
|/
* fix tag delivery default permissions (use channel_allow_cid rather than allow...friendica2014-02-131-11/+11
* Merge https://github.com/friendica/red into zpullfriendica2014-02-134-20/+38
|\
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 09:29:42 +0000