Simon
8af36b92bb
Merge pull request #143 from simonlnu/master
...
make auto-complete in darkzero-NS.
2012-03-16 17:31:24 -07:00
Simon L'nu
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 20:29:02 -04:00
Simon L'nu
6bc2d58a98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
2012-03-16 20:26:38 -04:00
friendica
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
Simon L'nu
0e9d5e0ce8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
wrong link in d* comment notifications
* master:
2012-03-16 18:35:50 -04:00
friendica
949c6d47b5
add "send pm" link to photo dropdown for Diaspora contacts
2012-03-16 15:19:38 -07:00
friendica
141ae076ad
Merge branch 'pull'
2012-03-16 15:08:32 -07:00
friendica
58940175e1
wrong link in d* comment notifications
2012-03-16 15:07:45 -07:00
Simon
c7dd52be62
Merge pull request #142 from simonlnu/master
...
make profiles-menu disappear when clicked outside of it
2012-03-16 13:44:39 -07:00
Simon L'nu
91fee866b7
make profiles-menu disappear when clicked outside it
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 16:43:34 -04:00
Simon L'nu
01f8710832
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Bugfix of old IEs
Forgot to remove a debug line
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
* master:
2012-03-16 16:41:19 -04:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
Tobias Hößl
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
Tobias Hößl
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
Simon
925b9c5b9c
Merge pull request #140 from simonlnu/master
...
weee, dispys get another update
2012-03-16 10:35:19 -07:00
Simon L'nu
7b15f27ba4
weee, dispys get another update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 13:31:59 -04:00
Simon L'nu
a8c1cbc655
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
syntax error from pasted text, remove ^M's
bug #335 network search broken after new ssl policy settings
whitespace
notification for disapora comments
* master:
2012-03-16 13:28:22 -04:00
friendica
28f941193d
syntax error from pasted text, remove ^M's
2012-03-16 06:02:26 -07:00
friendica
224dfa848b
bug #335 network search broken after new ssl policy settings
2012-03-16 05:51:04 -07:00
friendica
805087af67
whitespace
2012-03-16 05:41:29 -07:00
friendica
be1bd9ff4e
notification for disapora comments
2012-03-16 05:19:29 -07:00
Tobias Diekershoff
74c64ef2d2
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-16 07:13:14 +01:00
Simon
47e1b8d0c0
Merge pull request #139 from simonlnu/master
...
missing close double quote in mail_list.tpl
2012-03-15 22:58:54 -07:00
Simon L'nu
e21bf3341b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-16 01:57:59 -04:00
Simon L'nu
d965f73ef1
missing close double quote in mail_list.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:57:27 -04:00
Simon
cecd62373b
Merge pull request #138 from simonlnu/master
...
more changes in dispy-dark
2012-03-15 22:56:46 -07:00
Simon L'nu
6bdb71f01c
more changes in dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:55:34 -04:00
Simon L'nu
f727b44c08
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (21 commits)
turn indexes back off (this is from an errant checkin a year or more ago)
undo git stuffup
added icons to profile_side, fixes in css
track whether contact is a community page or not
html2bbcode: Disabled size conversion
Mail: Subject are now with working "Re:"
Removing test exports
Missing field in database.sql
Removed changes
Added config options for the item cache and the ostatus priority
Item cache now is one day.
Corrected some git problems
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
Pages: Show every community page - even from foreign servers (with caching)
New plugin that shows community pages in the sidebar
Caching improved.
Enabled Caching for items. Changed color of tags in diabook.
New config options if ostatus polling should use the priority in the contacts
Mail: Removing signatures, gpg, unnecessary line breaks
diabook: Moving the location between the icons
...
* master:
2012-03-16 01:51:25 -04:00
friendica
be4e4dfb0d
turn indexes back off (this is from an errant checkin a year or more ago)
2012-03-15 20:07:30 -07:00
friendica
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
friendica
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
tomtom84
0b509fd763
Merge pull request #137 from tomtom84/master
...
fixes in diabook-derivates
2012-03-15 19:55:10 -07:00
tommy tomson
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
friendica
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
friendica
5d2c590fa9
Merge pull request #136 from annando/master
...
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Simon L'nu
eee2eed588
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-15 17:25:22 -04:00
Michael Vogel
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
Simon
ab89aa90ca
Merge pull request #135 from simonlnu/master
...
commit latest to dispy-dark. fixes in html css and js
2012-03-15 12:08:59 -07:00
Simon L'nu
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
Simon L'nu
1d2049a6d6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more recycle fixes for plaintext
fix recycle symbol when using plaintext editor
add links to wall, photos, events, etc to aside on networkpage, fixes in css
* master:
2012-03-15 15:03:31 -04:00
Alexander Kampmann
899701c3d3
integrated profiler
2012-03-15 12:55:49 +01:00
friendica
f96aff5518
more recycle fixes for plaintext
2012-03-15 03:47:02 -07:00
Alexander Kampmann
9796e99fa8
added simple build-in profiling
2012-03-15 11:45:06 +01:00
friendica
9cd1c35c22
fix recycle symbol when using plaintext editor
2012-03-15 03:44:41 -07:00
Alexander Kampmann
29ade1d9b9
another test for xmlify
2012-03-15 10:51:22 +01:00
friendica
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
