Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 2 | -4/+11 | |
| | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | |||||
* | | | weee, dispys get another update | Simon L'nu | 2012-03-16 | 15 | -195/+294 | |
|/ / | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | missing close double quote in mail_list.tpl | Simon L'nu | 2012-03-16 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | more changes in dispy-dark | Simon L'nu | 2012-03-16 | 1 | -0/+6 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | Merge branch 'pull' | friendica | 2012-03-15 | 15 | -32/+86 | |
|\ \ | ||||||
| * | | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 15 | -32/+86 | |
| | | | ||||||
* | | | undo git stuffup | friendica | 2012-03-15 | 3 | -4/+8 | |
|/ / | ||||||
* | | Merge pull request #136 from annando/master | friendica | 2012-03-15 | 3 | -8/+17 | |
|\ \ | | | | | | | Mail improvements, item caching and so on | |||||
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 75 | -404/+1216 | |
| |\ \ | ||||||
| * | | | Removed changes | Michael Vogel | 2012-03-11 | 2 | -19/+11 | |
| | | | | ||||||
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 52 | -542/+7157 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | |||||
| * | | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 | |
| | | | | | ||||||
* | | | | | fixed the sidebar edit thingy. haven't synced dispy yet. | Simon L'nu | 2012-03-15 | 2 | -24/+27 | |
| |_|/ / |/| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | | | commit latest to dispy-dark. fixes in html css and js | Simon L'nu | 2012-03-15 | 16 | -85/+115 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | | | Merge branch 'pull' | friendica | 2012-03-15 | 10 | -21/+74 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-15 | 10 | -21/+74 | |
| |\ \ \ \ | ||||||
| | * | | | | add links to wall, photos, events, etc to aside on networkpage, fixes in css | tommy tomson | 2012-03-15 | 10 | -21/+74 | |
| | | | | | | ||||||
* | | | | | | force login to ssl on SSL_POLICY_SELFSIGN | friendica | 2012-03-14 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | ssl_policy stuff | friendica | 2012-03-14 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #132 from campino/master | friendica | 2012-03-14 | 1 | -10/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | Test cases | |||||
| * \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 69 | -689/+7698 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/de/strings.php | |||||
| * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-09 | 88 | -190/+11452 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-07 | 21 | -133/+238 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | merged | Alexander Kampmann | 2012-03-07 | 94 | -2529/+7640 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | added test blueprints, fixed? encoding issues | Alexander Kampmann | 2012-03-05 | 1 | -10/+10 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #133 from tonybaldwin/master | friendica | 2012-03-14 | 2 | -0/+102 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | slack-NS | |||||
| * | | | | | | | | added slack-NS, non-scrolly, slackr-based theme. | Tony Baldwin | 2012-03-13 | 2 | -0/+102 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-03-14 | 7 | -7/+189 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge pull request #134 from simonlnu/master | Simon | 2012-03-14 | 34 | -137/+356 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 | |||||
| * | | | | | | | | | fix in nav | tommy tomson | 2012-03-14 | 1 | -4/+0 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 6 | -3/+189 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | massive work done to both dispys, mostly -dark | |||||
| * | | | | | | | | massive work done to both dispys, mostly -dark | Simon L'nu | 2012-03-14 | 9 | -128/+247 | |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* / | | | | | | | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 3 | -4/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 6 | -3/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | |||||
* | | | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 9 | -6/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 9 | -6/+14 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | CSRF-Protection and minor changes | |||||
| | * | | | | | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 9 | -6/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | invite potential connectees to the free social web | friendica | 2012-03-13 | 2 | -0/+11 | |
|/ / / / / / / / | ||||||
* | / / / / / / | click anywhere to close notifications -> zeros and bubbles | friendica | 2012-03-12 | 8 | -0/+39 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | fix css | tommy tomson | 2012-03-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 44 | -1490/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fixes in diabook-derivates | |||||
| * | | | | | | | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 44 | -1490/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 6 | -4/+72 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | |||||
| * | | | | | | | fixes | tommy tomson | 2012-03-12 | 6 | -4/+72 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 59 | -45/+1667 | |
|\| | | | | | | | |/ / / / / / |/| | | | | | | fixes in diabook-derivates | |||||
| * | | | | | | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 59 | -45/+1667 | |
| | | | | | | | ||||||
* | | | | | | | fix dispy-dark photo album stuff | Simon L'nu | 2012-03-11 | 1 | -17/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> |