Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update pt-br translation | Alexandre Hannud Abdo | 2014-05-23 | 2 | -5322/+5214 |
| | |||||
* | fix search to use in app | friendica | 2014-05-22 | 1 | -2/+5 |
| | |||||
* | Merge pull request #469 from tuscanhobbit/master | Paolo T | 2014-05-22 | 2 | -2440/+3 |
|\ | | | | | IT: strings fixed | ||||
| * | IT: strings fixed | Paolo Tacconi | 2014-05-22 | 2 | -2440/+3 |
| | | |||||
* | | Merge pull request #468 from tuscanhobbit/master | Paolo T | 2014-05-22 | 2 | -4126/+6455 |
|\| | | | | | IT: updated strings | ||||
| * | IT: updated strings | Paolo Tacconi | 2014-05-22 | 2 | -4126/+6455 |
| | | |||||
* | | more app work | friendica | 2014-05-21 | 2 | -1/+8 |
| | | |||||
* | | change app dropdown to point to apps module (changes nav template). ↵ | friendica | 2014-05-21 | 1 | -7/+2 |
| | | | | | | | | Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content. | ||||
* | | Merge pull request #464 from solstag/master | RedMatrix | 2014-05-21 | 3 | -585/+614 |
|\ \ | | | | | | | Bunch of translation work | ||||
| * | | Update pt-br translation. | Alexandre Hannud Abdo | 2014-05-21 | 3 | -585/+614 |
| | | | |||||
* | | | make it possible to edit/delete apps via /apps/personal/edit | friendica | 2014-05-21 | 1 | -1/+1 |
|/ / | |||||
* | | more app work | friendica | 2014-05-20 | 2 | -3/+7 |
| | | |||||
* | | unfinished work for creating app | friendica | 2014-05-20 | 1 | -0/+26 |
| | | |||||
* | | most of the remaining apps basic infrastructure except a form to create the ↵ | friendica | 2014-05-20 | 3 | -5/+19 |
| | | | | | | | | things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now. | ||||
* | | the js seems to interfere with something else... comment out for now... | marijus | 2014-05-20 | 2 | -8/+8 |
| | | |||||
* | | some work on comment_item.tpl | marijus | 2014-05-20 | 6 | -176/+77 |
| | | |||||
* | | more app backend work | friendica | 2014-05-19 | 1 | -0/+6 |
| | | |||||
* | | implement modal for more then 10 likes/dislikes | marijus | 2014-05-18 | 1 | -0/+44 |
| | | |||||
* | | 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 |
| | | |||||
* | | add hover tips - except we need a way to translate the things | friendica | 2014-05-15 | 1 | -1/+1 |
| | | |||||
* | | some sidebar content (doesn't yet do anything) | friendica | 2014-05-15 | 2 | -0/+13 |
| | | |||||
* | | add the theme file | friendica | 2014-05-15 | 1 | -0/+5 |
| | | |||||
* | | the app menu takes form | friendica | 2014-05-15 | 1 | -5/+9 |
| | | |||||
* | | clear the jot-nets float | friendica | 2014-05-14 | 2 | -2/+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 |
| | | | |||||
* | | | whitespace | marijus | 2014-05-14 | 1 | -6/+6 |
| | | | |||||
* | | | colorpicker: enable rgba for for item and comment colors | marijus | 2014-05-14 | 1 | -1/+2 |
|/ / | |||||
* | | xss prevention | friendica | 2014-05-14 | 1 | -0/+2 |
| | | |||||
* | | more choklet work | friendica | 2014-05-13 | 1 | -0/+48 |
| | | |||||
* | | choklet tweaks | friendica | 2014-05-13 | 2 | -2/+3 |
| | | |||||
* | | allow jgrowl 'close all' message to be translated | friendica | 2014-05-13 | 2 | -0/+2 |
| | | |||||
* | | fix ca anomaly | friendica | 2014-05-13 | 1 | -1/+1 |
| | | |||||
* | | missing paren | friendica | 2014-05-13 | 11 | -11/+11 |
| | | |||||
* | | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 11 | -12/+23 |
| | | |||||
* | | make comment_indent an option and removeitem_opacity as it is not working ↵ | marijus | 2014-05-12 | 3 | -7/+6 |
| | | | | | | | | properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise. | ||||
* | | fix bootstrap override position issue with dropdown menu | marijus | 2014-05-12 | 1 | -17/+0 |
| | | |||||
* | | Merge pull request #458 from pixelroot/master | RedMatrix | 2014-05-12 | 2 | -5308/+5945 |
|\ \ | | | | | | | modified: view/ru/messages.po | ||||
| * | | modified: view/ru/messages.po | pixelroot | 2014-05-12 | 2 | -5308/+5945 |
| | | | | | | | | | | | | modified: view/ru/strings.php | ||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-11 | 5 | -9/+63 |
|\ \ \ | |||||
| * \ \ | Merge pull request #456 from cvogeley/master | RedMatrix | 2014-05-12 | 3 | -8/+59 |
| |\ \ \ | | | | | | | | | | | Move "boxy" conversation design into a schema file | ||||
| | * | | | grrr | Christian Vogeley | 2014-05-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | For the moment last change | Christian Vogeley | 2014-05-11 | 1 | -5/+7 |
| | | | | | |||||
| | * | | | saved 2 | Christian Vogeley | 2014-05-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | saved | Christian Vogeley | 2014-05-11 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | some corrections and cleanup | Christian Vogeley | 2014-05-11 | 2 | -5/+8 |
| | | | | |