| Commit message (Expand) | Author | Age | Files | Lines |
* | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0... | Simon L'nu | 2012-03-29 | 6 | -58/+44 |
* | 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 |
|\ |
|
| * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 |
| * | message: remove tabs, move new message link to aside, all message with gmail-... | Fabio Comuni | 2012-03-28 | 3 | -6/+22 |
| * | 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 |
|\ \ \ |
|
| * \ \ | 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 |
| * | | | WITH is going on? | Simon L'nu | 2012-03-28 | 2 | -2/+4 |
* | | | | Merge branch 'pull' | friendica | 2012-03-28 | 26 | -155/+470 |
|\| | | |
|
| * | | | Merge pull request #180 from simonlnu/master | Simon | 2012-03-28 | 2 | -11/+13 |
| |\ \ \ |
|
| | * | | | doh fix | Simon L'nu | 2012-03-28 | 2 | -11/+13 |
| * | | | | Merge pull request #179 from fabrixxm/master | fabrixxm | 2012-03-28 | 6 | -27/+149 |
| |\ \ \ \
| | |/ / /
| |/| | /
| | | |/
| | |/| |
|
| | * | | 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 |
| * | | | add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp... | Simon L'nu | 2012-03-28 | 20 | -130/+321 |
| |/ / |
|
* / / | 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 coo... | tommy tomson | 2012-03-27 | 9 | -27/+198 |
| * | | provide a close-option for boxes in right_aside and store info via js and coo... | tommy tomson | 2012-03-27 | 6 | -19/+195 |
* | | | turn on gecko spellcheck in tinymce | friendica | 2012-03-27 | 5 | -2/+6 |
|/ / |
|
* | | more fixes for dispys | Simon L'nu | 2012-03-27 | 6 | -10/+23 |
* | | add dispy-dark snapshot; fix toolbar | Simon L'nu | 2012-03-27 | 3 | -109/+197 |
* | | add "find friends" to right_aside to diabook, fixes in css in diabook | tommy tomson | 2012-03-27 | 9 | -16/+32 |
* | | fixed Umlaute in de strings.php | Tobias Diekershoff | 2012-03-27 | 1 | -10/+10 |
* | | qcomment enhancements | friendica | 2012-03-26 | 3 | -5/+25 |
* | | fix dispy's nav element; fix colours in #search-text | Simon L'nu | 2012-03-26 | 2 | -5/+8 |
* | | add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_a... | tommy tomson | 2012-03-26 | 8 | -20/+50 |
* | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-26 | 13 | -36/+29 |
|\ \ |
|
| * | | minor css fixes in diabook | tommy tomson | 2012-03-26 | 12 | -36/+29 |
| * | | screenshot for darkzero-NS, same as darkzero | friendica | 2012-03-26 | 1 | -0/+0 |
* | | | marking quattro-green as extension of quattro and deleting the tpl files | Tobias Diekershoff | 2012-03-26 | 14 | -667/+11 |
|/ / |
|
* | | added quaddro templates to quaddro-green | Tobias Diekershoff | 2012-03-26 | 13 | -0/+667 |
* | | Merge pull request #172 from fabrixxm/master | friendica | 2012-03-26 | 34 | -902/+902 |
|\ \ |
|
| * | | diabook: small fix in theme_info array | Fabio Comuni | 2012-03-26 | 1 | -1/+1 |
| * | | themes: use duepuntozero tpls as default | Fabio Comuni | 2012-03-26 | 33 | -901/+901 |
* | | | small fix in diabook :: add local friendica to right_aside | tommy tomson | 2012-03-26 | 4 | -1/+3 |
* | | | Merge branch 'pull' | friendica | 2012-03-26 | 12 | -22/+37 |
|\ \ \ |
|
| * | | | [fix] contact_edit.tpl syntax; reduce cols to fit better | Simon L'nu | 2012-03-26 | 1 | -1/+1 |