Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a ↵ | Tobias Hößl | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore. | |||||
| | * | | | | | | | | | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php | Tobias Hößl | 2012-02-28 | 4 | -11/+19 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 57 | -1256/+2380 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | contact.network is used later to check if a direct link or a redirect by ↵ | Tobias Hößl | 2012-02-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /redir/contactid should be used | |||||
| | * | | | | | | | | | | | | | wasn't actually changed before | Tobias Hößl | 2012-02-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Avoid a notice | Tobias Hößl | 2012-02-28 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | invite potential connectees to the free social web | friendica | 2012-03-13 | 4 | -2/+19 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | / / / / / / | initial tag display for categories and save-to-file - suitable for testing ↵ | friendica | 2012-03-13 | 1 | -0/+27 | |
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but needs cleanup, links to delete term, and theming. | |||||
* | | | | | | | | | | | | | click anywhere to close notifications -> zeros and bubbles | friendica | 2012-03-12 | 8 | -0/+39 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-12 | 18 | -50/+252 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #128 from tomtom84/master | tomtom84 | 2012-03-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | fixes in diabook-derivates | |||||
| | * | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | revup | friendica | 2012-03-12 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-12 | 1 | -17/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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> | |||||
| * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | |||||
* | | | | | | | | | | | | more save to file backend | friendica | 2012-03-11 | 1 | -1/+55 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | backend for "save to file" feature | friendica | 2012-03-11 | 2 | -7/+33 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #124 from simonlnu/master | Simon | 2012-03-11 | 7 | -130/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix dispys' css and layout | |||||
| * | | | | | | | | | | | fix dispys' css and layout | Simon L'nu | 2012-03-11 | 7 | -130/+147 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: community meta tag renamed from "ika" * master: | |||||
* | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-11 | 2 | -7/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | community meta tag renamed from "ika" | friendica | 2012-03-11 | 3 | -3/+3 | |
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | |||||
| * | | | | | | | | | Merge pull request #123 from simonlnu/master | Simon | 2012-03-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | screwed up on the font-size for screen last push | |||||
| | * | | | | | | | | | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| | * | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | |||||
| * | | | | | | | | | Merge pull request #122 from simonlnu/master | Simon | 2012-03-11 | 2 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | add some '@media handheld' types for dispys | |||||
| | * | | | | | | | | | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | | | | | | | Merge pull request #121 from simonlnu/master | Simon | 2012-03-11 | 1 | -5/+9 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix more stuff | |||||
| | * | | | | | | | | | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | | | | | | | Merge pull request #120 from simonlnu/master | Simon | 2012-03-11 | 1 | -2/+7 | |
|/| | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | fix some stuff right away | |||||
| * | | | | | | | | | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
* | | | | | | | | | | Merge pull request #119 from simonlnu/master | Simon | 2012-03-10 | 33 | -13/+6144 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | |||||
| * | | | | | | | | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 15 | -494/+883 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master: | |||||
* | | | | | | | | | | bug #328 | friendica | 2012-03-10 | 1 | -3/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | default the text template var on conversations | friendica | 2012-03-10 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 2 | -6/+16 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-10 | 11 | -484/+862 | |
|\ \ \ \ \ \ \ \ \ \ |