friendica
7718b6abea
rev update
2012-08-14 15:21:54 -07:00
Tobias Diekershoff
d3d2770f3a
Merge branch 'master' of https://github.com/friendica/friendica
2012-08-14 12:38:06 +02:00
Tobias Diekershoff
a763a064ff
DE some updates to the translation
2012-08-14 12:37:32 +02:00
friendica
aaadabf7d2
partial fix for D* public key format change
2012-08-14 02:20:48 -07:00
friendica
3a601ff66f
rev update
2012-08-13 16:46:24 -07:00
friendica
31bd0557cb
Merge pull request #436 from fermionic/api-mark-timeline-read
...
update items seen in DB when using API
2012-08-12 19:59:21 -07:00
Zach Prezkuta
7d8aee05ef
update items seen in DB when using API
2012-08-12 20:29:37 -06:00
friendica
bfec28f1fe
threading messed up a bit of cross-site federation code
2012-08-12 18:42:43 -07:00
friendica
962c357ebd
common_friends_visitor_widget warning
2012-08-12 15:54:38 -07:00
Domovoy
cc4361fddf
Problem with comment box, debug.
2012-08-12 20:11:14 +02:00
Domovoy
82d779a33b
Conversation and Item now handles (dis)like as they should
2012-08-12 17:46:02 +02:00
Domovoy
04f14d96c6
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-12 17:34:23 +02:00
Domovoy
d4f44b1530
Some fixes
2012-08-12 17:34:02 +02:00
Domovoy
b1a801fe61
Item: new methods check_wall_to_wall, is_wall_to_wall, get_owner_url, get_owner_photo, get_owner_name
2012-08-12 17:20:38 +02:00
Domovoy
c8cf87efc4
rename $item_result to $result
2012-08-12 16:32:02 +02:00
Domovoy
4e4774ff4f
Improved get_comment_box
2012-08-12 16:26:37 +02:00
Domovoy
9f57afe160
Item: new method get_redirect_url
2012-08-12 16:18:53 +02:00
Domovoy
71f11a9a32
Item: new method get_comment_box
2012-08-12 16:02:47 +02:00
Domovoy
d603f76678
Some fix on forgotten or useless vars
2012-08-12 15:39:21 +02:00
friendica
e81f15b28d
crypt bbcode tag
2012-08-12 04:29:26 -07:00
fermionic
8d89a915fc
Merge pull request #434 from fermionic/frost-update-for-threaded-comments
...
sigh I always miss something when copying over
2012-08-11 19:53:08 -07:00
Zach Prezkuta
91aacdbb3d
sigh I always miss something when copying over
2012-08-11 20:51:51 -06:00
friendica
6348634a1b
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
friendica
1cd23860cb
rev update
2012-08-11 15:39:45 -07:00
friendica
3039ad7aa7
Merge pull request #433 from fermionic/frost-update-for-threaded-comments
...
Some updates for threading
2012-08-11 15:34:21 -07:00
Zach Prezkuta
5890e3fa3a
update frost mobile TODO
2012-08-11 14:43:13 -06:00
Zach Prezkuta
5e09fc31f5
Threading updates
...
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
2012-08-11 14:36:58 -06:00
Domovoy
91edb06bcb
prepare_threads_body is not used by Item anymore
2012-08-11 19:58:57 +02:00
Domovoy
5084cff8f4
Should fix the like problem
2012-08-11 19:23:18 +02:00
Domovoy
9b6e99a6ba
mode is handled by Conversation
2012-08-11 18:12:35 +02:00
Domovoy
1c36d14673
Got of the get_* function about data, use get_data_value instead (except for get_id, which is very conveniant).
2012-08-11 17:51:25 +02:00
Domovoy
7c2ed027ff
Item: new method count_descendants
2012-08-11 17:48:07 +02:00
Domovoy
e6c55de070
Item: parent/children relationship. get_parent now returns an Item (or null)
2012-08-11 17:39:11 +02:00
Domovoy
adbe126d10
Item: new method is_writeable
2012-08-11 17:15:19 +02:00
Domovoy
531801ff50
Item: new method is_toplevel
2012-08-11 17:09:35 +02:00
Domovoy
1ffca59a9e
Item: new method get_thumb
2012-08-11 17:04:07 +02:00
Domovoy
56cae53e50
Item: new methods get|set_template
2012-08-11 16:56:10 +02:00
Domovoy
d817117f6e
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-08-11 16:42:47 +02:00
Domovoy
f1731b3cec
New methods on Item: set|get_mode, get_profile_owner, is_page_writeable
2012-08-11 15:44:47 +02:00
friendica
d4b6188356
getting comment counts correct in a threaded world
2012-08-11 01:26:10 -07:00
friendica
95bf9324b4
fix child count
2012-08-10 23:42:45 -07:00
friendica
20be1778db
bring likes back - comment ordering is still a bit funky
2012-08-10 16:36:44 -07:00
friendica
ed7e626ed2
Merge https://github.com/friendica/friendica into pull
2012-08-10 16:04:16 -07:00
friendica
f8b969e252
Merge pull request #431 from fermionic/diaspora-relays-and-tags
...
Couple of Diaspora fixes
2012-08-10 16:03:37 -07:00
friendica
d2eef5f11d
Merge pull request #432 from fermionic/frost-better-screen-width
...
Frost Mobile better screen width
2012-08-10 16:03:19 -07:00
friendica
b960352b54
rev update
2012-08-10 16:02:20 -07:00
Domovoy
75d355a2aa
Rendering is now done by Item objects
2012-08-10 19:57:39 +02:00
Domovoy
6ef86e1fff
New objects: Conversation and Item
2012-08-10 17:46:39 +02:00
Zach Prezkuta
bcf214debb
readability in TODO
2012-08-10 08:37:31 -06:00
Zach Prezkuta
d9279da369
- Frost Mobile: redo CSS to adjust automatically to the screen width
...
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
