Tobias Diekershoff
5fb4ca346b
CS: update to the strings
2012-09-27 06:27:06 +02:00
Tobias Diekershoff
7b7e3aab1f
ES: update to the strings
2012-09-27 06:24:49 +02:00
Tobias Diekershoff
ce38e574a2
DE: update to the strings
2012-09-27 06:21:16 +02:00
friendica
25773b41cb
add "tagged" hook (bots and such)
2012-09-26 18:24:19 -07:00
friendica
eaaf14736c
rev update
2012-09-26 18:23:08 -07:00
friendica
41db3fb983
declare array separately, doesn't work well when defined in hook
2012-09-26 04:50:24 -07:00
friendica
d1d5eca258
network_ping hook for next generation "page"/"forums" plugin
2012-09-26 04:46:54 -07:00
friendica
4a8100a409
frost-mobile - everything is walltowall
2012-09-25 21:55:53 -07:00
friendica
2cacbdb9e7
Merge https://github.com/friendica/friendica into pull
2012-09-25 19:11:58 -07:00
friendica
e433f20cd8
sort out the 'delete selected' mess
2012-09-25 19:10:46 -07:00
pixelroot
75d65db785
Merge remote branch 'upstream/master'
2012-09-25 12:00:29 +02:00
pixelroot
0bf9ff5821
modified: view/theme/smoothly/events_reminder.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-25 11:59:58 +02:00
friendica
245d9f0aca
one template to rule them all
2012-09-25 01:31:48 -07:00
friendica
a798ef1a56
one template to rule them all
2012-09-24 21:43:03 -07:00
friendica
c8960fe3db
Merge https://github.com/friendica/friendica into pull
2012-09-24 20:54:55 -07:00
friendica
98064fc627
rev update
2012-09-24 20:54:20 -07:00
pixelroot
0592a9e3ca
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-24 16:07:41 +02:00
friendica
8df6f249fd
Merge https://github.com/friendica/friendica into pull
2012-09-24 01:31:23 -07:00
friendica
8184de9c78
remove THISPLUGIN definition - not used and doesn't work
2012-09-24 01:30:18 -07:00
pixelroot
0834779405
Merge remote branch 'upstream/master'
2012-09-24 10:16:05 +02:00
pixelroot
05223cc325
modified: view/theme/smoothly/search_item.tpl
...
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_item.tpl
modified: view/theme/smoothly/wall_thread.tpl
modified: view/theme/smoothly/wallwall_item.tpl
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-24 10:15:31 +02:00
friendica
94f3aef1ea
allow a bit more height
2012-09-24 00:46:00 -07:00
friendica
316014e4ea
restore category/file display on dispy/diabook
2012-09-24 00:35:19 -07:00
pixelroot
c44d068adf
Merge branch 'master' of http://github.com/friendica/friendica
2012-09-24 08:46:25 +02:00
friendica
054f8edb59
zeros - theming for new categories/folder display
2012-09-23 19:22:48 -07:00
friendica
b661e61d6a
Merge https://github.com/friendica/friendica into pull
2012-09-23 17:17:33 -07:00
friendica
c3b4f9f0d3
support for bringing back cats/folders
2012-09-23 17:16:37 -07:00
friendica
fbd120f1ce
rev update
2012-09-23 17:16:01 -07:00
Tobias Diekershoff
930169a8aa
DE: update to the strings
2012-09-22 08:42:07 +02:00
pixelroot
994c37b85b
Merge branch 'master' of http://github.com/friendica/friendica
2012-09-22 08:36:50 +02:00
friendica
b6b8f40fa9
Merge https://github.com/friendica/friendica into pull
2012-09-21 18:10:32 -07:00
friendica
5fd124eabe
undo revert of template changes
2012-09-21 18:09:55 -07:00
friendica
c2af97ef61
rev update
2012-09-21 18:04:09 -07:00
pixelroot
57849ff959
modified: view/theme/smoothly/style.css
2012-09-21 08:57:22 +02:00
pixelroot
fa2156a9c1
modified: view/theme/smoothly/style.css
2012-09-20 13:26:53 +02:00
pixelroot
8a8fe725af
modified: view/theme/smoothly/style.css
2012-09-20 13:25:12 +02:00
pixelroot
85c0260f33
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-20 13:15:01 +02:00
pixelroot
7b9721f052
Merge remote branch 'upstream/master'
2012-09-20 11:33:24 +02:00
pixelroot
12f7c32f9b
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-20 11:32:55 +02:00
friendica
58399c854f
Merge pull request #492 from fabrixxm/blog-like
...
More data in $item array
2012-09-20 02:15:12 -07:00
Fabrixxm
dd25c7db7e
more $item data
...
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
2012-09-20 09:46:49 +02:00
Fabrixxm
eda96a82d7
Update util/typo.php to check in to 'object' folder
2012-09-20 09:32:42 +02:00
pixelroot
49098ed11d
deleted: view/theme/smoothly/match.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-20 09:25:53 +02:00
Fabrixxm
40f2ec189e
Merge remote branch 'friendica/master' into blog-like
2012-09-20 02:48:54 -04:00
Fabrixxm
4758dc187c
remove blog theme
2012-09-20 02:42:54 -04:00
Michael Vogel
4c389eb73b
Merge remote branch 'upstream/master'
2012-09-20 08:32:33 +02:00
friendica
ee6044a6e4
Merge pull request #491 from fermionic/separate-number-text-in-hidden-comments-text
...
allow hidden comments phrase to be accessed separately as number and text
2012-09-19 20:56:26 -07:00
Zach Prezkuta
da7c5b19b1
allow hidden comments phrase to be accessed separately as number and text
2012-09-19 21:31:26 -06:00
friendica
cd109b5adf
Merge pull request #490 from fermionic/diaspora-profile-updates-broken
...
-- Fix Diaspora profile update avatar bugs
2012-09-19 19:52:50 -07:00
Zach Prezkuta
1aa111387a
-- Fix Diaspora profile update avatar bugs
...
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00
