Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge pull request #321 from beardy-unixer/master | friendica | 2012-06-01 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | [quote=somebody] was appearing as an extended spoiler tag. | Thomas Willingham | 2012-06-01 | 1 | -1/+1 | |
* | | | | | | Merge remote branch 'upstream/master' | zottel | 2012-06-02 | 6 | -176/+186 | |
|\| | | | | | ||||||
| * | | | | | registration issue after re-factor | friendica | 2012-06-01 | 4 | -164/+167 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #320 from fabrixxm/master | friendica | 2012-06-01 | 2 | -12/+19 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | install: fix bug #436 and small typo | root | 2012-06-01 | 1 | -11/+18 | |
| | * | | | Merge remote branch 'friendica/master' | root | 2012-06-01 | 55 | -1416/+1667 | |
| | |\ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | admin: remove update link in admin menu | root | 2012-05-25 | 1 | -1/+1 | |
* | | | | | Merge remote branch 'upstream/master' | zottel | 2012-06-01 | 5 | -436/+502 | |
|\| | | | | ||||||
| * | | | | turn registration code into a standalone function for re-use | friendica | 2012-05-31 | 5 | -436/+494 | |
| * | | | | Merge pull request #319 from fermionic/fix-diaspora-parent-query | friendica | 2012-05-31 | 1 | -2/+10 | |
| |\ \ \ \ | ||||||
| | * | | | | query using both `id` and `parent` | Zach Prezkuta | 2012-05-31 | 1 | -2/+10 | |
| |/ / / / | ||||||
* | | | | | Merge remote branch 'upstream/master' | zottel | 2012-05-31 | 11 | -186/+214 | |
|\| | | | | ||||||
| * | | | | prevent email from leaking in feeds | friendica | 2012-05-30 | 1 | -0/+4 | |
| * | | | | y didn't i think of this b4? | friendica | 2012-05-30 | 1 | -0/+4 | |
| * | | | | some zero theming on settings page | friendica | 2012-05-30 | 4 | -12/+26 | |
| * | | | | missing delimiter | friendica | 2012-05-30 | 1 | -1/+1 | |
| * | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-30 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Friendicaland - you can't 'live' on a demo server. | Thomas Willingham | 2012-05-30 | 1 | -1/+1 | |
| * | | | | | transition to beta for private forums | friendica | 2012-05-30 | 2 | -3/+0 | |
| * | | | | | rev update | friendica | 2012-05-30 | 3 | -168/+172 | |
| * | | | | | Create a "potential default group" called "Friends" on registration. | friendica | 2012-05-30 | 1 | -0/+5 | |
| * | | | | | fix private photos that also have a size specification | friendica | 2012-05-30 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | Merge remote branch 'upstream/master' | zottel | 2012-05-30 | 47 | -839/+995 | |
|\| | | | | ||||||
| * | | | | private group tests, cont. | friendica | 2012-05-29 | 8 | -24/+54 | |
| * | | | | hide private group if desired | friendica | 2012-05-29 | 2 | -6/+14 | |
| * | | | | prvgroup should see intros | friendica | 2012-05-29 | 1 | -1/+1 | |
| * | | | | private group fix | friendica | 2012-05-29 | 1 | -1/+1 | |
| * | | | | possible sql injection in search | friendica | 2012-05-29 | 2 | -3/+3 | |
| * | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-29 | 13 | -111/+197 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Merge pull request #316 from annando/master | Simon | 2012-05-29 | 7 | -78/+148 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | MySQL-Fulltext search option is disabled by default | Michael Vogel | 2012-05-29 | 1 | -1/+1 | |
| | | * | | Disabled logging of SQL statements | Michael Vogel | 2012-05-29 | 1 | -4/+4 | |
| | | * | | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-29 | 27 | -655/+660 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge branch 'master' of github.com:annando/friendica | Michael Vogel | 2012-05-26 | 8 | -46/+67 | |
| | | |\ \ \ | ||||||
| | | | * \ \ | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-05-26 | 7 | -31/+76 | |
| | | | |\ \ \ | ||||||
| | | | * \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-05-26 | 65 | -1886/+2705 | |
| | | | |\ \ \ \ | ||||||
| | | | * \ \ \ \ | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-05-19 | 915 | -87935/+37921 | |
| | | | |\ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-05-16 | 981 | -4562/+162753 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-04-14 | 98 | -911/+2464 | |
| | | | |\ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-04-13 | 92 | -12077/+2089 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-04-11 | 133 | -1946/+2921 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-04-11 | 2186 | -18156/+97640 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-03-03 | 41 | -273/+2646 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-03-02 | 13 | -69/+50 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | Michael | 2012-03-02 | 50 | -741/+1128 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Doing negative caching for config values, special logfile for database optmis... | Michael Vogel | 2012-05-26 | 2 | -4/+26 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Saved searches now can search for tags as well | Michael Vogel | 2012-05-26 | 2 | -6/+17 | |
| | | * | | | | | | | | | | | | | | Deactivating the test output in db engine | Michael Vogel | 2012-05-26 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | Speed optimisation by enabling the posibility of the MySQL fulltext engine | Michael Vogel | 2012-05-26 | 5 | -18/+43 |