aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* added icons to profile_side, fixes in csstommy tomson2012-03-1615-32/+86
* Merge pull request #136 from annando/masterfriendica2012-03-153-8/+17
|\
| * Merge commit 'upstream/master'Michael Vogel2012-03-1575-404/+1216
| |\
| * | Removed changesMichael Vogel2012-03-112-19/+11
| * | Merge commit 'upstream/master'Michael Vogel2012-03-1152-542/+7157
| |\ \
| * | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-111-0/+3
| * | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-101-2/+2
| * | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
* | | | fixed the sidebar edit thingy. haven't synced dispy yet.Simon L'nu2012-03-152-24/+27
| |_|/ |/| |
* | | commit latest to dispy-dark. fixes in html css and jsSimon L'nu2012-03-1516-85/+115
* | | Merge branch 'pull'friendica2012-03-1510-21/+74
|\ \ \
| * \ \ Merge https://github.com/friendica/friendica into pullfriendica2012-03-1510-21/+74
| |\ \ \
| | * | | add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
* | | | | force login to ssl on SSL_POLICY_SELFSIGNfriendica2012-03-142-2/+2
* | | | | ssl_policy stufffriendica2012-03-141-0/+1
|/ / / /
* | | | Merge pull request #132 from campino/masterfriendica2012-03-141-10/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1469-689/+7698
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0988-190/+11452
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0721-133/+238
| |\ \ \ \ \
| * \ \ \ \ \ mergedAlexander Kampmann2012-03-0794-2529/+7640
| |\ \ \ \ \ \
| * | | | | | | added test blueprints, fixed? encoding issuesAlexander Kampmann2012-03-051-10/+10
* | | | | | | | Merge pull request #133 from tonybaldwin/masterfriendica2012-03-142-0/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | added slack-NS, non-scrolly, slackr-based theme.Tony Baldwin2012-03-132-0/+102
* | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-03-147-7/+189
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #134 from simonlnu/masterSimon2012-03-1434-137/+356
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | fix in navtommy tomson2012-03-141-4/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-146-3/+189
* | | | | | | | | Merge pull request #131 from simonlnu/masterSimon2012-03-139-128/+247
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | massive work done to both dispys, mostly -darkSimon L'nu2012-03-149-128/+247
| | |/ / / / / / | |/| | | | | |
* / | | | | | | more work on filer, comment level and file tag removalfriendica2012-03-133-4/+9
|/ / / / / / /
* | | | | | | file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-136-3/+45
* | | | | | | Merge branch 'pull'friendica2012-03-139-6/+14
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #129 from CatoTH/masterfriendica2012-03-139-6/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Some security against XSRF-attacksTobias Hößl2012-03-129-6/+14
* | | | | | | | | invite potential connectees to the free social webfriendica2012-03-132-0/+11
|/ / / / / / / /
* | / / / / / / click anywhere to close notifications -> zeros and bubblesfriendica2012-03-128-0/+39
| |/ / / / / / |/| | | | | |
* | | | | | | fix csstommy tomson2012-03-131-1/+1
* | | | | | | Merge pull request #127 from tomtom84/mastertomtom842012-03-1244-1490/+2
|\ \ \ \ \ \ \
| * | | | | | | use fancybox instead of lightboxtommy tomson2012-03-1344-1490/+2
* | | | | | | | Merge pull request #126 from tomtom84/mastertomtom842012-03-126-4/+72
|\| | | | | | |
| * | | | | | | fixestommy tomson2012-03-126-4/+72
* | | | | | | | Merge pull request #125 from tomtom84/mastertomtom842012-03-1259-45/+1667
|\| | | | | | | | |/ / / / / / |/| | | | | |
| * | | | | | add lightbox, fixex in csstommy tomson2012-03-1259-45/+1667
* | | | | | | fix dispy-dark photo album stuffSimon L'nu2012-03-111-17/+18
* | | | | | | fix dispys' css and layoutSimon L'nu2012-03-117-130/+147
| |_|_|_|_|/ |/| | | | |
* | | | | | screwed up on the font-size for screen last pushSimon L'nu2012-03-111-1/+1
* | | | | | add some '@media handheld' types for dispysSimon L'nu2012-03-112-1/+14
* | | | | | fix more stuffSimon L'nu2012-03-111-5/+9
* | | | | | fix some stuff right awaySimon L'nu2012-03-111-2/+7
* | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Simon L'nu2012-03-1133-13/+6144