aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* quattro theme: show uncollapsed comments on display pagefabrixxm2012-06-141-1/+4
|
* Required for github/Windowsfriendica2012-06-141-0/+2
|
* syntax on sqlfriendica2012-06-131-1/+1
|
* ajax append placeholder, fix some html warningsfriendica2012-06-138-3/+13
|
* remove php version restriction on archive widgetfriendica2012-06-131-8/+4
|
* couple of little fixes to enotify positional paramsfriendica2012-06-131-2/+2
|
* fix to imported youtube videos, updating of contact profile photos, do not ↵friendica2012-06-134-34/+105
| | | | remove "dead" contacts but archive them.
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-131-1/+1
|\
| * Merge pull request #333 from Erkan-Yilmaz/masterfriendica2012-06-131-1/+1
| |\ | | | | | | missing bracket
| | * add missing bracketErkan Yilmaz2012-06-131-1/+1
| | |
* | | Merge https://github.com/fabrixxm/friendica into pullfriendica2012-06-132-87/+87
|\ \ \ | |/ / |/| | | | | | | | Conflicts: util/messages.po
| * | enotify: fix stupid typofabrixxm2012-06-131-1/+1
| | |
| * | enotify: rework strings to more easy to translatefabrixxm2012-06-132-3777/+3730
| |/
* / disable archive widget for PHP < 5.3friendica2012-06-133-32/+48
|/
* this should catch any weirdness caused by being in different timezones and ↵friendica2012-06-121-4/+10
| | | | making your first post on the 31st of March
* one-click change for manage modulefriendica2012-06-121-2/+3
|
* that was itfriendica2012-06-121-1/+1
|
* think this will fix itfriendica2012-06-121-0/+1
|
* tracking another edge casefriendica2012-06-121-2/+4
|
* edge casefriendica2012-06-121-0/+2
|
* archive widgetfriendica2012-06-128-14/+110
|
* more fixesfriendica2012-06-124-130/+130
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-121-1/+0
|\
| * Removed "oauth/authorize" from the list of not implemented functions since ↵Michael Vogel2012-06-121-1/+0
| | | | | | | | it is implemented in "mod/api.php"
* | move parens to proper placefriendica2012-06-121-5/+5
|/
* survive bad/un-parseable input to datetime_convertfriendica2012-06-121-1/+1
|
* fix default group for local followsfriendica2012-06-121-0/+15
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-121-0/+10
|\
| * Merge pull request #331 from mexon/upstreamfriendica2012-06-121-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 Exon2012-06-121-0/+10
| | | | | | | | | | | | database and have an ID
* | | bug #448friendica2012-06-121-3/+4
|/ /
* | revert an optimisation that was wrongfriendica2012-06-111-4/+3
| |
* | date search backend to mod/networkfriendica2012-06-111-13/+37
| |
* | make sure default timezone is set in external processesfriendica2012-06-113-9/+9
| |
* | date based profile wall filter - backendfriendica2012-06-113-11/+42
| |
* | reduce reverted edits due to edit arriving before originalfriendica2012-06-111-3/+26
| |
* | variable confusion in poller, don't allow negative page offsetsfriendica2012-06-113-6/+6
| |
* | sheeshfriendica2012-06-113-87/+105
| |
* | bug #447 - make followed feeds privatefriendica2012-06-111-3/+16
| |
* | Merge pull request #330 from fabrixxm/savenetworktabfriendica2012-06-111-29/+83
|\ \ | | | | | | network view: rembember last tab selected by user
| * | network view: rembember last tab selected by userfabrixxm2012-06-111-29/+83
|/ /
* | rev updatefriendica2012-06-102-9/+9
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-102-7/+10
|\ \
| * \ Merge pull request #329 from simonlnu/masterSimon2012-06-092-7/+10
| |\ \ | | | | | | | | minor template update
| | * | minor template updateSimon L'nu2012-06-092-7/+10
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0837-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'nu2012-06-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: DE: update for the strings quattro: added editor buttons to comments quattro: cleanup the less file * master:
* | | | rev updatefriendica2012-06-102-146/+159
|/ / /
* | | more logging on pubsub callbacksfriendica2012-06-081-4/+12
| | |
* | | provide ability to autofriend ostatus accountsfriendica2012-06-071-1/+15
| | |