8a789a33d1
Merge branch 'pull'
10 years ago
db80ffa0ff
don't count self in number of contatcs
10 years ago
2173f418dd
Merge pull request #130 from CatoTH/master
...
HTML2BBCode with [EMBED]: Compute in JS instead of PHP
10 years ago
427362c324
Merge branch 'pull'
10 years ago
dc84da520d
invite potential connectees to the free social web
10 years ago
7868e3897b
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
10 years ago
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
10 years ago
43430ef561
Merge branch 'master' of git://github.com/friendica/friendica
10 years ago
5a41676465
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
10 years ago
bf7425c591
click anywhere to close notifications -> zeros and bubbles
10 years ago
e12706e825
Merge branch 'pull'
10 years ago
acf75e85c8
revup
10 years ago
691f5b11f7
Merge pull request #128 from tomtom84/master
...
fixes in diabook-derivates
10 years ago
8358b9247f
fix css
10 years ago
ecc9f4ba70
Merge pull request #127 from tomtom84/master
...
fixes in diabook-derivates
10 years ago
27bc8052d0
use fancybox instead of lightbox
10 years ago
8a85914e1d
Merge pull request #126 from tomtom84/master
...
fixes in diabook-derivates
10 years ago
caffb217c1
fixes
10 years ago
59766b944c
Some security against XSRF-attacks
10 years ago
a1305433b8
Merge pull request #125 from tomtom84/master
...
fixes in diabook-derivates
10 years ago
9436175746
add lightbox, fixex in css
10 years ago
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
10 years ago
38cb4a362f
Merge branch 'pull'
10 years ago
3bc990f718
more save to file backend
10 years ago
93058af4fc
backend for "save to file" feature
10 years ago
9f52e3df8d
fix dispy-dark photo album stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
8629d90818
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
18ef942f62
Merge pull request #124 from simonlnu/master
...
fix dispys' css and layout
10 years ago
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
de70b2f30f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
community meta tag renamed from "ika"
* master:
10 years ago
1401f763ec
Merge branch 'pull'
10 years ago
d9bee73edf
community meta tag renamed from "ika"
10 years ago
6e5f837609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
d9cb46f0de
Merge branch 'master' of git://github.com/friendica/friendica
10 years ago
1dad15a021
Merge pull request #123 from simonlnu/master
...
screwed up on the font-size for screen last push
10 years ago
258a8c0871
screwed up on the font-size for screen last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
467aa66d37
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
ac2a81a273
Merge pull request #122 from simonlnu/master
...
add some '@media handheld' types for dispys
10 years ago
fa0cb8514d
add some '@media handheld' types for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
48306e1fae
Merge pull request #121 from simonlnu/master
...
fix more stuff
10 years ago
62fe48f064
fix more stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
076393c9e7
Merge pull request #120 from simonlnu/master
...
fix some stuff right away
10 years ago
57d8370376
fix some stuff right away
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
10 years ago
50863a19eb
Merge pull request #119 from simonlnu/master
...
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
10 years ago
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
dfdf0f1335
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* 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:
10 years ago
5915325367
bug #328
10 years ago
d9c5d9d2eb
default the text template var on conversations
10 years ago
1bddd48661
bug #327 - composed private message is lost if no recip specified.
10 years ago
friendica
Tobias Hößl
tomtom84
tommy tomson
Simon L'nu
Simon