| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | |||||
| * | move expiration of notifications to the equivalent of "cron daily" to try ↵ | friendica | 2014-02-11 | 1 | -9/+10 |
| | | | | | and reduce the number of things the poller has to do on every run. | ||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-11 | 1 | -1/+5 |
| |\ | |||||
| | * | Merge pull request #309 from beardy-unixer/master | friendica | 2014-02-12 | 1 | -1/+5 |
| | |\ | | | | | | | Clear out old notifications in the poller. | ||||
| | | * | Clear out old notifications in the poller. | Thomas Willingham | 2014-02-11 | 1 | -1/+5 |
| | |/ | |||||
| * / | implement a forced directory update mode where we unconditionally create a ↵ | friendica | 2014-02-11 | 6 | -19/+33 |
| |/ | | | | directory sync packet. This is needed to ensure that monthly directory pings are propagated to other directory servers so they can each prove for themselves whether or not an account is alive or dead. We do not trust other directories to provide us information beyond "look at this entry and decide for yourself" as doing otherwise would invite rogue directory manipulations. As this scheduled update occurs on all channels across all servers, we should also pick up refresh messages from all existing channel clones and these should also propagate out to all directory servers using the same mechanism (though perhaps not at the same time). | ||||
| * | typos in authtest | friendica | 2014-02-10 | 1 | -1/+1 |
| | | |||||
| * | reversed args in update_modtime, incorrect ud_guid and ud_hash | friendica | 2014-02-10 | 4 | -5/+5 |
| | | |||||
| * | Check for the correct DB name before pushing. | friendica | 2014-02-10 | 1 | -1/+1 |
| | | |||||
| * | add channel_notify_flags to list of things which should *not* be synced ↵ | friendica | 2014-02-10 | 1 | -1/+1 |
| | | | | | across nomads. You probably only want one site to send you notification emails for the same events as opposed to all of them. | ||||
| * | fix ambiguous result message from authtest | friendica | 2014-02-10 | 1 | -1/+1 |
| | | |||||
| * | The scenario is that you're authenticated via magic-auth on a remote hub and ↵ | friendica | 2014-02-10 | 1 | -3/+5 |
| | | | | | you change channels locally. Next time you start an auth exchange we'll look to see if your identity changed and we should start fresh if that's the case, rather than just falling through and keeping the old credentials. | ||||
| * | add chanview mode to settings | friendica | 2014-02-10 | 2 | -1/+6 |
| | | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-10 | 1 | -1/+1 |
| |\ | |||||
| | * | s/Options All/AllowOverride All | Thomas Willingham | 2014-02-10 | 1 | -1/+1 |
| | | | |||||
| * | | getting bookmark support in tinymce is left as a FIXME. I've got something ↵ | friendica | 2014-02-10 | 3 | -0/+224 |
| |/ | | | | that almost works, but not quite in editor_plugin_src.js2 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |