Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-05-19 | 10 | -599/+841 |
|\ | |||||
| * | support commerical apps | friendica | 2014-05-18 | 3 | -3/+18 |
| | | |||||
| * | more app work | friendica | 2014-05-18 | 1 | -0/+44 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-18 | 3 | -1/+63 |
| |\ | |||||
| | * | implement modal for more then 10 likes/dislikes | marijus | 2014-05-18 | 3 | -1/+63 |
| | | | |||||
| * | | more app infrastructure | friendica | 2014-05-18 | 2 | -5/+50 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-17 | 3 | -586/+615 |
| |\ | |||||
| | * | Dark schema: Minor minor edit | jeroenpraat | 2014-05-17 | 1 | -2/+2 |
| | | | |||||
| | * | Merge pull request #462 from tuscanhobbit/master | Paolo T | 2014-05-17 | 2 | -584/+613 |
| | |\ | | | | | | | | | IT: strings updated | ||||
| | | * | IT: strings updated | tuscanhobbit | 2014-05-17 | 2 | -584/+613 |
| | | | | |||||
| * | | | app DB structure | friendica | 2014-05-17 | 4 | -9/+56 |
| |/ / | |||||
* / / | Minor doco | Thomas Willingham | 2014-05-16 | 1 | -2/+2 |
|/ / | |||||
* | | the help app | friendica | 2014-05-16 | 3 | -1/+4 |
| | | |||||
* | | more doc updates | friendica | 2014-05-16 | 5 | -0/+438 |
| | | |||||
* | | doc updates | friendica | 2014-05-16 | 65 | -1174/+1356 |
| | | |||||
* | | icons | friendica | 2014-05-15 | 2 | -1/+2 |
| | | |||||
* | | some photos | friendica | 2014-05-15 | 8 | -2/+4 |
| | | |||||
* | | add hover tips - except we need a way to translate the things | friendica | 2014-05-15 | 2 | -1/+6 |
| | | |||||
* | | this is how to link photos to apps | friendica | 2014-05-15 | 2 | -0/+1 |
| | | |||||
* | | login app | friendica | 2014-05-15 | 2 | -0/+7 |
| | | |||||
* | | add directory | friendica | 2014-05-15 | 2 | -1/+3 |
| | | |||||
* | | some sidebar content (doesn't yet do anything) | friendica | 2014-05-15 | 4 | -1/+26 |
| | | |||||
* | | more base apps | friendica | 2014-05-15 | 3 | -1/+9 |
| | | |||||
* | | add the theme file | friendica | 2014-05-15 | 1 | -0/+5 |
| | | |||||
* | | first apd files | friendica | 2014-05-15 | 3 | -0/+10 |
| | | |||||
* | | the app menu takes form | friendica | 2014-05-15 | 3 | -15/+59 |
| | | |||||
* | | apps: provide a default photo if none was set. For now it's the default ↵ | friendica | 2014-05-15 | 1 | -1/+14 |
| | | | | | | | | profile photo until we have a default app photo | ||||
* | | some backend stuff for apps | friendica | 2014-05-15 | 4 | -9/+77 |
| | | |||||
* | | clear the jot-nets float | friendica | 2014-05-14 | 2 | -2/+2 |
| | | |||||
* | | doc updates | friendica | 2014-05-14 | 2 | -0/+2 |
| | | |||||
* | | major cleanup of choklet+bannertwo | friendica | 2014-05-14 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'navbacker' | friendica | 2014-05-14 | 7 | -13/+51 |
|\ \ | |||||
| * | | fix fluid layout for choklet_bannertwo | friendica | 2014-05-14 | 7 | -18/+43 |
| | | | |||||
| * | | this doesn't really work | friendica | 2014-05-14 | 3 | -3/+16 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-14 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | whitespace | marijus | 2014-05-14 | 1 | -6/+6 |
| | | | | |||||
| * | | | colorpicker: enable rgba for for item and comment colors | marijus | 2014-05-14 | 1 | -1/+2 |
| |/ / | |||||
* / / | explain default permissions choices better | friendica | 2014-05-14 | 1 | -2/+13 |
|/ / | |||||
* | | fix author delete (non-owner) | friendica | 2014-05-14 | 1 | -3/+3 |
| | | |||||
* | | xss prevention | friendica | 2014-05-14 | 3 | -1/+8 |
| | | |||||
* | | more choklet work | friendica | 2014-05-13 | 1 | -0/+48 |
| | | |||||
* | | choklet tweaks | friendica | 2014-05-13 | 2 | -2/+3 |
| | | |||||
* | | add photo widget | friendica | 2014-05-13 | 2 | -10/+57 |
| | | |||||
* | | add activity_received hook | friendica | 2014-05-13 | 1 | -0/+3 |
| | | |||||
* | | zrlify (turn into zmg) any relevant img tags in a post. | friendica | 2014-05-13 | 2 | -0/+30 |
| | | |||||
* | | allow jgrowl 'close all' message to be translated | friendica | 2014-05-13 | 3 | -0/+3 |
| | | |||||
* | | fix ca anomaly | friendica | 2014-05-13 | 1 | -1/+1 |
| | | |||||
* | | missing paren | friendica | 2014-05-13 | 12 | -12/+12 |
| | | |||||
* | | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 13 | -14/+26 |
| | | |||||
* | | update the tagging doco | friendica | 2014-05-12 | 1 | -5/+50 |
| | |