aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* slightly better group iconfriendica2012-01-102-1/+1
* Merge branch 'pull'friendica2012-01-103-3510/+3920
|\
| * Merge pull request #25 from zzottel/masterzzottel2012-01-103-3510/+3920
| |\
| | * Update messages.pozottel2012-01-101-2543/+2764
| | * New German translationszottel2012-01-102-967/+1156
| |/
* / post preview to loozahfriendica2012-01-106-3/+28
|/
* move post preview linkfriendica2012-01-092-2/+15
* post previewfriendica2012-01-098-9/+21
* not ready for post previewfriendica2012-01-091-2/+2
* bypass D* markdown bug for nowfriendica2012-01-095-3/+31
* markdown bug is Diaspora's. We can't fix it.friendica2012-01-081-2/+3
* show connect link even on restricted profilesfriendica2012-01-081-2/+2
* Merge branch 'pull'friendica2012-01-081-0/+8
|\
| * something weird with gitfriendica2012-01-081-0/+578
| * more recovery of lost contact page formattingfriendica2012-01-081-577/+0
| * contact page float got lost somewherefriendica2012-01-081-0/+7
* | fix git horkagefriendica2012-01-082-10/+33
|/
* make network_to_name extensiblefriendica2012-01-081-3/+18
* contact photo missing from friend activitiesfriendica2012-01-081-1/+1
* fix images with links going to diaspora, the D* markdown processor changed an...friendica2012-01-081-0/+3
* fix photo top view in testbubble, extend network_to_namefriendica2012-01-073-5/+5
* title fixupsfriendica2012-01-066-53/+19
* Merge pull request #24 from fabrixxm/masterfriendica2012-01-062-10/+9
|\
| * duepuntozero: get back jot iconsFabio Comuni2012-01-062-10/+9
* | Merge pull request #23 from fabrixxm/masterfabrixxm2012-01-0640-353/+741
|\|
| * fix photo album pagerFabio Comuni2012-01-064-0/+18
| * quattro: style network widgetFabio Comuni2012-01-065-4/+46
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0612-17/+146
| |\
| * | Use html5 placeholder for title text inputFabio Comuni2012-01-065-59/+47
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0636-262/+396
| |\ \
| * \ \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-0314-221/+561
| |\ \ \
| * \ \ \ 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
| | * | | | | | | | icons: lock and unlockFabio Comuni2011-12-1912-1/+1
* | | | | | | | | | nets widget - allow all children of specified parent net regardless of networkfriendica2012-01-062-1/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | backend support for post previewfriendica2012-01-055-9/+19