aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | ostatus hub subscription issuesfriendica2012-06-073-4/+13
| |
* | better events-reminder themingfriendica2012-06-072-4/+13
| |
* | png support for embedded private photosfriendica2012-06-073-4/+4
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-0716-81/+243
|\ \
| * \ Merge pull request #328 from fabrixxm/masterfriendica2012-06-0713-77/+237
| |\ \ | | | | | | | | PNG with alpha channel
| | * | png support: update database.sql, fix some typos, fix tinymce image browserFabio Comuni2012-06-076-19/+34
| | | |
| | * | Add support for PNG images with alphaFabio Comuni2012-06-0711-71/+216
| | | |
| * | | Merge pull request #327 from fabrixxm/masterfabrixxm2012-06-073-4/+6
| |\| | | | | | | | | | events: fix select events query
| | * | fix a random profile error messagefabrixxm2012-06-072-2/+4
| | | |
| | * | events: fix select events queryfabrixxm2012-06-071-2/+2
| |/ / | | | | | | | | | | | | select events that starts before display start date and/or ends after display end date.
* / / rev updatefriendica2012-06-072-175/+179
|/ /
* | more logging on subscribe_to_hubfriendica2012-06-061-1/+6
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-062-54/+48
|\ \
| * \ Merge pull request #326 from zzottel/masterzzottel2012-06-062-54/+48
| |\ \ | | | | | | | | German translations
| | * | A few corrections in German translations.zottel2012-06-072-54/+48
| | | |
| | * | Merge remote branch 'upstream/master'zottel2012-06-073-123/+339
| | |\ \ | | |/ / | |/| |
| | * | Merge remote branch 'upstream/master'zottel2012-06-0613-453/+508
| | |\ \
| | * \ \ Merge remote branch 'upstream/master'zottel2012-06-0530-1287/+2256
| | |\ \ \
| | * \ \ \ Merge remote branch 'upstream/master'zottel2012-06-0322-459/+607
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'upstream/master'zottel2012-06-026-176/+186
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-06-015-436/+502
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-3111-186/+214
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-3047-839/+995
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2523-819/+1098
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2329-761/+980
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2229-444/+623
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2033-682/+1171
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1737-5312/+6391
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-154-49/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1453-7106/+10559
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \