aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1532-5273/+6292
|\
| * update tinymce to 3.5.0.1friendica2012-05-1526-4805/+5696
| * rev updatefriendica2012-05-152-22/+30
| * DE stringsTobias Diekershoff2012-05-152-400/+506
| * slackr drop shadows extendedfriendica2012-05-141-1/+15
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-146-192/+215
| |\
| | * Merge pull request #297 from mexon/upstreamfriendica2012-05-141-1/+1
| | |\
| | | * Allow plugins to modify the contact photo menuMatthew Exon2012-05-151-1/+1
| * | | rev updatefriendica2012-05-142-47/+47
* | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-140-0/+0
| |/ / |/| |
* | | Merge pull request #296 from simonlnu/masterSimon2012-05-135-191/+214
|\ \ \ | |/ / |/| |
| * | finish dipsy light colour fixesSimon L'nu2012-05-145-191/+214
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-142-67/+67
| |\ \ | |/ / |/| |
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-132-18/+24
|\ \ \ | | |/ | |/|
* | | rev updatefriendica2012-05-132-67/+67
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1320-252/+4973
| | |\ | | |/ | |/|
| * | diabook-theme: small fixestommy tomson2012-05-132-18/+24
|/ /
* | rename get_language() to get_browser_language()friendica2012-05-134-6/+6
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-1222-6589/+4277
|\ \
* | | slackr drop shadowsfriendica2012-05-123-63/+64
* | | language detection libraryfriendica2012-05-1211-0/+4713
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-128-156/+1040
|\ \ \
* | | | rev updatefriendica2012-05-122-228/+229
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-120-0/+0
| | |/
| | * Merge pull request #295 from simonlnu/masterSimon2012-05-1211-54/+89
| | |\
| | | * css fixes; new screenshotsSimon L'nu2012-05-1211-54/+89
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-124-391/+575
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #294 from mschmitt/masterfriendica2012-05-124-391/+575
| | |\ \
| | | * | Ĝisdatigis la esperantlingvan tradukaĵon al 100%.Martin Schmitt2012-05-124-391/+575
| | |/ / | |/| |
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-120-0/+0
| | |/
| | * diabook-theme: fix in earthlayerstommy tomson2012-05-123-29/+26
| | * diabook-theme: some fixestommy tomson2012-05-123-0/+519
| | * Merge pull request #293 from simonlnu/masterSimon2012-05-128-6152/+3105
| |/|
| | * finished migrating dispy light - maybeSimon L'nu2012-05-128-6152/+3105
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1122-323/+1737
| | |\ | | |/ | |/|
| * | Darkzero - fixed notifications bar.Thomas Willingham2012-05-121-0/+14
| * | diabook-theme: update mapquery and small fixtommy tomson2012-05-115-158/+596
| * | diabook-theme: add "population density 2010"-layer to EarthLayers-boxtommy tomson2012-05-115-16/+448
|/ /
* | fix search/new against possible email leakagefriendica2012-05-111-0/+3
* | better test of email reply visibilityfriendica2012-05-112-3/+3
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-112-1/+63
|\ \
| * | diabook-theme:small fixtommy tomson2012-05-112-1/+63
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-112-81/+41
|\| |
| * | diabook-theme: small fixtommy tomson2012-05-111-81/+1
| * | diabook-theme: include prv_message autocompletetommy tomson2012-05-111-0/+40
* | | moderated comment templatesfriendica2012-05-115-0/+112
|/ /
* | fix PM replies after autocomplete changesfriendica2012-05-102-3/+10
* | add photos to PM autocomplete, improved appearancefriendica2012-05-103-3/+401
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-104-15/+18
|\ \
| * \ Merge remote-tracking branch 'origin/master'tommy tomson2012-05-113-9/+12
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:57:35 +0000