Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | use theme directory for page templates, not language directory | friendica | 2012-03-27 | 1 | -2/+2 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
| * | | Merge pull request #177 from tomtom84/master | tomtom84 | 2012-03-27 | 9 | -27/+198 | |
| |\ \ | | | | | | | | | fixes in theme diabook | |||||
| | * | | provide a close-option for boxes in right_aside and store info via js and ↵ | tommy tomson | 2012-03-27 | 9 | -27/+198 | |
| |/ / | | | | | | | | | | cookies | |||||
| * | | Merge pull request #176 from tomtom84/master | tomtom84 | 2012-03-27 | 6 | -19/+195 | |
| |\ \ | | | | | | | | | fixes in theme diabook-blue | |||||
| | * | | 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 | 6 | -3/+7 | |
|/ / | ||||||
* | | Merge branch 'pull' | friendica | 2012-03-27 | 6 | -115/+216 | |
|\ \ | ||||||
| * \ | Merge pull request #175 from simonlnu/master | Simon | 2012-03-27 | 6 | -115/+216 | |
| |\ \ | | | | | | | | | various fixes for dispys | |||||
| | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 3 | -12/+18 | |
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile wall privacy don't expire filed items * master: | |||||
| | * | | 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> | |||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 10 | -26/+42 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add "find friends" to right_aside to diabook, fixes in css in diabook fixed Umlaute in de strings.php * master: | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: @-completion bug qcomment enhancements theme description with preview (non-translatable unfortunately) preparation for some possibly killer features translate br with extra elements revup Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK. * master: | |||||
* | | | | | form security error when using existing photo | friendica | 2012-03-27 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | profile wall privacy | friendica | 2012-03-27 | 2 | -12/+13 | |
| | | | | ||||||
* | | | | Merge branch 'pull' | friendica | 2012-03-27 | 10 | -26/+42 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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 | |
| |/ / | ||||||
* / / | don't expire filed items | friendica | 2012-03-27 | 1 | -0/+5 | |
|/ / | ||||||
* | | @-completion bug | friendica | 2012-03-26 | 1 | -5/+5 | |
| | | ||||||
* | | qcomment enhancements | friendica | 2012-03-26 | 3 | -5/+25 | |
| | | ||||||
* | | theme description with preview (non-translatable unfortunately) | friendica | 2012-03-26 | 3 | -2/+13 | |
| | | ||||||
* | | preparation for some possibly killer features | friendica | 2012-03-26 | 3 | -15/+23 | |
| | | ||||||
* | | translate br with extra elements | friendica | 2012-03-26 | 2 | -2/+2 | |
| | | ||||||
* | | Merge branch 'pull' | friendica | 2012-03-26 | 33 | -731/+101 | |
|\ \ | ||||||
| * \ | Merge pull request #174 from beardy-unixer/master | friendica | 2012-03-26 | 1 | -8/+8 | |
| |\ \ | | | | | | | | | Fixed regions | |||||
| | * | | Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern ↵ | Thomas Willingham | 2012-03-26 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | Ireland, Spain, and the UK. | |||||
| | * | | Merge remote-tracking branch 'main/master' | Thomas Willingham | 2012-03-26 | 527 | -11251/+34436 | |
| | |\ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #173 from simonlnu/master | Simon | 2012-03-26 | 2 | -5/+8 | |
| |\ \ \ | | | | | | | | | | | fix dispy's nav element; fix colours in #search-text | |||||
| | * | | | 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> | |||||
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 0 | -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 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 | |
| | | | | | ||||||
| * | | | | marking quattro-green as extension of quattro and deleting the tpl files | Tobias Diekershoff | 2012-03-26 | 14 | -667/+11 | |
| | | | | | ||||||
| | | * | | Merge remote-tracking branch 'main/master' | Thomas | 2012-03-19 | 3 | -78/+66 | |
| | | |\ \ | ||||||
* | | | | | | revup | friendica | 2012-03-26 | 1 | -1/+1 | |
| |/ / / / |/| | | | | ||||||
* | | | | | screenshot for darkzero-NS, same as darkzero | friendica | 2012-03-26 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | 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 | |
| | | | | | ||||||
* | | | | | Merge branch 'pull' | friendica | 2012-03-26 | 4 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | small fix in diabook :: add local friendica to right_aside | tommy tomson | 2012-03-26 | 4 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | language issues in enotify | friendica | 2012-03-26 | 1 | -5/+9 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'pull' | friendica | 2012-03-26 | 12 | -22/+37 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #171 from simonlnu/master | Simon | 2012-03-26 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | changes in contact_edit.tpl |