aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0612-17/+146
|\
| * network select widgetfriendica2012-01-056-3/+96
| * backend for per-network streamsfriendica2012-01-052-11/+13
| * added citations back into ping - lost somehowfriendica2012-01-051-0/+6
| * comment previewfriendica2012-01-055-3/+31
* | Use html5 placeholder for title text inputFabio Comuni2012-01-065-59/+47
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0636-262/+396
|\|
| * backend support for post previewfriendica2012-01-055-9/+19
| * send diaspora share notification back to originator for auto friendingfriendica2012-01-053-23/+6
| * change to hover functionfriendica2012-01-043-3/+3
| * more title stufffriendica2012-01-048-4/+54
| * bit more improvement on dynamic titlefriendica2012-01-043-2/+17
| * better title handling (duepuntozero only at this time)friendica2012-01-041-0/+10
| * dynamic title input box - via fabrixxmfriendica2012-01-0414-40/+102
| * fix registration request pingsfriendica2012-01-041-3/+3
| * Merge branch 'pull'friendica2012-01-041-3/+3
| |\
| | * Merge pull request #22 from 23n/patch-1fabrixxm2012-01-031-3/+3
| | |\
| | | * Update view/de/strings.php23n2012-01-041-3/+3
| | |/
| * | support auto-friend page types for Diasporafriendica2012-01-041-3/+50
| * | Allow Diaspora to post to forumsfriendica2012-01-042-2/+7
| * | new smileyfriendica2012-01-044-2/+7
| * | add verb and item to notifications to aid in localisationfriendica2012-01-037-10/+63
| * | remove some old email templatesfriendica2012-01-038-153/+0
| |/
| * suggestion notificationsfriendica2012-01-036-16/+55
| * fix reference variable effects on sortingfriendica2012-01-034-6/+10
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0314-221/+561
|\|
| * check count before foreachfriendica2012-01-021-2/+3
| * hopefully this will speed up the network updates a wee bit morefriendica2012-01-021-3/+8
| * that didn't work - revertfriendica2012-01-021-4/+5
| * sql optimisation cont.friendica2012-01-022-6/+5
| * conversation sql optimisationsfriendica2012-01-023-28/+72
| * Merge branch 'pull'friendica2012-01-029-189/+479
| |\
| | * Merge pull request #21 from fabrixxm/fixinstallfabrixxm2012-01-029-189/+479
| | |\
| | | * install: fix install procedureFabio Comuni2012-01-025-180/+435
| | | * text: "turn off" logger() if module is "install"Fabio Comuni2012-01-021-0/+4
| | | * dba: leave unconnected if $server and $user are not definedFabio Comuni2012-01-021-7/+14
| | | * datetime: new field_timezone() function, new template field_select_raw.tplFabio Comuni2012-01-022-2/+26
| | |/
| * / revupfriendica2012-01-021-1/+1
| |/
* | Merge branch 'master' of github.com:fabrixxm/friendicaFabio Comuni2012-01-0230-307/+643
|\ \ | |/ |/|
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-223-7/+19
| |\
| * | quattro: contacts and first photo pageFabio Comuni2011-12-2210-114/+208
| * | quattro: more on editorFabio Comuni2011-12-226-9/+95
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-216-7/+33
| |\ \
| * | | quattro: more on editorFabio Comuni2011-12-213-0/+23
| * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-207-5/+30
| |\ \ \
| * | | | quattro: more on editorFabio Comuni2011-12-204-5/+67
| * | | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-1923-59/+276
| |\ \ \ \
| * | | | | quattro: fix icons in oauth settings pageFabio Comuni2011-12-191-2/+2
| * | | | | quattro: first work on jot styleFabio Comuni2011-12-196-186/+253
| * | | | | config: set/get arrays with pconfigFabio Comuni2011-12-191-4/+8