| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-17 | 16 | -1603/+1674 |
| |\ | |||||
| | * | Merge pull request #316 from dawnbreak/master | friendica | 2014-02-17 | 2 | -21/+1 |
| | |\ | | | | | | | Make asset icons work in subdir installs as well. | ||||
| | | * | removed unused function posted_date_widget | Klaus | 2014-02-16 | 1 | -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. | Klaus | 2014-02-15 | 1 | -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/master | friendica | 2014-02-17 | 1 | -0/+6 |
| | |\ \ | | | | | | | | | Make @!-tags safer | ||||
| | * | | | several things were not working correctly w/r/t community tagging. The ↵ | friendica | 2014-02-16 | 4 | -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 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 | ||||
| | | | * | | | 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. | ||||
| | | | * | | Fix call to asset icons in RedBrowser. | Klaus | 2014-02-15 | 1 | -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 ↵ | friendica | 2014-02-16 | 6 | -12/+20 |
| | |/ / | | | | | | | | | | when somebody tries to view the link | ||||
| * | / | Merge remote-tracking branch 'upstream/master' | zottel | 2014-02-15 | 75 | -930/+1258 |
| |\| | | |/ |/| | |||||
| | * | 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 ↵ | friendica | 2014-02-14 | 70 | -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 an | zottel | 2014-02-14 | 1 | -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 ↵ | friendica | 2014-02-13 | 1 | -11/+11 |
| | | | | | allow_cid etc.) | ||||
| * | 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. Als... | ||||
| | | * | This makes advanced privacy settings adjustable in expert mode only. Also ↵ | marijus | 2014-02-13 | 4 | -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 ↵ | friendica | 2014-02-13 | 1 | -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 assets | friendica | 2014-02-13 | 1 | -1/+1 |
| | | |||||
| * | don't fix the height of the archive widget - fix the maximum height | friendica | 2014-02-13 | 1 | -1/+1 |
| | | |||||
| * | very simple scheme | friendica | 2014-02-13 | 2 | -1/+6 |
| | | |||||
| * | oops - still using the !@#$ youtube bbcodes | friendica | 2014-02-12 | 1 | -29/+29 |
| | | |||||
| * | remove some obsolete bbcode tags | friendica | 2014-02-12 | 1 | -65/+30 |
| | | |||||
| * | return the expected array | friendica | 2014-02-12 | 1 | -3/+3 |
| | | |||||
| * | Merge pull request #312 from git-marijus/master | friendica | 2014-02-13 | 1 | -0/+3 |
| |\ | | | | | dont show onlinestatus if block_public is on | ||||
| | * | dont show onlinestatus if block_public is on | marijus | 2014-02-12 | 1 | -0/+3 |
| | | | |||||
| * | | make activities optional for profile things, clean up the forms | friendica | 2014-02-12 | 4 | -54/+62 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-12 | 2 | -5/+7 |
| |\ | |||||
| | * | Merge pull request #311 from git-marijus/master | friendica | 2014-02-13 | 2 | -5/+7 |
| | |\ | | | | | | | make chatrooms in /chat/channel visible to observers aswell | ||||
| | | * | whitespace | marijus | 2014-02-12 | 1 | -3/+0 |
| | | | | |||||
| | | * | make chatrooms in /chat/channel visible to observers aswell | marijus | 2014-02-12 | 2 | -5/+10 |
| | |/ | |||||
| * / | another bbcode addition for the demo, however this one is potentially useful ↵ | friendica | 2014-02-12 | 1 | -0/+14 |
| |/ | | | | for other purposes | ||||
| * | bbcode element of where you are on a site. perhaps this is less than ↵ | friendica | 2014-02-12 | 1 | -1/+1 |
| | | | | | generally useful but I plan to use it in a demo video where there is no other way to accomplish this | ||||
| * | ui improvements on the manage page | friendica | 2014-02-12 | 3 | -9/+17 |
| | | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-12 | 2 | -3988/+4119 |
| |\ | |||||
| | * | Merge pull request #310 from tobiasd/20140212 | tobiasd | 2014-02-12 | 2 | -3988/+4119 |
| | |\ | | | | | | | DE: update to the strings | ||||
| | | * | DE: update to the strings | Tobias Diekershoff | 2014-02-12 | 2 | -3988/+4119 |
| | |/ | |||||
| * / | dav issue when listing protected contents from OS interface | friendica | 2014-02-12 | 2 | -8/+27 |
| |/ | |||||
| * | better auth logging in dav | friendica | 2014-02-11 | 1 | -0/+12 |
| | | |||||
| * | fix a mysql error which popped up in the dbfail log | friendica | 2014-02-11 | 2 | -3/+3 |
| | | |||||
| * | use profile photo on vcard before reverting to xchan photo | friendica | 2014-02-11 | 2 | -2/+2 |
| | | |||||
| * | shamelessly steal, and cut/paste from the settings page to get mod_photos ↵ | friendica | 2014-02-11 | 3 | -12/+25 |
| | | | | | edit permissions working - and it looks like we still have some other fancybox instances (yet another lightbox) which haven't yet been converted to colorbox and will need to be fixed. Way too many lightboxes. | ||||
| * | fixes to thing profile assignments | friendica | 2014-02-11 | 5 | -6/+9 |
| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |