Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 1 | -3/+3 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 11 | -206/+405 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php | Tobias Hößl | 2012-02-28 | 3 | -5/+11 | |
| | | | | | | ||||||
| * | | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 14 | -167/+719 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | wasn't actually changed before | Tobias Hößl | 2012-02-28 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Avoid a notice | Tobias Hößl | 2012-02-28 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | initial tag display for categories and save-to-file - suitable for testing ↵ | friendica | 2012-03-13 | 1 | -0/+27 | |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | but needs cleanup, links to delete term, and theming. | |||||
* | | | | | | more save to file backend | friendica | 2012-03-11 | 1 | -1/+55 | |
| | | | | | | ||||||
* | | | | | | backend for "save to file" feature | friendica | 2012-03-11 | 1 | -0/+19 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | bug #328 | friendica | 2012-03-10 | 1 | -3/+3 | |
| |_|/ / |/| | | | ||||||
* | | | | bug in check for private email comment to public conversation prevents ↵ | friendica | 2012-03-09 | 2 | -23/+9 | |
| | | | | | | | | | | | | | | | | authenticated visitor from seeing comments that should be allowed | |||||
* | | | | keep tony from talking to himself | friendica | 2012-03-08 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | still getting parent relays on remote systems | friendica | 2012-03-07 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | revup | friendica | 2012-03-07 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix photos after permissions_sql change | friendica | 2012-03-06 | 1 | -4/+76 | |
| | | | | ||||||
* | | | | Merge branch 'pull' | friendica | 2012-03-06 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master: | |||||
* | | | | | [privacy] rework latest fix | friendica | 2012-03-06 | 1 | -1/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #94 from beardy-unixer/master | Simon | 2012-03-06 | 1 | -1/+5 | |
|\ \ \ \ | | | | | | | | | | | Documentation changes | |||||
| * | | | | Fixed...merged with mainline THEN added beards. | Thomas | 2012-03-06 | 1 | -5/+36 | |
| | | | | | ||||||
| * | | | | added beard smileys | Thomas | 2012-03-06 | 1 | -35/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #99 from tomtom84/master | Simon | 2012-03-06 | 1 | -0/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | fixes in theme diabook | |||||
| * | | | | | messages-menu translation, add scroll-to-top and theme-bug-report in theme | tommy tomson | 2012-03-07 | 1 | -0/+3 | |
| |/ / / / | ||||||
* / / / / | bugs #312, #313 | friendica | 2012-03-06 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | remove "smilie" expansion for Diaspora logo | friendica | 2012-03-06 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | prevent duplicate likes | friendica | 2012-03-06 | 1 | -0/+25 | |
| | | | | ||||||
* | | | | can_write_wall documentation | friendica | 2012-03-05 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | correct owner info from misconfigured installs, duepuntozero title block ↵ | friendica | 2012-03-04 | 1 | -0/+24 | |
| | | | | | | | | | | | | | | | | misplaced in editplain mode | |||||
* | | | | unused replacement variable displays %1 in all html2bbcode 'code' blocks | friendica | 2012-03-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | 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 | |
| | | | | | | | | | | | | | | | | $var.name -> $[var.name] | |||||
* | | | | 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 pull request #55 from fabrixxm/master | fabrixxm | 2012-03-02 | 2 | -95/+112 | |
|\ \ \ \ | | | | | | | | | | | Some minor and one majior mod in templates | |||||
| * \ \ \ | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-03-01 | 3 | -27/+79 | |
| |\ \ \ \ | ||||||
| * | | | | | conversation: remove templating items in code and move it to template. | Fabio Comuni | 2012-03-01 | 1 | -94/+103 | |
| | | | | | | ||||||
| * | | | | | template proc: avoid a notice and allow template name to include to be ↵ | Fabio Comuni | 2012-03-01 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | passed with a variable value | |||||
* | | | | | | Merge branch 'pull' | friendica | 2012-03-01 | 1 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Alexander Kampmann | 2012-03-01 | 20 | -251/+914 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Enabled automated doc building. Changes: | Alexander Kampmann | 2012-03-01 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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 ↵ | friendica | 2012-03-01 | 1 | -0/+5 | |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | content-type | |||||
* | | | | | | yet more work on notifications | friendica | 2012-02-29 | 3 | -29/+54 | |
| | | | | | | ||||||
* | | | | | | notification enhancements | friendica | 2012-02-29 | 1 | -3/+30 | |
| |/ / / / |/| | | | | ||||||
* | | | | | call time pass by reference deprecated | friendica | 2012-02-28 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge branch 'pull' | friendica | 2012-02-27 | 1 | -3/+5 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | revert 01a2791e3a to avoid random preg internal errors. fix contact_template | Fabio Comuni | 2012-02-27 | 1 | -3/+5 | |
| | | | |