aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-06-0322-459/+607
|\
| * zrl's when visiting public photos at the source sitefriendica2012-06-031-0/+6
| * docofriendica2012-06-021-0/+12
| * cleanupfriendica2012-06-021-1/+3
| * turn "follow" into a functionfriendica2012-06-022-217/+236
| * add hometown to profilesfriendica2012-06-028-4/+34
| * bug #439 - remove web port number from notification email "from" addressfriendica2012-06-021-0/+3
| * webfinger profile linkerfriendica2012-06-025-213/+246
| * "howlong" added to marital status.friendica2012-06-028-5/+33
| * fewer "bob smith to bob smith via wall-to-wall".friendica2012-06-026-21/+36
| * Merge pull request #321 from beardy-unixer/masterfriendica2012-06-011-1/+1
| |\
| | * [quote=somebody] was appearing as an extended spoiler tag.Thomas Willingham2012-06-011-1/+1
* | | Merge remote branch 'upstream/master'zottel2012-06-026-176/+186
|\| |
| * | registration issue after re-factorfriendica2012-06-014-164/+167
| |/
| * Merge pull request #320 from fabrixxm/masterfriendica2012-06-012-12/+19
| |\
| | * install: fix bug #436 and small typoroot2012-06-011-11/+18
| | * Merge remote branch 'friendica/master'root2012-06-0155-1416/+1667
| | |\ | | |/ | |/|
| | * admin: remove update link in admin menuroot2012-05-251-1/+1
* | | Merge remote branch 'upstream/master'zottel2012-06-015-436/+502
|\| |
| * | turn registration code into a standalone function for re-usefriendica2012-05-315-436/+494
| * | Merge pull request #319 from fermionic/fix-diaspora-parent-queryfriendica2012-05-311-2/+10
| |\ \
| | * | query using both `id` and `parent`Zach Prezkuta2012-05-311-2/+10
| |/ /
* | | Merge remote branch 'upstream/master'zottel2012-05-3111-186/+214
|\| |
| * | prevent email from leaking in feedsfriendica2012-05-301-0/+4
| * | y didn't i think of this b4?friendica2012-05-301-0/+4
| * | some zero theming on settings pagefriendica2012-05-304-12/+26
| * | missing delimiterfriendica2012-05-301-1/+1
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-301-1/+1
| |\ \
| | * | Friendicaland - you can't 'live' on a demo server.Thomas Willingham2012-05-301-1/+1
| * | | transition to beta for private forumsfriendica2012-05-302-3/+0
| * | | rev updatefriendica2012-05-303-168/+172
| * | | Create a "potential default group" called "Friends" on registration.friendica2012-05-301-0/+5
| * | | fix private photos that also have a size specificationfriendica2012-05-301-2/+2
| |/ /
* | | Merge remote branch 'upstream/master'zottel2012-05-3047-839/+995
|\| |
| * | private group tests, cont.friendica2012-05-298-24/+54
| * | hide private group if desiredfriendica2012-05-292-6/+14
| * | prvgroup should see introsfriendica2012-05-291-1/+1
| * | private group fixfriendica2012-05-291-1/+1
| * | possible sql injection in searchfriendica2012-05-292-3/+3
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2913-111/+197
| |\ \
| | * \ Merge pull request #316 from annando/masterSimon2012-05-297-78/+148
| | |\ \
| | | * | MySQL-Fulltext search option is disabled by defaultMichael Vogel2012-05-291-1/+1
| | | * | Disabled logging of SQL statementsMichael Vogel2012-05-291-4/+4
| | | * | Merge remote branch 'upstream/master'Michael Vogel2012-05-2927-655/+660
| | | |\ \
| | | * \ \ Merge branch 'master' of github.com:annando/friendicaMichael Vogel2012-05-268-46/+67
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-267-31/+76
| | | | |\ \ \
| | | | * \ \ \ Merge remote branch 'upstream/master'Michael2012-05-2665-1886/+2705
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-19915-87935/+37921
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-16981-4562/+162753
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-1498-911/+2464
| | | | |\ \ \ \ \ \ \