Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #707 from HaakonME/master | RedMatrix | 2014-11-25 | 2 | -4902/+5594 |
|\ | | | | | Updated Norwegian bokmål translation | ||||
| * | Updated Norwegian bokmål translation | Haakon Meland Eriksen | 2014-11-23 | 2 | -4902/+5594 |
| | | |||||
* | | Merge pull request #709 from tuscanhobbit/dev | Paolo T | 2014-11-24 | 2 | -5007/+5205 |
|\ \ | | | | | | | Italian translation | ||||
| * | | Italian translation | Paolo Tacconi | 2014-11-24 | 2 | -5007/+5205 |
| | | | |||||
| * | | Merge pull request #7 from friendica/master | Paolo T | 2014-11-24 | 472 | -26959/+41480 |
| |\ \ | |/ / |/| | | Merge from main project | ||||
* | | | and update Dutch | Jeroen | 2014-11-24 | 2 | -4385/+4403 |
| | | | |||||
* | | | Merge pull request #708 from zzottel/master | zzottel | 2014-11-24 | 3 | -4392/+4521 |
|\ \ \ | | | | | | | | | German update | ||||
| * | | | update to German strings | zottel | 2014-11-24 | 2 | -4392/+4519 |
| | | | | |||||
| * | | | update to Germanmain help file | zottel | 2014-11-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | add event export (this month) to event UI | friendica | 2014-11-24 | 3 | -1/+14 |
|/ / / | |||||
* | | | basic vcalendar formatting support | friendica | 2014-11-23 | 2 | -6/+60 |
| | | | |||||
* | | | add link to search forums in the directory | friendica | 2014-11-23 | 3 | -2/+12 |
| | | | |||||
* | | | allow directory searches to be filtered by (public forums) and/or (! public ↵ | friendica | 2014-11-23 | 3 | -3/+18 |
| | | | | | | | | | | | | forums) | ||||
* | | | more roadmap | friendica | 2014-11-23 | 1 | -0/+3 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-23 | 13 | -6217/+7163 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #706 from f03el/master | RedMatrix | 2014-11-23 | 8 | -6216/+7142 |
| |\ \ | | | | | | | | | Update Swedish translations | ||||
| | * | | Update Swedish translations | Erik Lundin | 2014-11-22 | 8 | -6216/+7142 |
| | | | | |||||
| * | | | added dbdriver to siteinfo json to better track affected sites | Habeas Codice | 2014-11-22 | 5 | -1/+21 |
| |/ / | |||||
* | | | project roadmap | friendica | 2014-11-23 | 4 | -1/+51 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-22 | 5 | -3/+13 |
|\| | | |||||
| * | | prevent database hackery from leaking over the wire | Habeas Codice | 2014-11-22 | 1 | -1/+2 |
| | | | |||||
| * | | somehow missed this one | Habeas Codice | 2014-11-22 | 1 | -0/+2 |
| | | | | | | | | | | | | was causing problems with pickup messages originating from postgres servers | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-21 | 9 | -20/+277 |
| |\ \ | |||||
| * | | | new system config reserved_channels | Habeas Codice | 2014-11-21 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | prevents members from creating channels in a reserved list | ||||
| * | | | implicit type conversion | Habeas Codice | 2014-11-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | random block widget | friendica | 2014-11-22 | 4 | -2648/+2721 |
| | | | | |||||
* | | | | doc updates | friendica | 2014-11-22 | 91 | -1408/+1554 |
| |/ / |/| | | |||||
* | | | allow the photo_rand widget to access photos from any channel (useful if the ↵ | friendica | 2014-11-20 | 1 | -1/+5 |
| | | | | | | | | | | | | widget is used in sys-generated pages). You still need permission. | ||||
* | | | more logging for zot_feed anomalies | friendica | 2014-11-20 | 1 | -0/+2 |
| | | | |||||
* | | | more directory tuning to ignore things we already know we can't possibly update | friendica | 2014-11-20 | 1 | -1/+6 |
| | | | |||||
* | | | directory: don't try and sync a directory update that points to a hubloc we ↵ | friendica | 2014-11-20 | 1 | -1/+18 |
| | | | | | | | | | | | | already know is dead and buried. | ||||
* | | | yet another option for the homepage | friendica | 2014-11-20 | 5 | -18/+186 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-20 | 2 | -27/+78 |
|\| | | |||||
| * | | fix driver issue for large dbs | Habeas Codice | 2014-11-20 | 1 | -25/+76 |
| | | | | | | | | | | | | add rudimentary resume | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-20 | 3 | -2/+8 |
| |\ \ | |||||
| * | | | implicit boolean, formatting | Habeas Codice | 2014-11-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | random photo widget | friendica | 2014-11-20 | 2 | -1/+62 |
| |/ / |/| | | |||||
* | | | to-do update | friendica | 2014-11-20 | 1 | -0/+1 |
| | | | |||||
* | | | friendica commenters are currently shown using "Diaspora" app. Try and fix ↵ | friendica | 2014-11-20 | 2 | -2/+7 |
|/ / | | | | | | | this where we can. | ||||
* | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-19 | 17 | -50/+80 |
|\ \ | |||||
| * | | change logging of some troublesome or noisy bits so we can figure out what ↵ | friendica | 2014-11-19 | 3 | -4/+4 |
| | | | | | | | | | | | | is really going on | ||||
| * | | minor photo flag issue - and some more whitespace edits | friendica | 2014-11-19 | 3 | -6/+6 |
| | | | |||||
| * | | couple of fixes: | friendica | 2014-11-19 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | - significantly increase the content availability on the discover channel - fix the button group on the blog/list mode which made the border on a single comment button a bit wonky | ||||
| * | | there's still a permission issue delivering a public post directly to the ↵ | friendica | 2014-11-19 | 3 | -2/+4 |
| | | | | | | | | | | | | sys channel (on the local system), but this puts the local sys channel in the public delivery chain and fixes an issue with unseen counts showing on the discover page (where you can't do anything about it). | ||||
| * | | add sys channel to public recips if scope public | friendica | 2014-11-18 | 1 | -0/+12 |
| | | | |||||
| * | | turn the "adult photo flagging" (which prevents a particularly flagged photo ↵ | friendica | 2014-11-18 | 3 | -0/+5 |
| | | | | | | | | | | | | from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. | ||||
| * | | blog mode - turn the comment link into a button and group with the ↵ | friendica | 2014-11-18 | 2 | -16/+11 |
| | | | | | | | | | | | | likes/dislikes | ||||
| * | | private mail buttons | friendica | 2014-11-18 | 4 | -23/+28 |
| | | | |||||
| * | | Merge pull request #703 from friendica/revert-702-master | RedMatrix | 2014-11-19 | 4 | -43/+4 |
| |\ \ | | | | | | | | | Revert "Directory shows channel suggestions by default" | ||||
| | * | | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 4 | -43/+4 |
| |/ / |