Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |||||
* | | more bookmark fixes | friendica | 2014-02-10 | 2 | -2/+2 | |
| | | ||||||
* | | better bookmark escaping | friendica | 2014-02-10 | 2 | -5/+11 | |
| | | ||||||
* | | don't add bookmark tags to naked links inside code blocks | friendica | 2014-02-10 | 3 | -1/+15 | |
| | | ||||||
* | | since the project donate section was added to siteinfo - add a way for the ↵ | friendica | 2014-02-09 | 1 | -6/+12 | |
| | | | | | | | | hub admin to add in a donation section to keep the hub running. | |||||
* | | perform remote discovery on abook sync of nomadic clones if remote channel ↵ | friendica | 2014-02-09 | 1 | -0/+27 | |
| | | | | | | | | (xchan) is unknown | |||||
* | | backend for chatroom activity monitor - honours permissions and returns ↵ | friendica | 2014-02-09 | 1 | -0/+43 | |
| | | | | | | | | (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room. | |||||
* | | Merge pull request #307 from git-marijus/master | friendica | 2014-02-10 | 3 | -5/+39 | |
|\ \ | | | | | | | theming chat a little | |||||
| * | | whitespace | marijus | 2014-02-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | moving background-color to style.css | marijus | 2014-02-09 | 2 | -2/+2 | |
| | | | ||||||
| * | | theming chat a little | marijus | 2014-02-09 | 3 | -5/+39 | |
| | | | ||||||
* | | | more XSS blockage of uploaded files | friendica | 2014-02-09 | 1 | -1/+10 | |
| | | | ||||||
* | | | don't allow the browser to open uploaded html/css/js | friendica | 2014-02-09 | 1 | -1/+12 | |
|/ / | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-09 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | Doco - abcjsplugin from Olivier | Thomas Willingham | 2014-02-09 | 1 | -0/+1 | |
| | | | ||||||
* | | | fix the "every other link gets messed up" problem | friendica | 2014-02-09 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-09 | 2 | -0/+5 | |
|\| | | ||||||
| * | | Merge pull request #306 from cvogeley/master | friendica | 2014-02-09 | 2 | -0/+5 | |
| |\ \ | | | | | | | | | Add class to bookmark links to make it better themable | |||||
| | * | | . | Christian Vogeley | 2014-02-09 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Add class to bookmark links to make it better them able | Christian Vogeley | 2014-02-09 | 1 | -0/+4 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g.: css (not yet included) .bookmark-identifier{ display:none; } .bookmark:hover:before{ text-decoration:none; content:"#^"; color:#000000; background:#FFFFFF; } .bookmark:hover{ color: #FFFFFF; background: #3465A4; } | |||||
* / / | fix wall photos | friendica | 2014-02-09 | 3 | -2/+11 | |
|/ / | ||||||
* | | that's better | friendica | 2014-02-08 | 2 | -1/+3 | |
| | | ||||||
* | | revert last fix, it double tags | friendica | 2014-02-08 | 1 | -1/+1 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-08 | 1 | -0/+1 | |
|\ \ | ||||||
| * \ | Merge pull request #305 from beardy-unixer/master | friendica | 2014-02-09 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | Pass mids to conv_item template |