| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | | another correction | marijus | 2014-02-19 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-19 | 6 | -22/+84 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| * | | | | | | | one pixel to much... | marijus | 2014-02-19 | 1 | -1/+1 |
| * | | | | | | | bootstrapify the nav | marijus | 2014-02-19 | 8 | -250/+308 |
* | | | | | | | | Merge pull request #323 from tuscanhobbit/master | Paolo T | 2014-02-19 | 2 | -929/+977 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | / / / /
| | |_|/ / / /
| |/| | | | | |
|
| * | | | | | | IT: update to the strings | tuscanhobbit | 2014-02-19 | 2 | -929/+977 |
* | | | | | | | introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is abl... | friendica | 2014-02-18 | 6 | -22/+84 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | fix zrl bookmarks which broke with this checkin: c9192991c95a5145 | friendica | 2014-02-18 | 1 | -27/+6 |
* | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-18 | 1 | -2/+5 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge pull request #320 from dawnbreak/master | friendica | 2014-02-19 | 1 | -2/+5 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Let user cancel the red_encrypt dialogue | Klaus | 2014-02-18 | 1 | -2/+5 |
* | | | | | | | change edit/delete to icons on filestorage page | friendica | 2014-02-18 | 1 | -3/+4 |
|/ / / / / / |
|
* | | | | | | some more snakebite and fix up include/account - forgot about that inline arr... | friendica | 2014-02-18 | 4 | -21/+57 |
* | | | | | | service class downgrade to the default service class on account expiration if... | friendica | 2014-02-18 | 2 | -10/+55 |
* | | | | | | edit bookmarks | friendica | 2014-02-18 | 7 | -7/+18 |
* | | | | | | get_theme_uid() - if no uid, look for a system channel and use that. This all... | friendica | 2014-02-17 | 1 | -0/+5 |
* | | | | | | update the donation link | friendica | 2014-02-17 | 2 | -4/+4 |
* | | | | | | remove the exit clause | friendica | 2014-02-17 | 1 | -6/+0 |
* | | | | | | snakebite, cont. magic-auth via openid is now possible, with the caveat that ... | friendica | 2014-02-17 | 2 | -3/+21 |
* | | | | | | operation snakebite continued. openid now works for local accounts using the ... | friendica | 2014-02-17 | 4 | -2/+125 |
* | | | | | | update openid for snakebite | friendica | 2014-02-17 | 7 | -106/+1350 |
* | | | | | | more snakebite stuff | friendica | 2014-02-17 | 2 | -25/+40 |
* | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-17 | 1 | -84/+87 |
|\ \ \ \ \ \ |
|
| * | | | | | | Merge pull request #319 from dawnbreak/master | friendica | 2014-02-18 | 1 | -84/+87 |
| |\| | | | | |
|
| | * | | | | | Commenting language.php and some changes | Klaus | 2014-02-18 | 1 | -84/+87 |
* | | | | | | | project "snakebite" | friendica | 2014-02-17 | 1 | -61/+70 |
|/ / / / / / |
|
* | | | | / | project "snakebite" | friendica | 2014-02-17 | 3 | -8/+60 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Merge pull request #316 from dawnbreak/master | friendica | 2014-02-17 | 2 | -21/+1 |
|\| | | | |
|
| * | | | | removed unused function posted_date_widget | Klaus | 2014-02-16 | 1 | -20/+0 |
| * | | | | Make asset icons work in subdir installs as well. | Klaus | 2014-02-15 | 1 | -1/+1 |
* | | | | | Merge pull request #314 from zzottel/master | friendica | 2014-02-17 | 1 | -0/+6 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | make sure the user can't inadvertently send a post with @!-tags to an | zottel | 2014-02-14 | 1 | -0/+6 |
* | | | | | several things were not working correctly w/r/t community tagging. The prefer... | friendica | 2014-02-16 | 4 | -5/+19 |
* | | | | | don't include deleted channels in number of channels service class checks | friendica | 2014-02-16 | 2 | -6/+11 |
* | | | | | don't show deleted channels on admin account summary page | friendica | 2014-02-16 | 1 | -2/+3 |
* | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-16 | 4 | -1558/+1621 |
|\ \ \ \ \ |
|
| * | | | | | Windows hack for proc_run() from Marshall | Thomas Willingham | 2014-02-16 | 1 | -2/+7 |
| * | | | | | Merge pull request #318 from tobiasd/20140216 | tobiasd | 2014-02-16 | 2 | -1556/+1604 |
| |\ \ \ \ \ |
|
| | * | | | | | DE: update to the strings | Tobias Diekershoff | 2014-02-16 | 2 | -1556/+1604 |
| |/ / / / / |
|
| * | | | | | Merge pull request #315 from dawnbreak/master | friendica | 2014-02-16 | 1 | -0/+10 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | /
| | |_|_|/
| |/| | | |
|
| | * | | | Fix call to asset icons in RedBrowser. | Klaus | 2014-02-15 | 1 | -0/+10 |
| |/ / / |
|
* / / / | strip hard-wired zids from posted links as they will have the wrong identity ... | friendica | 2014-02-16 | 6 | -12/+20 |
|/ / / |
|
* | | | preserve attachments when editing a post | friendica | 2014-02-14 | 1 | -0/+9 |
* | | | rev update and a minor fix (missing param) to force_refresh | friendica | 2014-02-14 | 4 | -766/+805 |
* | | | doc and assets update. There is what seems to be a controversial powerpoint i... | friendica | 2014-02-14 | 70 | -164/+444 |
|/ / |
|
* | | fix tag delivery default permissions (use channel_allow_cid rather than allow... | friendica | 2014-02-13 | 1 | -11/+11 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-13 | 4 | -20/+38 |
|\ \ |
|
| * \ | Merge pull request #313 from git-marijus/master | friendica | 2014-02-14 | 4 | -20/+38 |
| |\ \ |
|
| | * | | This makes advanced privacy settings adjustable in expert mode only. Also the... | marijus | 2014-02-13 | 4 | -20/+38 |
| |/ / |
|
* / / | more debugging dav in windows, windows never forgets your dav credentials eve... | friendica | 2014-02-13 | 1 | -0/+1 |
|/ / |
|