Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 232 | -1197/+18385 |
|\ | |||||
| * | 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 |
| |/ | |||||
| * | more fixes for dispys | Simon L'nu | 2012-03-27 | 6 | -10/+23 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | add dispy-dark snapshot; fix toolbar | Simon L'nu | 2012-03-27 | 3 | -109/+197 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | 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 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | add "similar interrest", "Friend Suggestions" and "Invite Friends" to ↵ | tommy tomson | 2012-03-26 | 8 | -20/+50 |
| | | | | | | | | right_aside, fixes in css | ||||
| * | 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 |
| |\ | | | | | | | Rearrange theme tpls | ||||
| | * | 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 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | add screenshots to diabook | tommy tomson | 2012-03-26 | 4 | -3/+8 |
| | |/ | |||||
| | * | fix the search box | Simon L'nu | 2012-03-26 | 4 | -8/+22 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | small fix | tommy tomson | 2012-03-26 | 4 | -11/+7 |
| | | | |||||
| * | | comix screenshot | friendica | 2012-03-26 | 1 | -0/+0 |
| | | | |||||
| * | | more theme screenshots | friendica | 2012-03-26 | 7 | -0/+0 |
| |/ | |||||
| * | position the theme-preview on settings page | friendica | 2012-03-25 | 1 | -0/+4 |
| | | |||||
| * | screenshot gallery | friendica | 2012-03-25 | 12 | -0/+0 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-03-25 | 6 | -14/+44 |
| |\ | |||||
| | * | add in the search box | Simon L'nu | 2012-03-25 | 6 | -13/+43 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 2 | -0/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme screenshots * master: | ||||
| | * | | minor fix to dispy theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | theme preview for end users | friendica | 2012-03-25 | 2 | -1/+10 |
| | |/ | |/| |