This website requires JavaScript.
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
2012-03-15 15:07:17 -04:00
1d2049a6d6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-15 15:03:31 -04:00
899701c3d3
integrated profiler
2012-03-15 12:55:49 +01:00
f96aff5518
more recycle fixes for plaintext
2012-03-15 03:47:02 -07:00
9796e99fa8
added simple build-in profiling
2012-03-15 11:45:06 +01:00
9cd1c35c22
fix recycle symbol when using plaintext editor
2012-03-15 03:44:41 -07:00
29ade1d9b9
another test for xmlify
2012-03-15 10:51:22 +01:00
69f4448ada
Merge remote branch 'upstream/master'
2012-03-15 10:18:06 +01:00
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
4cd3d5cd02
Merge https://github.com/friendica/friendica into pull
2012-03-15 01:48:07 -07:00
282465edab
Merge remote branch 'upstream/master'
2012-03-15 08:36:05 +01:00
6dbee45d92
add links to wall, photos, events, etc to aside on networkpage, fixes in css
2012-03-15 08:29:39 +01:00
80b57e664a
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-15 06:31:47 +01:00
6e133e75c3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-15 01:02:44 -04:00
b06c5983a4
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
2012-03-14 21:58:54 -07:00
b44533e9fb
roll protocol version due to ssl_policy settings
2012-03-14 21:40:36 -07:00
93a8907f43
force login to ssl on SSL_POLICY_SELFSIGN
2012-03-14 21:29:44 -07:00
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
64e3e3590b
revup
2012-03-14 16:09:13 -07:00
531201f2a1
Merge pull request #132 from campino/master
2012-03-14 15:16:30 -07:00
959aa13de0
Merge pull request #133 from tonybaldwin/master
2012-03-14 15:15:34 -07:00
dcdfa96a1f
Merge branch 'pull'
2012-03-14 14:34:52 -07:00
2dc527609e
Merge https://github.com/friendica/friendica into pull
2012-03-14 14:34:48 -07:00
2481758886
Merge remote branch 'upstream/master'
2012-03-14 16:29:22 +01:00
ebccf13c4c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-14 11:02:14 -04:00
c95deb4839
Merge pull request #134 from simonlnu/master
2012-03-14 08:02:04 -07:00
0bf9595ab1
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 11:00:20 -04:00
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-14 12:57:35 +01:00
f03c57007a
fix in nav
2012-03-14 12:56:59 +01:00
509ed2604f
splitted tests into several files
2012-03-14 12:54:49 +01:00
42462cc1f0
add links to home, profile, photos, events, notes to aside in network-stream
2012-03-14 12:50:11 +01:00
c0c98206ef
removed done TODO
2012-03-14 12:31:25 +01:00
509532d168
get_tags tests corrected. They test for the right things now.
2012-03-14 12:30:52 +01:00
9df67e5cfe
Merge branch 'pull'
2012-03-13 23:53:33 -07:00
7e270b043c
addon settings form error
2012-03-13 23:52:13 -07:00
4fcdada432
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-14 07:20:13 +01:00
fb77bfa648
Merge pull request #131 from simonlnu/master
2012-03-13 22:10:02 -07:00
975781d3e2
massive work done to both dispys, mostly -dark
2012-03-14 01:05:08 -04:00
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
1ae740535d
added slack-NS, non-scrolly, slackr-based theme.
2012-03-13 23:05:04 -04:00
a2073bcfc0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-13 22:41:45 -04:00
de017d1ed7
sort inbox by recently replied conversations first
2012-03-13 19:27:52 -07:00
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
8a789a33d1
Merge branch 'pull'
2012-03-13 16:02:52 -07:00
db80ffa0ff
don't count self in number of contatcs
2012-03-13 16:02:20 -07:00
2173f418dd
Merge pull request #130 from CatoTH/master
2012-03-13 15:45:12 -07:00
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
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
acc4bbeb6e
Merge pull request #129 from CatoTH/master
2012-03-13 14:36:52 -07:00
1763a6c9c2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-13 14:41:46 -04:00
43430ef561
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-13 18:34:15 +00:00
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
203fa94e17
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-13 00:25:20 -04:00
bf7425c591
click anywhere to close notifications -> zeros and bubbles
2012-03-12 20:21:32 -07:00
e12706e825
Merge branch 'pull'
2012-03-12 19:12:39 -07:00
acf75e85c8
revup
2012-03-12 19:12:00 -07:00
691f5b11f7
Merge pull request #128 from tomtom84/master
2012-03-12 16:40:10 -07:00
8358b9247f
fix css
2012-03-13 00:38:38 +01:00
ecc9f4ba70
Merge pull request #127 from tomtom84/master
2012-03-12 16:06:15 -07:00
27bc8052d0
use fancybox instead of lightbox
2012-03-13 00:04:19 +01:00
8a85914e1d
Merge pull request #126 from tomtom84/master
2012-03-12 15:33:29 -07:00
caffb217c1
fixes
2012-03-12 23:31:54 +01:00
5a1e2c32fe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-12 17:12:01 -04:00
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
a1305433b8
Merge pull request #125 from tomtom84/master
2012-03-12 13:11:19 -07:00
9436175746
add lightbox, fixex in css
2012-03-12 21:09:16 +01:00
9574f7df03
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-12 19:06:45 +00:00
c30342e2f7
add 'loggin_out' hook
2012-03-12 15:58:59 +01:00
bce3bfff38
get tags test improved
2012-03-12 13:59:00 +01:00
38cb4a362f
Merge branch 'pull'
2012-03-12 00:57:06 -07:00
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
93058af4fc
backend for "save to file" feature
2012-03-11 20:19:56 -07:00
9f52e3df8d
fix dispy-dark photo album stuff
2012-03-11 21:34:51 -04:00
8629d90818
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-11 21:33:06 -04:00
18ef942f62
Merge pull request #124 from simonlnu/master
2012-03-11 17:37:29 -07:00
e9b82bb5ee
fix dispys' css and layout
2012-03-11 20:36:16 -04:00
de70b2f30f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-11 20:33:10 -04:00
1401f763ec
Merge branch 'pull'
2012-03-11 17:09:07 -07:00
6e7a190e91
Mail: Subject are now with working "Re:"
2012-03-12 00:22:12 +01:00
d9bee73edf
community meta tag renamed from "ika"
2012-03-11 15:50:23 -07:00
2ed6b3531e
Removing test exports
2012-03-11 23:29:59 +01:00
905ba5ba1d
Missing field in database.sql
2012-03-11 22:39:40 +01:00
6e5f837609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-11 17:05:08 -04:00
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
d653e27e2d
Merge commit 'upstream/master'
2012-03-11 20:22:28 +01:00
ebdf484218
Added config options for the item cache and the ostatus priority
2012-03-11 19:50:51 +01:00
9ca5de8c28
Item cache now is one day.
2012-03-11 19:45:28 +01:00
739309abd0
Corrected some git problems
2012-03-11 19:41:29 +01:00
9f76d96d46
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
2012-03-11 19:11:25 +01:00
b879a1ddf1
Pages: Show every community page - even from foreign servers (with caching)
2012-03-11 17:45:12 +01:00
d9cb46f0de
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 14:43:16 +00:00
1dad15a021
Merge pull request #123 from simonlnu/master
2012-03-11 07:29:45 -07:00
258a8c0871
screwed up on the font-size for screen last push
2012-03-11 10:29:12 -04:00
467aa66d37
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-11 10:25:39 -04:00
ac2a81a273
Merge pull request #122 from simonlnu/master
2012-03-11 07:25:27 -07:00
fa0cb8514d
add some '@media handheld' types for dispys
2012-03-11 10:24:49 -04:00
Simon L'nu
Alexander Kampmann
friendica
zottel
tommy tomson
Tobias Diekershoff
Simon
Tony Baldwin
Tobias Hößl
tomtom84
Fabio Comuni
Michael Vogel