Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix to imported youtube videos, updating of contact profile photos, do not ↵ | friendica | 2012-06-13 | 4 | -34/+105 |
| | | | | remove "dead" contacts but archive them. | ||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #333 from Erkan-Yilmaz/master | friendica | 2012-06-13 | 1 | -1/+1 |
| |\ | | | | | | | missing bracket | ||||
| | * | add missing bracket | Erkan Yilmaz | 2012-06-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge https://github.com/fabrixxm/friendica into pull | friendica | 2012-06-13 | 2 | -87/+87 |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: util/messages.po | ||||
| * | | enotify: fix stupid typo | fabrixxm | 2012-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | enotify: rework strings to more easy to translate | fabrixxm | 2012-06-13 | 2 | -3777/+3730 |
| |/ | |||||
* / | disable archive widget for PHP < 5.3 | friendica | 2012-06-13 | 3 | -32/+48 |
|/ | |||||
* | this should catch any weirdness caused by being in different timezones and ↵ | friendica | 2012-06-12 | 1 | -4/+10 |
| | | | | making your first post on the 31st of March | ||||
* | one-click change for manage module | friendica | 2012-06-12 | 1 | -2/+3 |
| | |||||
* | that was it | friendica | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | think this will fix it | friendica | 2012-06-12 | 1 | -0/+1 |
| | |||||
* | tracking another edge case | friendica | 2012-06-12 | 1 | -2/+4 |
| | |||||
* | edge case | friendica | 2012-06-12 | 1 | -0/+2 |
| | |||||
* | archive widget | friendica | 2012-06-12 | 8 | -14/+110 |
| | |||||
* | more fixes | friendica | 2012-06-12 | 4 | -130/+130 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-12 | 1 | -1/+0 |
|\ | |||||
| * | Removed "oauth/authorize" from the list of not implemented functions since ↵ | Michael Vogel | 2012-06-12 | 1 | -1/+0 |
| | | | | | | | | it is implemented in "mod/api.php" | ||||
* | | move parens to proper place | friendica | 2012-06-12 | 1 | -5/+5 |
|/ | |||||
* | survive bad/un-parseable input to datetime_convert | friendica | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | fix default group for local follows | friendica | 2012-06-12 | 1 | -0/+15 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-12 | 1 | -0/+10 |
|\ | |||||
| * | Merge pull request #331 from mexon/upstream | friendica | 2012-06-12 | 1 | -0/+10 |
| |\ | | | | | | | Add a hook for post-processing remote items | ||||
| | * | Add a hook for post-processing remote items after they've been stored in the ↵ | Matthew Exon | 2012-06-12 | 1 | -0/+10 |
| | | | | | | | | | | | | database and have an ID | ||||
* | | | bug #448 | friendica | 2012-06-12 | 1 | -3/+4 |
|/ / | |||||
* | | revert an optimisation that was wrong | friendica | 2012-06-11 | 1 | -4/+3 |
| | | |||||
* | | date search backend to mod/network | friendica | 2012-06-11 | 1 | -13/+37 |
| | | |||||
* | | make sure default timezone is set in external processes | friendica | 2012-06-11 | 3 | -9/+9 |
| | | |||||
* | | date based profile wall filter - backend | friendica | 2012-06-11 | 3 | -11/+42 |
| | | |||||
* | | reduce reverted edits due to edit arriving before original | friendica | 2012-06-11 | 1 | -3/+26 |
| | | |||||
* | | variable confusion in poller, don't allow negative page offsets | friendica | 2012-06-11 | 3 | -6/+6 |
| | | |||||
* | | sheesh | friendica | 2012-06-11 | 3 | -87/+105 |
| | | |||||
* | | bug #447 - make followed feeds private | friendica | 2012-06-11 | 1 | -3/+16 |
| | | |||||
* | | Merge pull request #330 from fabrixxm/savenetworktab | friendica | 2012-06-11 | 1 | -29/+83 |
|\ \ | | | | | | | network view: rembember last tab selected by user | ||||
| * | | network view: rembember last tab selected by user | fabrixxm | 2012-06-11 | 1 | -29/+83 |
|/ / | |||||
* | | rev update | friendica | 2012-06-10 | 2 | -9/+9 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-10 | 2 | -7/+10 |
|\ \ | |||||
| * \ | Merge pull request #329 from simonlnu/master | Simon | 2012-06-09 | 2 | -7/+10 |
| |\ \ | | | | | | | | | minor template update | ||||
| | * | | minor template update | Simon L'nu | 2012-06-09 | 2 | -7/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-08 | 37 | -466/+937 |
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (21 commits) more logging on pubsub callbacks provide ability to autofriend ostatus accounts ostatus hub subscription issues better events-reminder theming png support for embedded private photos rev update png support: update database.sql, fix some typos, fix tinymce image browser Add support for PNG images with alpha fix a random profile error message events: fix select events query select events that starts before display start date and/or ends after display end date. more logging on subscribe_to_hub admin page untranslated strings, remove empty list element for update A few corrections in German translations. rev update set minchars to 2 for PM lookups too set minchars to 2 for contacts search contacts search autocomplete add email probe logging, limit typo check to main addon files and skip additional support files rev update named anchors on display page ... | ||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE: update for the strings quattro: added editor buttons to comments quattro: cleanup the less file * master: | ||||
* | | | | rev update | friendica | 2012-06-10 | 2 | -146/+159 |
|/ / / | |||||
* | | | more logging on pubsub callbacks | friendica | 2012-06-08 | 1 | -4/+12 |
| | | | |||||
* | | | provide ability to autofriend ostatus accounts | friendica | 2012-06-07 | 1 | -1/+15 |
| | | | |||||
* | | | ostatus hub subscription issues | friendica | 2012-06-07 | 3 | -4/+13 |
| | | | |||||
* | | | better events-reminder theming | friendica | 2012-06-07 | 2 | -4/+13 |
| | | | |||||
* | | | png support for embedded private photos | friendica | 2012-06-07 | 3 | -4/+4 |
| | | | |||||
* | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-07 | 16 | -81/+243 |
|\ \ \ | |||||
| * \ \ | Merge pull request #328 from fabrixxm/master | friendica | 2012-06-07 | 13 | -77/+237 |
| |\ \ \ | | | | | | | | | | | PNG with alpha channel | ||||
| | * | | | png support: update database.sql, fix some typos, fix tinymce image browser | Fabio Comuni | 2012-06-07 | 6 | -19/+34 |
| | | | | |