This website requires JavaScript.
3bbd82abb3
Merge remote branch 'upstream/master'
2012-03-17 02:25:22 +01:00
4a6f114ec0
Merge pull request #144 from simonlnu/master
2012-03-16 18:24:26 -07:00
75883b196e
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
2012-03-16 21:23:24 -04:00
49540fb958
make auto-complete work in more places
2012-03-16 21:20:23 -04:00
030c8a089a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 21:19:17 -04:00
c56e3c5dd4
Merge remote branch 'upstream/master'
2012-03-17 01:49:17 +01:00
8af36b92bb
Merge pull request #143 from simonlnu/master
2012-03-16 17:31:24 -07:00
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
2012-03-16 20:29:02 -04:00
6bc2d58a98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 20:26:38 -04:00
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
0e9d5e0ce8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 18:35:50 -04:00
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
141ae076ad
Merge branch 'pull'
2012-03-16 15:08:32 -07:00
58940175e1
wrong link in d* comment notifications
2012-03-16 15:07:45 -07:00
c7dd52be62
Merge pull request #142 from simonlnu/master
2012-03-16 13:44:39 -07:00
91fee866b7
make profiles-menu disappear when clicked outside it
2012-03-16 16:43:34 -04:00
01f8710832
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 16:41:19 -04:00
1246a40ec2
Merge pull request #141 from CatoTH/master
2012-03-16 10:54:20 -07:00
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
925b9c5b9c
Merge pull request #140 from simonlnu/master
2012-03-16 10:35:19 -07:00
7b15f27ba4
weee, dispys get another update
2012-03-16 13:31:59 -04:00
a8c1cbc655
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 13:28:22 -04:00
28f941193d
syntax error from pasted text, remove ^M's
2012-03-16 06:02:26 -07:00
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
805087af67
whitespace
2012-03-16 05:41:29 -07:00
be1bd9ff4e
notification for disapora comments
2012-03-16 05:19:29 -07:00
ea4c806c5c
Merge remote branch 'upstream/master'
2012-03-16 08:33:01 +01:00
74c64ef2d2
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-16 07:13:14 +01:00
47e1b8d0c0
Merge pull request #139 from simonlnu/master
2012-03-15 22:58:54 -07:00
e21bf3341b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 01:57:59 -04:00
d965f73ef1
missing close double quote in mail_list.tpl
2012-03-16 01:57:27 -04:00
cecd62373b
Merge pull request #138 from simonlnu/master
2012-03-15 22:56:46 -07:00
6bdb71f01c
more changes in dispy-dark
2012-03-16 01:55:34 -04:00
f727b44c08
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-16 01:51:25 -04:00
be4e4dfb0d
turn indexes back off (this is from an errant checkin a year or more ago)
2012-03-15 20:07:30 -07:00
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
0b509fd763
Merge pull request #137 from tomtom84/master
2012-03-15 19:55:10 -07:00
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
5d2c590fa9
Merge pull request #136 from annando/master
2012-03-15 15:30:52 -07:00
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
2012-03-15 17:27:06 -04:00
eee2eed588
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-15 17:25:22 -04:00
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
ab89aa90ca
Merge pull request #135 from simonlnu/master
2012-03-15 12:08:59 -07:00
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
zottel
Simon
Simon L'nu
friendica
Tobias Hößl
Tobias Diekershoff
tomtom84
tommy tomson
Michael Vogel
Alexander Kampmann
Tony Baldwin