Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-22 | 10 | -42/+60 |
|\ | |||||
| * | Merge pull request #760 from pafcu/apps | RedMatrix | 2014-12-23 | 10 | -42/+60 |
| |\ | |||||
| | * | Move app icon centering to style.css | Stefan Parviainen | 2014-12-22 | 2 | -1/+9 |
| | * | Option to check that a random profile works before returning it | Stefan Parviainen | 2014-12-22 | 2 | -24/+46 |
| | * | Remove unused apps.tpl | Stefan Parviainen | 2014-12-22 | 1 | -11/+0 |
| | * | Center app names | Stefan Parviainen | 2014-12-22 | 2 | -3/+2 |
| | * | Rename some apps, fix webpages requires | Stefan Parviainen | 2014-12-22 | 5 | -5/+5 |
* | | | add example to script | friendica | 2014-12-22 | 1 | -1/+59 |
|/ / | |||||
* | | basic ical parser | friendica | 2014-12-22 | 1 | -0/+321 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-22 | 4 | -85/+64 |
|\ \ | |||||
| * | | Merge pull request #759 from pafcu/apps | RedMatrix | 2014-12-23 | 1 | -54/+59 |
| |\| | |||||
| | * | Fix feature check in apps (missing parenthesis), allow multiple requires (com... | Stefan Parviainen | 2014-12-22 | 1 | -54/+59 |
| * | | Merge pull request #758 from pafcu/autocomplete | RedMatrix | 2014-12-23 | 2 | -31/+4 |
| |\ \ | |||||
| | * | | Show autocomplete taggable with special color | Stefan Parviainen | 2014-12-22 | 2 | -31/+4 |
| | |/ | |||||
| * / | Pass sitename to apps | Thomas Willingham | 2014-12-22 | 1 | -0/+1 |
| |/ | |||||
* / | revup | friendica | 2014-12-22 | 1 | -1/+1 |
|/ | |||||
* | provide last successful poll run time (using relative time) in siteinfo so th... | friendica | 2014-12-21 | 5 | -7/+21 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 21 | -103/+1708 |
|\ | |||||
| * | Merge pull request #757 from git-marijus/master | RedMatrix | 2014-12-22 | 10 | -63/+75 |
| |\ | |||||
| | * | fix button visibility | marijus | 2014-12-21 | 1 | -3/+6 |
| | * | forgot to git add files | marijus | 2014-12-21 | 2 | -0/+15 |
| | * | files: make mod/filestorage.php load via ajax and some design work. work in p... | marijus | 2014-12-21 | 8 | -63/+57 |
| * | | Merge pull request #756 from encyclomundi/master | RedMatrix | 2014-12-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | change address book to connections | Charles | 2014-12-21 | 1 | -1/+1 |
| * | | | Merge pull request #755 from pafcu/docfix | RedMatrix | 2014-12-22 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix issue #752 | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
| * | | | | Merge pull request #754 from pafcu/categoryinput | RedMatrix | 2014-12-22 | 9 | -36/+1629 |
| |\ \ \ \ | |||||
| | * | | | | Add bootstrap-tagsinput library | Stefan Parviainen | 2014-12-21 | 5 | -0/+1589 |
| | * | | | | Fancy categories input with bootstrap-tagsinput | Stefan Parviainen | 2014-12-21 | 4 | -36/+40 |
| | |/ / / | |||||
| * | | | | Merge pull request #753 from pafcu/autocomplete | RedMatrix | 2014-12-22 | 1 | -2/+2 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fix whitespace disappearing at the beginning of completed smily | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
| | * | | | Correct domain for smily requests | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
* | | | | | fix double encoding of homepage in profile activity - not as straight-forward... | friendica | 2014-12-21 | 4 | -3/+8 |
|/ / / / | |||||
* | / / | Merge pull request #751 from pafcu/autocomplete | RedMatrix | 2014-12-21 | 1 | -1/+9 |
|\| | | | |/ / |/| | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into autocomplete | Stefan Parviainen | 2014-12-21 | 10 | -43/+75 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-20 | 13 | -218/+1210 |
|\ \ \ | |||||
| * \ \ | Merge pull request #749 from pafcu/hijackingdocfix | RedMatrix | 2014-12-21 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct) | Stefan Parviainen | 2014-12-20 | 1 | -1/+1 |
| * | | | | Merge pull request #748 from pafcu/smilyjson | RedMatrix | 2014-12-21 | 2 | -32/+51 |
| |\ \ \ \ | |||||
| | * | | | | Access list of smilies over JSON | Stefan Parviainen | 2014-12-20 | 2 | -32/+51 |
| * | | | | | Merge pull request #747 from pafcu/autocomplete | RedMatrix | 2014-12-21 | 4 | -176/+1136 |
| |\ \ \ \ \ | |||||
| * | | | | | | Oopsie in German | Thomas Willingham | 2014-12-20 | 1 | -1/+1 |
| * | | | | | | Doco - fix some tags. | Thomas Willingham | 2014-12-20 | 5 | -9/+12 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-20 | 75 | -3688/+4234 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | More FAQ | Thomas Willingham | 2014-12-20 | 1 | -0/+10 |
* | | | | | | rev update | friendica | 2014-12-20 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
| | | * | | Autocomplete smilies | Stefan Parviainen | 2014-12-20 | 1 | -1/+9 |
| | |/ / | |||||
| | * | | Remove unnecessary logging | Stefan Parviainen | 2014-12-20 | 1 | -3/+1 |
| | * | | Better autocomplete based on jquery-textcomplete | Stefan Parviainen | 2014-12-20 | 4 | -176/+1138 |
| |/ / |/| | | |||||
* | | | provide link to help for channel permission roles when creating a channel | friendica | 2014-12-19 | 3 | -0/+7 |