Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
* | | | | 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 | |
| |\ \ \ \ | ||||||
| | * | | | | [fix] contact_edit.tpl syntax; reduce cols to fit better | Simon L'nu | 2012-03-26 | 1 | -1/+1 | |
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 0 | -0/+0 | |
| |/ / / / | ||||||
| * / / / | add screenshots to diabook | tommy tomson | 2012-03-26 | 4 | -3/+8 | |
| |/ / / | ||||||
| * | | | Merge pull request #170 from simonlnu/master | Simon | 2012-03-26 | 4 | -8/+22 | |
| |\ \ \ | ||||||
| | * | | | fix the search box | Simon L'nu | 2012-03-26 | 4 | -8/+22 | |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 23 | -18/+45 | |
| | |\ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | small fix | tommy tomson | 2012-03-26 | 4 | -11/+7 | |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 | |
* | | | | | comix screenshot | friendica | 2012-03-26 | 1 | -0/+0 | |
* | | | | | more theme screenshots | friendica | 2012-03-26 | 7 | -0/+0 | |
|/ / / / | ||||||
* | | | | don't include friend suggestions for people with the same name as current con... | friendica | 2012-03-25 | 1 | -2/+6 | |
* | | | | position the theme-preview on settings page | friendica | 2012-03-25 | 1 | -0/+4 | |
* | | | | more wordsmithing of the Friendica invitation email | friendica | 2012-03-25 | 1 | -4/+5 | |
* | | | | screenshot gallery | friendica | 2012-03-25 | 12 | -0/+0 | |
* | | | | Merge branch 'pull' | friendica | 2012-03-25 | 7 | -15/+45 | |
|\| | | | ||||||
| * | | | Merge pull request #167 from unary/typo | Simon | 2012-03-25 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | typo datarry -> datarray | Michael Johnston | 2012-03-25 | 1 | -1/+1 | |
| * | | | | Merge pull request #169 from simonlnu/master | Simon | 2012-03-25 | 6 | -14/+44 | |
| |\ \ \ \ | ||||||
| | * | | | | add in the search box | Simon L'nu | 2012-03-25 | 6 | -13/+43 | |
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 6 | -2/+22 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | minor fix to dispy theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 | |
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 | |
* | | | | | | theme preview for end users | friendica | 2012-03-25 | 4 | -1/+23 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'pull' | friendica | 2012-03-25 | 3 | -9/+17 | |
|\| | | | | ||||||
| * | | | | Merge pull request #168 from simonlnu/master | Simon | 2012-03-25 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | urgent fix to dispy-dark theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 | |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 | |
| |/ / / | ||||||
| * | | | small fixes | tommy tomson | 2012-03-25 | 2 | -8/+16 | |
* | | | | theme screenshots | friendica | 2012-03-25 | 6 | -2/+22 | |
|/ / / | ||||||
* | | | enotify plugin hook | friendica | 2012-03-25 | 1 | -2/+24 | |
* | | | NOTIFY_SYSTEM | friendica | 2012-03-25 | 2 | -1/+9 | |
* | | | Merge pull request #166 from simonlnu/master | Simon | 2012-03-25 | 19 | -18/+455 | |
|\ \ \ | ||||||
| * | | | dispy-dark not experimental. start implementing fpostit | Simon L'nu | 2012-03-25 | 19 | -16/+452 | |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 12 | -36/+152 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #165 from tomtom84/master | tomtom84 | 2012-03-24 | 10 | -29/+135 | |
|\ \ \ \ | ||||||
| * | | | | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 10 | -29/+135 | |
|/ / / / | ||||||
* | | | | Merge branch 'pull' | friendica | 2012-03-24 | 8 | -38/+105 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #164 from simonlnu/master | Simon | 2012-03-24 | 8 | -38/+105 | |
| |\ \ \ \ | ||||||
* | | | | | | improved the inivitations and added a bit of sales pitch. | friendica | 2012-03-24 | 2 | -7/+17 | |
|/ / / / / | ||||||
| | * / / | increase version to 1.0 for dispys \o/ | Simon L'nu | 2012-03-25 | 2 | -2/+3 | |
| |/ / / | ||||||
| * | | | implement filer/file-as | Simon L'nu | 2012-03-25 | 8 | -38/+105 | |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 2 | -9/+15 | |
| |\ \ \ | |/ / / |/| | | |