aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #321 from beardy-unixer/masterfriendica2012-06-011-1/+1
|\ | | | | BB code [quote=somebody] fix.
| * [quote=somebody] was appearing as an extended spoiler tag.Thomas Willingham2012-06-011-1/+1
| |
* | registration issue after re-factorfriendica2012-06-014-164/+167
|/
* Merge pull request #320 from fabrixxm/masterfriendica2012-06-012-12/+19
|\ | | | | Fix bug 436, fix small typo, and incomplete feature removal
| * install: fix bug #436 and small typoroot2012-06-011-11/+18
| | | | | | | | | | Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
| * Merge remote branch 'friendica/master'root2012-06-0155-1416/+1667
| |\ | |/ |/|
* | 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`
| * | query using both `id` and `parent`Zach Prezkuta2012-05-311-2/+10
|/ /
* | 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
|/ /
* | 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
|\ \ | | | | | | | | | | | | Conflicts: mod/search.php
| * \ Merge pull request #316 from annando/masterSimon2012-05-297-78/+148
| |\ \ | | | | | | | | Speed improvements
| | * | 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
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/network.php
| | | * \ \ \ 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
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-1392-12077/+2089
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-11133-1946/+2921
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-04-112186-18156/+97640
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0341-273/+2646
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0213-69/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0250-741/+1128
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Doing negative caching for config values, special logfile for database ↵Michael Vogel2012-05-262-4/+26
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optmisations
| | * | | | | | | | | | | | | | Saved searches now can search for tags as wellMichael Vogel2012-05-262-6/+17
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Deactivating the test output in db engineMichael Vogel2012-05-261-2/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Speed optimisation by enabling the posibility of the MySQL fulltext engineMichael Vogel2012-05-265-18/+43
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote branch 'upstream/master'Michael Vogel2012-05-2564-1873/+2671
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Performance testsMichael Vogel2012-05-204-10/+19
| | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote branch 'upstream/master'Michael Vogel2012-05-1926-665/+1036
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-16109-12544/+17543
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-09854-82504/+27120
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |