aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | update the donation linkfriendica2014-02-172-4/+4
| | | |
| * | | remove the exit clausefriendica2014-02-171-6/+0
| | | |
| * | | snakebite, cont. magic-auth via openid is now possible, with the caveat that ↵friendica2014-02-172-3/+21
| | | | | | | | | | | | | | | | one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this.
| * | | operation snakebite continued. openid now works for local accounts using the ↵friendica2014-02-174-2/+125
| | | | | | | | | | | | | | | | rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet.
| * | | update openid for snakebitefriendica2014-02-177-106/+1350
| | | |
| * | | more snakebite stufffriendica2014-02-172-25/+40
| | | |
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-02-171-84/+87
| |\ \ \
| | * | | Merge pull request #319 from dawnbreak/masterfriendica2014-02-181-84/+87
| | |\| | | | | | | | | | | | Commenting language.php and some changes
| | | * | Commenting language.php and some changesKlaus2014-02-181-84/+87
| | | | | | | | | | | | | | | Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
| * | | | project "snakebite"friendica2014-02-171-61/+70
| |/ / /
| * | | project "snakebite"friendica2014-02-173-8/+60
| | | |
* | | | Merge remote-tracking branch 'upstream/master'zottel2014-02-1716-1603/+1674
|\| | |
| * | | Merge pull request #316 from dawnbreak/masterfriendica2014-02-172-21/+1
| |\| | | | | | | | | | Make asset icons work in subdir installs as well.
| | * | removed unused function posted_date_widgetKlaus2014-02-161-20/+0
| | | | | | | | | | | | This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
| | * | Make asset icons work in subdir installs as well.Klaus2014-02-151-1/+1
| | | | | | | | | | | | This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
| * | | Merge pull request #314 from zzottel/masterfriendica2014-02-171-0/+6
| |\ \ \ | | | | | | | | | | Make @!-tags safer
| * | | | several things were not working correctly w/r/t community tagging. The ↵friendica2014-02-164-5/+19
| | | | | | | | | | | | | | | | | | | | preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit.
| * | | | 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 strings
| | | * | | | 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.
| | | * | | Fix call to asset icons in RedBrowser.Klaus2014-02-151-0/+10
| | |/ / / | | | | | | | | | | RedBrowser was not displaying asset icons correctly, because the URL was wrong.
| * / / / strip hard-wired zids from posted links as they will have the wrong identity ↵friendica2014-02-166-12/+20
| |/ / / | | | | | | | | | | | | when somebody tries to view the link
* | / / 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 ↵friendica2014-02-1470-164/+444
| | | | | | | | | | | | in this checkin. The powerpoint is of course *open source* even if powerpoint itself is not. The source file is available for your examination and revision.
* | | make sure the user can't inadvertently send a post with @!-tags to anzottel2014-02-141-0/+6
|/ / | | | | | | | | unintended audience because he had browsed the Matrix by collection or by contact
* | fix tag delivery default permissions (use channel_allow_cid rather than ↵friendica2014-02-131-11/+11
| | | | | | | | allow_cid etc.)
* | 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. Als...
| | * | This makes advanced privacy settings adjustable in expert mode only. Also ↵marijus2014-02-134-20/+38
| |/ / | | | | | | | | | they are hidden behind a button. This is a design hotfix should probably come up with something better someday...
* / / more debugging dav in windows, windows never forgets your dav credentials ↵friendica2014-02-131-0/+1
|/ / | | | | | | even if you get them wrong and even if you remove them from the credential vault. This makes it very difficult to manage two or more channels with file resources.
* | 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 on
| * | 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
| |\ \ | | | | | | | | make chatrooms in /chat/channel visible to observers aswell
| | * | 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
|/ / | | | | | | for other purposes