aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed Umlaute in de strings.phpTobias Diekershoff2012-03-271-10/+10
|
* @-completion bugfriendica2012-03-261-5/+5
|
* qcomment enhancementsfriendica2012-03-263-5/+25
|
* theme description with preview (non-translatable unfortunately)friendica2012-03-263-2/+13
|
* preparation for some possibly killer featuresfriendica2012-03-263-15/+23
|
* translate br with extra elementsfriendica2012-03-262-2/+2
|
* Merge branch 'pull'friendica2012-03-2633-731/+101
|\
| * Merge pull request #174 from beardy-unixer/masterfriendica2012-03-261-8/+8
| |\ | | | | | | Fixed regions
| | * Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern ↵Thomas Willingham2012-03-261-8/+8
| | | | | | | | | | | | Ireland, Spain, and the UK.
| | * Merge remote-tracking branch 'main/master'Thomas Willingham2012-03-26527-11251/+34436
| | |\ | | |/ | |/|
| * | Merge pull request #173 from simonlnu/masterSimon2012-03-262-5/+8
| |\ \ | | | | | | | | fix dispy's nav element; fix colours in #search-text
| | * | fix dispy's nav element; fix colours in #search-textSimon L'nu2012-03-262-5/+8
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-260-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css marking quattro-green as extension of quattro and deleting the tpl files minor css fixes in diabook screenshot for darkzero-NS, same as darkzero added quaddro templates to quaddro-green language issues in enotify small fix in diabook :: add local friendica to right_aside comix screenshot diabook: small fix in theme_info array more theme screenshots themes: use duepuntozero tpls as default * master:
| * | add "similar interrest", "Friend Suggestions" and "Invite Friends" to ↵tommy tomson2012-03-268-20/+50
| | | | | | | | | | | | right_aside, fixes in css
| * | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2613-36/+29
| |\ \
| | * | minor css fixes in diabooktommy tomson2012-03-2612-36/+29
| | | |
| * | | marking quattro-green as extension of quattro and deleting the tpl filesTobias Diekershoff2012-03-2614-667/+11
| | | |
| | | * Merge remote-tracking branch 'main/master'Thomas2012-03-193-78/+66
| | | |\
* | | | | revupfriendica2012-03-261-1/+1
| |/ / / |/| | |
* | | | screenshot for darkzero-NS, same as darkzerofriendica2012-03-261-0/+0
|/ / /
* | | added quaddro templates to quaddro-greenTobias Diekershoff2012-03-2613-0/+667
| | |
* | | Merge pull request #172 from fabrixxm/masterfriendica2012-03-2634-902/+902
|\ \ \ | | | | | | | | Rearrange theme tpls
| * | | diabook: small fix in theme_info arrayFabio Comuni2012-03-261-1/+1
| | | |
| * | | themes: use duepuntozero tpls as defaultFabio Comuni2012-03-2633-901/+901
| | | |
* | | | Merge branch 'pull'friendica2012-03-264-1/+3
|\ \ \ \
| * | | | small fix in diabook :: add local friendica to right_asidetommy tomson2012-03-264-1/+3
| | | | |
* | | | | language issues in enotifyfriendica2012-03-261-5/+9
|/ / / /
* | | | Merge branch 'pull'friendica2012-03-2612-22/+37
|\ \ \ \
| * \ \ \ Merge pull request #171 from simonlnu/masterSimon2012-03-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | changes in contact_edit.tpl
| | * | | | [fix] contact_edit.tpl syntax; reduce cols to fit betterSimon L'nu2012-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-260-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add screenshots to diabook * master:
| * / / / add screenshots to diabooktommy tomson2012-03-264-3/+8
| |/ / /
| * | | Merge pull request #170 from simonlnu/masterSimon2012-03-264-8/+22
| |\ \ \ | | | | | | | | | | fix search box in dispys
| | * | | fix the search boxSimon L'nu2012-03-264-8/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2623-18/+45
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: small fix don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. position the theme-preview on settings page more wordsmithing of the Friendica invitation email screenshot gallery theme preview for end users * master:
| * | | | small fixtommy tomson2012-03-264-11/+7
| | | | |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: typo datarry -> datarray * master:
* | | | | comix screenshotfriendica2012-03-261-0/+0
| | | | |
* | | | | more theme screenshotsfriendica2012-03-267-0/+0
|/ / / /
* | | | don't include friend suggestions for people with the same name as current ↵friendica2012-03-251-2/+6
| | | | | | | | | | | | | | | | contacts. This will remove a lot of #whoaretonybaldwin.
* | | | position the theme-preview on settings pagefriendica2012-03-251-0/+4
| | | |
* | | | more wordsmithing of the Friendica invitation emailfriendica2012-03-251-4/+5
| | | |
* | | | screenshot galleryfriendica2012-03-2512-0/+0
| | | |
* | | | Merge branch 'pull'friendica2012-03-257-15/+45
|\| | |
| * | | Merge pull request #167 from unary/typoSimon2012-03-251-1/+1
| |\ \ \ | | | | | | | | | | typo datarry -> datarray
| | * | | typo datarry -> datarrayMichael Johnston2012-03-251-1/+1
| | | | |
| * | | | Merge pull request #169 from simonlnu/masterSimon2012-03-256-14/+44
| |\ \ \ \ | | | | | | | | | | | | search box
| | * | | | add in the search boxSimon L'nu2012-03-256-13/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-256-2/+22
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme screenshots * master:
| | * | | | minor fix to dispy theme.phpSimon L'nu2012-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>