| Commit message (Expand) | Author | Age | Files | Lines |
* | basic ssl_policy for important modules | friendica | 2012-03-14 | 2 | -20/+28 |
* | ssl_policy stuff | friendica | 2012-03-14 | 1 | -0/+17 |
* | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 3 | -20/+28 |
* | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 3 | -1/+32 |
* | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 6 | -9/+64 |
|\ |
|
| * | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 1 | -0/+46 |
| * | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 1 | -0/+73 |
| |\ |
|
| * \ | 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 bu... | friendica | 2012-03-13 | 1 | -0/+27 |
| |_|_|_|/
|/| | | | |
|
* | | | | | 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 authen... | friendica | 2012-03-09 | 2 | -23/+9 |
* | | | 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 |
* | | | | [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 |
|\ \ \ |
|
| * | | | 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 |
|\ \ \ \ |
|
| * | | | | 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 misp... | friendica | 2012-03-04 | 1 | -0/+24 |
* | | | 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 |
* | | | 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 |
|\ \ \ |
|
| * \ \ | 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 passed... | Fabio Comuni | 2012-03-01 | 1 | -1/+9 |
* | | | | | 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 |