| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 8 | -29/+164 |
|\ \ |
|
| * | | filer: replace "file as" prompt with combobox opened in fancybox | Fabio Comuni | 2012-03-28 | 6 | -29/+145 |
| * | | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 |
| * | | template: field_combobox | Fabio Comuni | 2012-03-28 | 1 | -0/+18 |
* | | | Merge pull request #178 from simonlnu/master | Simon | 2012-03-28 | 20 | -130/+321 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp... | Simon L'nu | 2012-03-28 | 20 | -130/+321 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 0 | -0/+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 |
* | profile_tabs hook | friendica | 2012-03-27 | 2 | -2/+7 |
* | 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 |
| |\ |
|
| | * | provide a close-option for boxes in right_aside and store info via js and coo... | tommy tomson | 2012-03-27 | 9 | -27/+198 |
| |/ |
|
| * | Merge pull request #176 from tomtom84/master | tomtom84 | 2012-03-27 | 6 | -19/+195 |
| |\ |
|
| | * | 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 | 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 |
| |\ |
|
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 3 | -12/+18 |
| | |\
| | |/
| |/| |
|
| | * | 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 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 10 | -26/+42 |
| | |\ |
|
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-27 | 0 | -0/+0 |
* | | | | 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 for Germany, Bulgaria, Republic of Ireland, Scotland, Northern ... | Thomas Willingham | 2012-03-26 | 1 | -8/+8 |
| | * | 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 | Simon L'nu | 2012-03-26 | 2 | -5/+8 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 0 | -0/+0 |
| |/ / |
|
| * | | 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 |
| * | | | marking quattro-green as extension of quattro and deleting the tpl files | Tobias Diekershoff | 2012-03-26 | 14 | -667/+11 |