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
friendica
c11aa30ef4
this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted.
2012-09-19 18:24:20 -07:00
friendica
51bee79b21
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/theme/smoothly/follow.tpl
2012-09-19 15:39:19 -07:00
friendica
09a00a9a07
html tag completed early
2012-09-19 15:34:21 -07:00
Fabrixxm
b400ddd22d
conversation: new 'categories' and 'folder' elements to $item
...
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
2012-09-19 11:38:32 -04:00
Fabrixxm
2bdbdc8d8e
Merge branch 'master' into blog-like
2012-09-19 11:38:04 -04:00
pixelroot
31064a15ec
modified: view/theme/smoothly/theme.php
2012-09-19 16:16:58 +02:00
pixelroot
a4f25f6eaa
modified: view/theme/smoothly/style.css
2012-09-19 16:14:45 +02:00
pixelroot
05a61b80e2
modified: view/theme/smoothly/follow.tpl
...
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
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-19 15:53:37 +02:00
friendica
82678e7bbf
bad html in view/follow.tpl
2012-09-19 03:17:41 -07:00
friendica
490c98b7db
fix events
2012-09-19 00:44:37 -07:00
friendica
0b59d30e34
more infrastructure for ignored events
2012-09-18 22:49:05 -07:00
friendica
66081201bc
allow "subscribe to thread" activities to exist without displaying them.
2012-09-18 20:12:55 -07:00
friendica
fa14723ef5
Merge https://github.com/friendica/friendica into pull
2012-09-18 17:44:38 -07:00
friendica
5cad3e114a
give themes more control over events/birthdays and provide them as notifications
2012-09-18 17:43:09 -07:00
friendica
8596a275fc
rev update
2012-09-18 17:24:45 -07:00
friendica
6ebd56012a
Merge pull request #479 from fermionic/album-image-inserted-too-large
...
dont insert images larger than scale level 2
2012-09-18 15:46:41 -07:00
Thomas Willingham
96d6d6b988
Pull request #487
2012-09-18 16:15:36 +01:00
Alex
61eb884a20
Update view/theme/smoothly/bottom.tpl
2012-09-18 13:13:05 +03:00
Zach Prezkuta
cd25573038
select based on dimensions instead of scale level
2012-09-17 21:46:36 -06:00
friendica
863e036b76
Merge pull request #483 from fabrixxm/bug471
...
admin: Don't allow to block or delete site admin in users admin page.
2012-09-17 17:39:32 -07:00
Thomas Willingham
69182360ef
Merge pull request #486 from cvogeley/master
...
Show notifications in title, ignore OSX .DS_Store files
2012-09-17 14:44:17 -07:00
Christian Vogeley
cf2016e1a6
ignore OSX .DS_Store files
2012-09-17 23:11:42 +02:00
Christian Vogeley
4b8fc897e6
remove .DS_Store
2012-09-17 23:03:53 +02:00
Christian Vogeley
c024ed601e
Remove and ignore .DS_Store
2012-09-17 23:03:34 +02:00
Tobias Diekershoff
808b0f2ed8
ES: bringing the strings to 100% thx to csolisr
2012-09-17 21:52:21 +02:00
Christian Vogeley
318bc23e8a
Add notifications in title
2012-09-17 20:39:34 +02:00
Thomas Willingham
e34b8e6d46
Pull request #484 (Smoothly)
2012-09-17 18:37:44 +01:00
tomtom84
55b741a4eb
Merge pull request #485 from tomtom84/master
...
Corrected titlebar notifications in Diabook.
2012-09-17 08:58:55 -07:00
tomtom84
68c2316ce3
Corrected titlebar notifications in Diabook
2012-09-17 17:54:07 +02:00
