aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
| | | | | | | | | | | * remotes/upstream/master: deleted readme.txt from folder diabook github finally working adjust3 adjust2 adjust * master:
* Merge pull request #58 from simonlnu/masterSimon2012-03-025-4/+4
|\ | | | | fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
| * fix for comment-wwedit-wrapper CSS class in tpl had a stray $Simon L'nu2012-03-025-4/+4
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0213-69/+50
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: template proc: allow isolation of var name between [ and ] group: fix create new group form templates: fix tags template proc: remove unused function and commented out code template proc: first optimization * master:
| * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-021-0/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: expand multiple heart smilies e.g. <3333 * master:
| * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0236-640/+952
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: item table update for file feature probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type diabook commit conversation: remove templating items in code and move it to template. Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them template proc: avoid a notice and allow template name to include to be passed with a variable value show relation in contact_template admin: fix small string fix visualization in groupeditor less html in mod/group.php, template for group members editor, quattro theme for group edit. * master:
| * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-35/+115
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: yet more work on notifications notification enhancements better handling of multiple notifications for same item, and old notifications * master:
| * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-10/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Update LICENSE Update README cleaned up mess created when both people request friendship and one approves as duplex call time pass by reference deprecated From Tobias H - catch some irregularities caused by cut/paste code * master:
| * \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-281-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix url and network display * master:
| * \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-286-55/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: update globaldir when page-type changes, add spam date field clicking contact on contacts page broken link * master:
| * \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-272-9/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cleanup notify subject lines * master:
| * \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-273-7/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master:
| * | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master:
* | | | | | | | | | | Merge pull request #59 from tomtom84/masterSimon2012-03-0223-0/+2331
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | diabook theme
| * | | | | | | | | | 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 processor optimizations
| * | | | | | | | | | template proc: allow isolation of var name between [ and ]Fabio Comuni2012-03-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $var.name -> $[var.name]
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Some minor and one majior mod in templates
| | * \ \ \ \ \ \ \ \ 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 ↵Fabio Comuni2012-03-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passed with a variable value
| | * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for group edit.
* | | | | | | | | | | item table update for file featurefriendica2012-03-023-3/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #56 from tomtom84/masterfriendica2012-03-011-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | diabook theme
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build documentation This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master'Alexander Kampmann2012-03-0184-1362/+2846
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Enabled automated doc building. Changes:Alexander Kampmann2012-03-016-3/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
* | | | | | | | | | | probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic ↵friendica2012-03-012-1/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content-type
| | * / / / / / / / diabook committommy tomson2012-03-021-0/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | yet more work on notificationsfriendica2012-02-293-29/+54
| | | | | | | | |
* | | | | | | | | notification enhancementsfriendica2012-02-295-7/+43
| | | | | | | | |
* | | | | | | | | better handling of multiple notifications for same item, and old notificationsfriendica2012-02-293-5/+24
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Update LICENSEfriendica2012-02-291-1/+1
| | | | | | | |