aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #60 from simonlnu/masterSimon2012-03-026-123/+135
|\
| * apply changes to templates to testbubbleSimon L'nu2012-03-026-123/+135
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
|/
* Merge pull request #58 from simonlnu/masterSimon2012-03-025-4/+4
|\
| * fix for comment-wwedit-wrapper CSS class in tpl had a stray $Simon L'nu2012-03-025-4/+4
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0213-69/+50
| |\
| * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-021-0/+12
| |\ \
| * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0236-640/+952
| |\ \ \
| * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-35/+115
| |\ \ \ \
| * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-10/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-281-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-286-55/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-272-9/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-273-7/+9
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
* | | | | | | | | | | Merge pull request #59 from tomtom84/masterSimon2012-03-0223-0/+2331
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | deleted readme.txt from folder diabooktommy tomson2012-03-021-0/+0
| * | | | | | | | | | github finally workingtommy tomson2012-03-021-2/+0
| * | | | | | | | | | adjust3tommy tomson2012-03-021-0/+1
| * | | | | | | | | | Merge remote-tracking branch 'tomtom84_friendica/master' into master-2tommy tomson2012-03-021-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | adjusttommy tomson2012-03-0224-0/+2332
| * | | | | | | | | | | adjust2tommy tomson2012-03-0223-0/+2331
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #57 from fabrixxm/masterSimon2012-03-0213-69/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | template proc: allow isolation of var name between [ and ]Fabio Comuni2012-03-021-2/+4
| * | | | | | | | | | group: fix create new group formFabio Comuni2012-03-021-0/+1
| * | | | | | | | | | templates: fix tagsFabio Comuni2012-03-0210-20/+22
| * | | | | | | | | | template proc: remove unused function and commented out codeFabio Comuni2012-03-021-44/+1
| * | | | | | | | | | template proc: first optimizationFabio Comuni2012-03-022-10/+29
|/ / / / / / / / / /
* | | | | | | | | / expand multiple heart smilies e.g. <3333friendica2012-03-021-0/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'pull'friendica2012-03-0225-633/+731
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-0225-633/+731
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-03-018-35/+115
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-0115-551/+584
| | * | | | | | | | | template proc: avoid a notice and allow template name to include to be passed...Fabio Comuni2012-03-011-1/+9
| | * | | | | | | | | show relation in contact_templateFabio Comuni2012-03-011-0/+1
| | * | | | | | | | | admin: fix small stringFabio Comuni2012-03-011-2/+5
| | * | | | | | | | | Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-02-2995-2292/+4726
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | fix visualization in groupeditorFabio Comuni2012-02-231-2/+2
| | * | | | | | | | | less html in mod/group.php, template for group members editor, quattro theme ...Fabio Comuni2012-02-237-79/+132
* | | | | | | | | | | item table update for file featurefriendica2012-03-023-3/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #56 from tomtom84/masterfriendica2012-03-011-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master'tommy tomson2012-03-028-4/+211
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'pull'friendica2012-03-016-3/+205
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #54 from campino/masterfriendica2012-03-016-3/+205
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master'Alexander Kampmann2012-03-0184-1362/+2846
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Enabled automated doc building. Changes:Alexander Kampmann2012-03-016-3/+205
* | | | | | | | | | | probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic conten...friendica2012-03-012-1/+6
|/ / / / / / / / / /
| | * / / / / / / / diabook committommy tomson2012-03-021-0/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | yet more work on notificationsfriendica2012-02-293-29/+54
* | | | | | | | | notification enhancementsfriendica2012-02-295-7/+43