aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* API: Seesmic is now working. Optimizing text export.Michael Vogel2012-03-182-5/+6
|
* Merge commit 'upstream/master'Michael Vogel2012-03-1575-404/+1216
|\
| * commit latest to dispy-dark. fixes in html css and jsSimon L'nu2012-03-1516-85/+115
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * 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
| |\ \ | | | | | | | | Test cases
| | * \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1469-689/+7698
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: view/de/strings.php
| | * \ \ 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | slack-NS
| | * | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
| | * | | | | | | | 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 -dark
| | * | | | | | | massive work done to both dispys, mostly -darkSimon L'nu2012-03-149-128/+247
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * / | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently
| * | | | | | Merge branch 'pull'friendica2012-03-139-6/+14
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #129 from CatoTH/masterfriendica2012-03-139-6/+14
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | CSRF-Protection and minor changes
| | | * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fixes in diabook-derivates
| | * | | | | | use fancybox instead of lightboxtommy tomson2012-03-1344-1490/+2
| | | | | | | |
| * | | | | | | Merge pull request #126 from tomtom84/mastertomtom842012-03-126-4/+72
| |\| | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates
| | * | | | | | fixestommy tomson2012-03-126-4/+72
| | | | | | | |
| * | | | | | | Merge pull request #125 from tomtom84/mastertomtom842012-03-1259-45/+1667
| |\| | | | | | | | |/ / / / / | |/| | | | | fixes in diabook-derivates
| | * | | | | add lightbox, fixex in csstommy tomson2012-03-1259-45/+1667
| | | | | | |
| * | | | | | fix dispy-dark photo album stuffSimon L'nu2012-03-111-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | fix dispys' css and layoutSimon L'nu2012-03-117-130/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | | | | | Removed changesMichael Vogel2012-03-112-19/+11
| | | | | | |
* | | | | | | Merge commit 'upstream/master'Michael Vogel2012-03-1152-542/+7157
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
| * | | | | | screwed up on the font-size for screen last pushSimon L'nu2012-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | add some '@media handheld' types for dispysSimon L'nu2012-03-112-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | fix more stuffSimon L'nu2012-03-111-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | fix some stuff right awaySimon L'nu2012-03-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Simon L'nu2012-03-1133-13/+6144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | bug #327 - composed private message is lost if no recip specified.friendica2012-03-101-1/+1
| | | | | | |
| * | | | | | Merge pull request #118 from tomtom84/mastertomtom842012-03-109-11/+52
| |\| | | | | | | | | | | | | | | | | | | fixes in diabook-derivates
| | * | | | | fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-109-11/+52
| | | | | | |
| * | | | | | German translationTobias Diekershoff2012-03-102-473/+810
| | | | | | |
| * | | | | | allow user to set number of items to show on network pageMichael Johnston2012-03-091-0/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 21:41:27 +0000