Simon L'nu
a2073bcfc0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
sort inbox by recently replied conversations first
file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
don't count self in number of contatcs
invite potential connectees to the free social web
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.
Some security against XSRF-attacks
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a 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
Avoid notices
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
wasn't actually changed before
Avoid a notice
Avoid a Notice
Avoid a Notice
Avoid a Notice
* master:
2012-03-13 22:41:45 -04:00
friendica
de017d1ed7
sort inbox by recently replied conversations first
2012-03-13 19:27:52 -07:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
8a789a33d1
Merge branch 'pull'
2012-03-13 16:02:52 -07:00
friendica
db80ffa0ff
don't count self in number of contatcs
2012-03-13 16:02:20 -07:00
friendica
2173f418dd
Merge pull request #130 from CatoTH/master
...
HTML2BBCode with [EMBED]: Compute in JS instead of PHP
2012-03-13 15:45:12 -07:00
friendica
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
friendica
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
Tobias Hößl
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.
2012-03-13 21:46:57 +00:00
friendica
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
Simon L'nu
1763a6c9c2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
* master:
2012-03-13 14:41:46 -04:00
Tobias Hößl
43430ef561
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-13 18:34:15 +00:00
friendica
5a41676465
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
2012-03-13 04:04:26 -07:00
5bae7159cc
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-13 06:50:14 +01:00
Simon L'nu
203fa94e17
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
click anywhere to close notifications -> zeros and bubbles
revup
fix css
use fancybox instead of lightbox
fixes
* master:
2012-03-13 00:25:20 -04:00
friendica
bf7425c591
click anywhere to close notifications -> zeros and bubbles
2012-03-12 20:21:32 -07:00
friendica
e12706e825
Merge branch 'pull'
2012-03-12 19:12:39 -07:00
friendica
acf75e85c8
revup
2012-03-12 19:12:00 -07:00
tomtom84
691f5b11f7
Merge pull request #128 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:40:10 -07:00
tommy tomson
8358b9247f
fix css
2012-03-13 00:38:38 +01:00
tomtom84
ecc9f4ba70
Merge pull request #127 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0
use fancybox instead of lightbox
2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d
Merge pull request #126 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1
fixes
2012-03-12 23:31:54 +01:00
Simon L'nu
5a1e2c32fe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add lightbox, fixex in css
more save to file backend
backend for "save to file" feature
* master:
2012-03-12 17:12:01 -04:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
tomtom84
a1305433b8
Merge pull request #125 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746
add lightbox, fixex in css
2012-03-12 21:09:16 +01:00
Tobias Hößl
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-12 19:06:45 +00:00
Fabio Comuni
c30342e2f7
add 'loggin_out' hook
2012-03-12 15:58:59 +01:00
Alexander Kampmann
bce3bfff38
get tags test improved
2012-03-12 13:59:00 +01:00
friendica
38cb4a362f
Merge branch 'pull'
2012-03-12 00:57:06 -07:00
friendica
3bc990f718
more save to file backend
2012-03-11 21:32:11 -07:00
30f5c3a9eb
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-12 05:02:45 +01:00
friendica
93058af4fc
backend for "save to file" feature
2012-03-11 20:19:56 -07:00
Simon L'nu
9f52e3df8d
fix dispy-dark photo album stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu
8629d90818
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 21:33:06 -04:00
Simon
18ef942f62
Merge pull request #124 from simonlnu/master
...
fix dispys' css and layout
2012-03-11 17:37:29 -07:00
Simon L'nu
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Simon L'nu
de70b2f30f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
community meta tag renamed from "ika"
* master:
2012-03-11 20:33:10 -04:00
friendica
1401f763ec
Merge branch 'pull'
2012-03-11 17:09:07 -07:00
Michael Vogel
6e7a190e91
Mail: Subject are now with working "Re:"
2012-03-12 00:22:12 +01:00
friendica
d9bee73edf
community meta tag renamed from "ika"
2012-03-11 15:50:23 -07:00
Michael Vogel
2ed6b3531e
Removing test exports
2012-03-11 23:29:59 +01:00
Michael Vogel
905ba5ba1d
Missing field in database.sql
2012-03-11 22:39:40 +01:00
Simon L'nu
6e5f837609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 17:05:08 -04:00
Michael Vogel
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
ebdf484218
Added config options for the item cache and the ostatus priority
2012-03-11 19:50:51 +01:00
Michael Vogel
9ca5de8c28
Item cache now is one day.
2012-03-11 19:45:28 +01:00
