Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | friendica | 2012-03-31 | 25 | -116/+355 |
|\ | |||||
| * | bug fix in diabook-aerith and -red | tommy tomson | 2012-03-31 | 6 | -22/+22 |
| | | |||||
| * | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 17 | -40/+249 |
| | | |||||
| * | forgot the css changes for last push | Simon L'nu | 2012-03-31 | 2 | -14/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | theme fixes; fix qcomment (finally) | Simon L'nu | 2012-03-31 | 4 | -44/+86 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 1 | -0/+4 |
|/ | |||||
* | quattro: move quattro-green inside quattro folder. | Fabio Comuni | 2012-03-30 | 16 | -72/+87 |
| | | | | Add config option to select quattro color scheme. | ||||
* | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-30 | 6 | -14/+36 |
|\ | |||||
| * | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -14/+36 |
| | | |||||
* | | quattro-green: remove settings code | Fabio Comuni | 2012-03-30 | 1 | -29/+0 |
| | | | | | | | | Use config.php from quattro | ||||
* | | quattro: add config.php | Fabio Comuni | 2012-03-30 | 3 | -35/+35 |
| | | |||||
* | | settings: add "display settings" tab, with UI-related settings. | Fabio Comuni | 2012-03-30 | 2 | -4/+24 |
|/ | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. | ||||
* | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 8 | -32/+29 |
| | |||||
* | css-fixes in diabook-derivates | tommy tomson | 2012-03-30 | 6 | -9/+19 |
| | |||||
* | quattro-green: added Description to the theme.php | Tobias Diekershoff | 2012-03-30 | 1 | -0/+1 |
| | |||||
* | quattro-green: adopted quattro option for centered display | Tobias Diekershoff | 2012-03-30 | 2 | -1/+56 |
| | |||||
* | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 170 | -6/+18107 |
| | |||||
* | quattro-greey: apply theming to private mail | Tobias Diekershoff | 2012-03-30 | 2 | -29/+128 |
| | |||||
* | tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵ | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
| | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 |
| | |||||
* | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 |
| | |||||
* | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 12 | -70/+439 |
|\ | | | | | Updated private message pages | ||||
| * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
| | | |||||
| * | message: remove tabs, move new message link to aside, all message with ↵ | Fabio Comuni | 2012-03-28 | 3 | -6/+22 |
| | | | | | | | | gmail-style | ||||
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-28 | 21 | -129/+315 |
| |\ | |||||
| * | | quattro: tpl for "file as" | Fabio Comuni | 2012-03-28 | 1 | -0/+12 |
| | | | |||||
* | | | Merge pull request #184 from annando/master | friendica | 2012-03-28 | 2 | -5/+6 |
|\ \ \ | | | | | | | | | Enhancing the API - Preparations for a better facebook export | ||||
| * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 232 | -1197/+18385 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | API: Seesmic is now working. Optimizing text export. | Michael Vogel | 2012-03-18 | 2 | -5/+6 |
| | | | | |||||
* | | | | add a searchbox to "find friends" for global search | tommy tomson | 2012-03-28 | 8 | -9/+70 |
| | | | | |||||
* | | | | bugfix in diabook | tommy tomson | 2012-03-28 | 5 | -13/+38 |
| |/ / |/| | | |||||
* | | | Merge branch 'pull' | friendica | 2012-03-28 | 2 | -10/+4 |
|\ \ \ | |||||
| * | | | really fix it this time... | Simon L'nu | 2012-03-28 | 2 | -12/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | WITH is going on? | Simon L'nu | 2012-03-28 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | Merge branch 'pull' | friendica | 2012-03-28 | 26 | -155/+470 |
|\| | | | |||||
| * | | | Merge pull request #180 from simonlnu/master | Simon | 2012-03-28 | 2 | -11/+13 |
| |\ \ \ | | | | | | | | | | | duh... | ||||
| | * | | | doh fix | Simon L'nu | 2012-03-28 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | Merge pull request #179 from fabrixxm/master | fabrixxm | 2012-03-28 | 6 | -27/+149 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | new field_combobox template and some eyecandy to "file as" function | ||||
| | * | | filer: replace "file as" prompt with combobox opened in fancybox | Fabio Comuni | 2012-03-28 | 5 | -27/+131 |
| | | | | |||||
| | * | | template: field_combobox | Fabio Comuni | 2012-03-28 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | a text input plus a select wich updates text input value on change. html5 version commented out for poor browsers support. | ||||
| * | | | add some icons for the newbie stuff (diabook but 24px not 32); fixes for ↵ | Simon L'nu | 2012-03-28 | 20 | -130/+321 |
| |/ / | | | | | | | | | | | | | | | | dispy (broken last push) Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* / / | title not updated when editing post | friendica | 2012-03-28 | 1 | -1/+0 |
|/ / | |||||
* | | support autocomplete @-tags in plaintext mode | friendica | 2012-03-28 | 2 | -0/+4 |
| | | |||||
* | | vier navbar messed up after default theme template move | friendica | 2012-03-28 | 1 | -0/+131 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2012-03-27 | 15 | -52/+435 |
|\ \ | |||||
| * | | small fix in diabook | tommy tomson | 2012-03-27 | 3 | -3/+3 |
| | | | |||||
| * | | fixes in diabook | tommy tomson | 2012-03-27 | 6 | -13/+49 |
| | | | |||||
| * | | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 9 | -27/+198 |
| | | | | | | | | | | | | cookies | ||||
| * | | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 6 | -19/+195 |
| | | | | | | | | | | | | cookies | ||||
* | | | turn on gecko spellcheck in tinymce | friendica | 2012-03-27 | 5 | -2/+6 |
|/ / |