aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0410-686/+970
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-042-656/+876
| |\
| | * Merge pull request #287 from mschmitt/masterfriendica2012-05-042-656/+876
| | |\
| | | * Esperanto 100%Martin Schmitt2012-05-042-656/+876
| | |/
| * / category removalfriendica2012-05-042-5/+16
| |/
| * "show more" friends in commonfriendica2012-05-046-25/+78
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
|/
* DE stringsTobias Diekershoff2012-05-042-621/+847
* implement max load average before queuing/deferring delivery and poller proce...friendica2012-05-034-1/+28
* yet another bug in remote_friends_in_commonfriendica2012-05-032-1/+2
* string updatefriendica2012-05-031-2/+2
* use html symbols for double quotesfriendica2012-05-031-1/+1
* string updatefriendica2012-05-034-94/+91
* Merge pull request #284 from fabrixxm/masterfriendica2012-05-031-3/+3
|\
| * validate_url() and validate_email() validate also IP address.Fabio Comuni2012-05-031-3/+3
* | Merge pull request #286 from grossard/french_proofreadingfriendica2012-05-0314-60/+64
|\ \
| * | proofreading the mail templates in frLudovic Grossard2012-05-0314-60/+64
|/ /
* | Merge pull request #285 from simonlnu/masterSimon2012-05-0310-1927/+3306
|\ \ | |/ |/|
| * forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ...Simon L'nu2012-05-032-1/+3
| * major reworking of dispy dark. light to followSimon L'nu2012-05-0310-1927/+3304
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-033-7/+37
| |\ | |/ |/|
* | diabook-theme: small fixtommy tomson2012-05-032-2/+4
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-0229-57/+123
|\ \
* | | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnso...friendica2012-05-021-5/+33
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0336-82/+210
| | |\ | | |/ | |/|
| * | diabook-theme: small fixtommy tomson2012-05-031-0/+1
| * | diabook-theme: made boxes at right_aside sortabletommy tomson2012-05-0329-57/+122
|/ /
* | use cid rather than uid in permsfriendica2012-05-021-3/+12
* | Merge pull request #283 from fermionic/private-events-post-correctly-in-diasporafriendica2012-05-021-0/+19
|\ \
| * | Modify events_post() in mod/events.php to set the `private` field to true whe...Zach Prezkuta2012-05-021-0/+19
|/ /
* | use mysql replace on cache itemsfriendica2012-05-021-12/+30
* | fixing common friendsfriendica2012-05-021-6/+7
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-027-396/+418
|\ \
| * \ Merge pull request #282 from max-weller/masterfriendica2012-05-023-1/+9
| |\ \
| | * | Moved Meta Viewport from global head.tpl to diabook's headerMax Weller2012-05-023-1/+9
| |/ /
* | | rev updatefriendica2012-05-022-5/+12
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0211-412/+458
| | |\ | | |/ | |/|
| * | diabook-themes: more improvements in theme.php, add titles to bbcode under co...tommy tomson2012-05-024-28/+47
| * | diabook-theme: tryied to improve performance a bittommy tomson2012-05-022-377/+370
| * | diabook-theme: fix footer/impressumtommy tomson2012-05-021-1/+3
|/ /
* | missing paramfriendica2012-05-021-1/+2
* | provide "service_class" identifier which will let us provide service_class li...friendica2012-05-023-3/+14
* | delineate the new profile changes from the rest of the textfriendica2012-05-021-1/+1
* | how did that happen?friendica2012-05-021-1/+1
* | shuffle results of remote_common_friends widgetfriendica2012-05-022-8/+25
* | only validate oncefriendica2012-05-011-3/+0
* | perform basic validationfriendica2012-05-012-3/+9
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-026-4/+109
| |\ | |/ |/|
* | final touches - show friends in common with total strangers from different sitesfriendica2012-05-012-7/+13
* | fix sizefriendica2012-05-011-1/+1