aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * shamelessly steal, and cut/paste from the settings page to get mod_photos edi...friendica2014-02-113-12/+25
| * fixes to thing profile assignmentsfriendica2014-02-115-6/+9
| * move expiration of notifications to the equivalent of "cron daily" to try and...friendica2014-02-111-9/+10
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-111-1/+5
| |\
| | * Merge pull request #309 from beardy-unixer/masterfriendica2014-02-121-1/+5
| | |\
| | | * Clear out old notifications in the poller.Thomas Willingham2014-02-111-1/+5
| | |/
| * / implement a forced directory update mode where we unconditionally create a di...friendica2014-02-116-19/+33
| |/
| * typos in authtestfriendica2014-02-101-1/+1
| * reversed args in update_modtime, incorrect ud_guid and ud_hashfriendica2014-02-104-5/+5
| * Check for the correct DB name before pushing.friendica2014-02-101-1/+1
| * add channel_notify_flags to list of things which should *not* be synced acros...friendica2014-02-101-1/+1
| * fix ambiguous result message from authtestfriendica2014-02-101-1/+1
| * The scenario is that you're authenticated via magic-auth on a remote hub and ...friendica2014-02-101-3/+5
| * add chanview mode to settingsfriendica2014-02-102-1/+6
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-101-1/+1
| |\
| | * s/Options All/AllowOverride AllThomas Willingham2014-02-101-1/+1
| * | getting bookmark support in tinymce is left as a FIXME. I've got something th...friendica2014-02-103-0/+224
| |/
| * more bookmark fixesfriendica2014-02-102-2/+2
| * better bookmark escapingfriendica2014-02-102-5/+11
| * don't add bookmark tags to naked links inside code blocksfriendica2014-02-103-1/+15
| * since the project donate section was added to siteinfo - add a way for the hu...friendica2014-02-091-6/+12
| * perform remote discovery on abook sync of nomadic clones if remote channel (x...friendica2014-02-091-0/+27
| * backend for chatroom activity monitor - honours permissions and returns (json...friendica2014-02-091-0/+43
| * Merge pull request #307 from git-marijus/masterfriendica2014-02-103-5/+39
| |\
| | * whitespacemarijus2014-02-101-1/+1
| | * moving background-color to style.cssmarijus2014-02-092-2/+2
| | * theming chat a littlemarijus2014-02-093-5/+39
| * | more XSS blockage of uploaded filesfriendica2014-02-091-1/+10
| * | don't allow the browser to open uploaded html/css/jsfriendica2014-02-091-1/+12
| |/
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-091-0/+1
| |\
| | * Doco - abcjsplugin from OlivierThomas Willingham2014-02-091-0/+1
| * | fix the "every other link gets messed up" problemfriendica2014-02-091-1/+3
| * | Merge https://github.com/friendica/red into zpullfriendica2014-02-092-0/+5
| |\|
| | * Merge pull request #306 from cvogeley/masterfriendica2014-02-092-0/+5
| | |\
| | | * .Christian Vogeley2014-02-091-0/+1
| | | * Add class to bookmark links to make it better them ableChristian Vogeley2014-02-091-0/+4
| | |/
| * / fix wall photosfriendica2014-02-093-2/+11
| |/
| * that's betterfriendica2014-02-082-1/+3
| * revert last fix, it double tagsfriendica2014-02-081-1/+1
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-081-0/+1
| |\
| | * Merge pull request #305 from beardy-unixer/masterfriendica2014-02-091-0/+1
| | |\
| | | * Pass mids to conv_item templateThomas Willingham2014-02-081-0/+1
| | |/
| * / allow somebody to type #^{{naked link}}friendica2014-02-081-1/+1
| |/
| * create a new "subdued" CSS class for things that shouldn't be in your face un...friendica2014-02-083-4/+13
| * make bookmarks message into an 'info' so it expires and goes away after a bitfriendica2014-02-071-1/+1
| * set default for account_level in DBfriendica2014-02-073-3/+10
| * fix issue with double linkify in the git feedfriendica2014-02-071-1/+7
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-074-4023/+4213
| |\
| | * Merge pull request #304 from git-marijus/masterfriendica2014-02-082-6/+6
| | |\
| | | * Merge branch 'upstream'marijus2014-02-07115-9003/+9513
| | | |\