aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2014-02-1933-349/+1949
|\
| * introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is abl...friendica2014-02-186-22/+84
| * fix zrl bookmarks which broke with this checkin: c9192991c95a5145friendica2014-02-181-27/+6
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-181-2/+5
| |\
| | * Merge pull request #320 from dawnbreak/masterfriendica2014-02-191-2/+5
| | |\
| | | * Let user cancel the red_encrypt dialogueKlaus2014-02-181-2/+5
| * | | change edit/delete to icons on filestorage pagefriendica2014-02-181-3/+4
| |/ /
| * | some more snakebite and fix up include/account - forgot about that inline arr...friendica2014-02-184-21/+57
| * | service class downgrade to the default service class on account expiration if...friendica2014-02-182-10/+55
| * | edit bookmarksfriendica2014-02-187-7/+18
| * | get_theme_uid() - if no uid, look for a system channel and use that. This all...friendica2014-02-171-0/+5
| * | 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
| * | operation snakebite continued. openid now works for local accounts using the ...friendica2014-02-174-2/+125
| * | 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 changesKlaus2014-02-181-84/+87
| * | | 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
| |\|
| | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:41:33 +0000