aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Update READMEfriendica2012-02-291-0/+4
| | |
* | | cleaned up mess created when both people request friendship and one approves ↵friendica2012-02-281-1/+11
| | | | | | | | | | | | as duplex
* | | call time pass by reference deprecatedfriendica2012-02-281-1/+1
| | |
* | | Merge branch 'pull'friendica2012-02-281-1/+2
|\ \ \
| * | | fix url and network displayfabrixxm2012-02-281-1/+2
| | | |
* | | | From Tobias H - catch some irregularities caused by cut/paste codefriendica2012-02-284-7/+7
|/ / /
* | | update globaldir when page-type changes, add spam date fieldfriendica2012-02-275-55/+13
| | |
* | | clicking contact on contacts page broken linkfriendica2012-02-271-0/+1
| | |
* | | Merge branch 'pull'friendica2012-02-274-10/+12
|\ \ \
| * \ \ Merge pull request #53 from fabrixxm/masterfabrixxm2012-02-273-7/+9
| |\ \ \ | | | | | | | | | | remove template filters support
| | * | | revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-273-7/+9
| |/ / /
| * | | Merge pull request #52 from campino/masterSimon2012-02-271-3/+3
| |\| | | | | | | | | | Corrected syntax error
| | * | fixed syntax errorsAlexander Kampmann2012-02-271-3/+3
| | | |
* | | | cleanup notify subject linesfriendica2012-02-272-9/+18
|/ / /
* | | add plugin hooks to enotifyfriendica2012-02-264-45/+83
| | |
* | | Merge pull request #51 from simonlnu/masterSimon2012-02-262-3/+2
|\ \ \ | | | | | | | | RFC, request for comments: about the https for html5shiv
| * | | minor typographical fixes. need to do something about the http on https ↵Simon L'nu2012-02-272-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (29 commits) spam db fix tag icon size typo in css tagging missing from wallwall and a couple of themes, star missing from dispy Mail: New options for actions after importing mails. relative link redirects Avoid some notices Bugfix is not always defined; but if defined, then always of type integer 1 Bugfix (missing $ character) and avoid some notices necessare fields not loaded from DB should probably be a->user['hidewall'] instead of profile['hidewall'] "Vier-Theme" Some more design stuff. some revision to the German strings German strings Wrong variable name show experimental and unsupported theme status on theme admin page jumping divs with no scrolling imrpove contrast on darkzero blockquotes darkzero-NS theme ... * master:
* | | spam dbfriendica2012-02-263-2/+29
| | |
* | | fix tag icon sizefriendica2012-02-261-0/+0
| | |
* | | typo in cssfriendica2012-02-261-1/+1
| | |
* | | tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-2613-2/+37
| | |