aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * let oneself be added to a collection in exchange for deleted contactsmarijus2014-02-072-6/+6
| | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-072-4017/+4207
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #303 from tuscanhobbit/masterPaolo T2014-02-072-4017/+4207
| |\ \ \
| | * \ \ IT: update to the stringstuscanhobbit2014-02-070-0/+0
| | |\ \ \
| | * | | | IT: update to the stringstuscanhobbit2014-02-072-3857/+4049
| | | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-07110-4976/+5293
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-062-4/+7
| | | | | |\
| | | | | * \ Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-0615-220/+213
| | | | | |\ \
| | | | * | \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-062-1/+2
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0612-219/+152
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'upstream'marijus2014-02-050-0/+0
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-05143-3694/+5472
| | | | | |\ \ \ \
| | | | | * | | | | comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
* | | | | | | | | | from olivier: use double quotes in js strings, updated FR translationfriendica2014-02-075-5104/+7623
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 20:52:23 +0000