| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 0 | -0/+0 |
| * | Merge pull request #61 from fabrixxm/master | Simon | 2012-03-02 | 2 | -2/+11 |
| |\ |
|
| | * | fix @mention autocomplete in comments | Fabio Comuni | 2012-03-03 | 1 | -1/+1 |
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-03 | 33 | -127/+2470 |
| | |\
| |/
|/| |
|
| * | | Merge pull request #60 from simonlnu/master | Simon | 2012-03-02 | 6 | -123/+135 |
| |\ \ |
|
| | * | | apply changes to templates to testbubble | Simon L'nu | 2012-03-02 | 6 | -123/+135 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 0 | -0/+0 |
| |/ / |
|
| * | | Merge pull request #58 from simonlnu/master | Simon | 2012-03-02 | 5 | -4/+4 |
| |\ \ |
|
| | * | | fix for comment-wwedit-wrapper CSS class in tpl had a stray $ | Simon L'nu | 2012-03-02 | 5 | -4/+4 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 13 | -69/+50 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 1 | -0/+12 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 36 | -640/+952 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -35/+115 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -10/+24 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 6 | -55/+14 |
| | |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 2 | -9/+18 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 3 | -7/+9 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 0 | -0/+0 |
| * | | | | | | | | | | | | Merge pull request #59 from tomtom84/master | Simon | 2012-03-02 | 23 | -0/+2331 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | deleted readme.txt from folder diabook | tommy tomson | 2012-03-02 | 1 | -0/+0 |
| | * | | | | | | | | | | | github finally working | tommy tomson | 2012-03-02 | 1 | -2/+0 |
| | * | | | | | | | | | | | adjust3 | tommy tomson | 2012-03-02 | 1 | -0/+1 |
| | * | | | | | | | | | | | Merge remote-tracking branch 'tomtom84_friendica/master' into master-2 | tommy tomson | 2012-03-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | adjust | tommy tomson | 2012-03-02 | 24 | -0/+2332 |
| | * | | | | | | | | | | | | adjust2 | tommy tomson | 2012-03-02 | 23 | -0/+2331 |
| | |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | | Merge pull request #57 from fabrixxm/master | Simon | 2012-03-02 | 13 | -69/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | |
|
| | | | | | | | | | | | * | template proc: fix variables regexp | Fabio Comuni | 2012-03-03 | 1 | -1/+10 |
| | | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
| | * | | | | | | | | | | template proc: allow isolation of var name between [ and ] | Fabio Comuni | 2012-03-02 | 1 | -2/+4 |
| | * | | | | | | | | | | group: fix create new group form | Fabio Comuni | 2012-03-02 | 1 | -0/+1 |
| | * | | | | | | | | | | templates: fix tags | Fabio Comuni | 2012-03-02 | 10 | -20/+22 |
| | * | | | | | | | | | | template proc: remove unused function and commented out code | Fabio Comuni | 2012-03-02 | 1 | -44/+1 |
| | * | | | | | | | | | | template proc: first optimization | Fabio Comuni | 2012-03-02 | 2 | -10/+29 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | / | expand multiple heart smilies e.g. <3333 | friendica | 2012-03-02 | 1 | -0/+12 |
| | |_|_|_|_|_|_|_|/
|/| | | | | | | | |
|
| * | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-02 | 25 | -633/+731 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge pull request #55 from fabrixxm/master | fabrixxm | 2012-03-02 | 25 | -633/+731 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-03-01 | 8 | -35/+115 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|/
| | | |/| | | | | | | |
|
| | | * | | | | | | | | | conversation: remove templating items in code and move it to template. | Fabio Comuni | 2012-03-01 | 15 | -551/+584 |
| | | * | | | | | | | | | template proc: avoid a notice and allow template name to include to be passed... | Fabio Comuni | 2012-03-01 | 1 | -1/+9 |
| | | * | | | | | | | | | show relation in contact_template | Fabio Comuni | 2012-03-01 | 1 | -0/+1 |
| | | * | | | | | | | | | admin: fix small string | Fabio Comuni | 2012-03-01 | 1 | -2/+5 |
| | | * | | | | | | | | | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-02-29 | 95 | -2292/+4726 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|/
| | | |/| | | | | | | |
|
| | | * | | | | | | | | | fix visualization in groupeditor | Fabio Comuni | 2012-02-23 | 1 | -2/+2 |
| | | * | | | | | | | | | less html in mod/group.php, template for group members editor, quattro theme ... | Fabio Comuni | 2012-02-23 | 7 | -79/+132 |
| * | | | | | | | | | | | item table update for file feature | friendica | 2012-03-02 | 3 | -3/+10 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | Merge pull request #56 from tomtom84/master | friendica | 2012-03-01 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | tommy tomson | 2012-03-02 | 8 | -4/+211 |
| | |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-01 | 6 | -3/+205 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #54 from campino/master | friendica | 2012-03-01 | 6 | -3/+205 |
| | |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / / / /
| |/| | | | | | | | | |
|
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Alexander Kampmann | 2012-03-01 | 84 | -1362/+2846 |
| | | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
