Commit graph

6784 commits

Author SHA1 Message Date
fabrixxm
9752f62b8d Merge pull request #452 from fabrixxm/master
quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas
2012-09-01 02:05:53 -07:00
Fabrixxm
02037e345d quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas 2012-09-01 04:52:01 -04:00
friendica
f88f0bf3f2 Merge https://github.com/friendica/friendica into pull 2012-08-31 01:29:55 -07:00
friendica
b1c8b22aa5 rev update 2012-08-31 01:29:37 -07:00
friendica
2ace7d6646 Merge pull request #451 from fabrixxm/master
fixes and tweaks
2012-08-31 01:26:03 -07:00
Fabrixxm
51686cce01 quattro: remove 'experimental' 2012-08-31 03:32:10 -04:00
Fabrixxm
ad45d9a78a quattro: fix live update 2012-08-31 03:31:33 -04:00
pixelroot
9346de5686 deleted: view/theme/softy/style.alex
deleted:    view/theme/softy/style.alt
2012-08-30 16:50:22 +02:00
pixelroot
d96e3d95c1 new file: view/theme/softy/back-gradient.jpg
new file:   view/theme/softy/calendar.png
	new file:   view/theme/softy/comment_item.tpl
	new file:   view/theme/softy/connect.png
	new file:   view/theme/softy/contact_template.tpl
	new file:   view/theme/softy/conversation.tpl
	new file:   view/theme/softy/group_drop.tpl
	new file:   view/theme/softy/group_edit.tpl
	new file:   view/theme/softy/group_side.tpl
	new file:   view/theme/softy/groups.png
	new file:   view/theme/softy/icons.png
	new file:   view/theme/softy/icons.svg
	new file:   view/theme/softy/jot-header.tpl
	new file:   view/theme/softy/jot.tpl
	new file:   view/theme/softy/lock.cur
	new file:   view/theme/softy/login-bg.gif
	new file:   view/theme/softy/lrarrow.gif
	new file:   view/theme/softy/mail_head.tpl
	new file:   view/theme/softy/match.tpl
	new file:   view/theme/softy/menu-user-pin.jpg
	new file:   view/theme/softy/menu-user-pin.png
	new file:   view/theme/softy/nav-bg.png
	new file:   view/theme/softy/nav.tpl
	new file:   view/theme/softy/nets.tpl
	new file:   view/theme/softy/next.png
	new file:   view/theme/softy/notifications.png
	new file:   view/theme/softy/photo-menu.jpg
	new file:   view/theme/softy/photo_album.tpl
	new file:   view/theme/softy/photo_top.tpl
	new file:   view/theme/softy/photo_view.tpl
	new file:   view/theme/softy/photography.png
	new file:   view/theme/softy/premium.png
	new file:   view/theme/softy/prev.png
	new file:   view/theme/softy/profile_entry.tpl
	new file:   view/theme/softy/profile_vcard.tpl
	new file:   view/theme/softy/saved_searches_aside.tpl
	new file:   view/theme/softy/screenshot.jpg
	new file:   view/theme/softy/screenshot.png
	new file:   view/theme/softy/search.png
	new file:   view/theme/softy/search_item.tpl
	new file:   view/theme/softy/star.png
	new file:   view/theme/softy/style.alex
	new file:   view/theme/softy/style.alt
	new file:   view/theme/softy/style.css
	new file:   view/theme/softy/theme.php
	new file:   view/theme/softy/user.png
	new file:   view/theme/softy/wall_item.tpl
	new file:   view/theme/softy/wallwall_item.tpl
2012-08-30 16:42:50 +02:00
Domovoy
ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Fabrixxm
f433158bed config: fix get_config and get_pconfig search for serialized array
works also if the serialized string contains newlines
2012-08-29 04:19:15 -04:00
friendica
af789ee98b Merge https://github.com/friendica/friendica into pull 2012-08-28 20:35:25 -07:00
fermionic
ed7c3363c2 Merge pull request #450 from fermionic/frost-showmore-border
make the show more line look nicer
2012-08-28 19:20:36 -07:00
Zach Prezkuta
2ef1081c68 make the show more line look nicer 2012-08-28 20:19:47 -06:00
fermionic
65f766ba0e Merge pull request #449 from fermionic/markdownify-breaks-links-with-underscores
manually fix escaped underscores in links
2012-08-28 19:13:48 -07:00
Zach Prezkuta
f7a1999c15 manually fix escaped underscores in links 2012-08-28 20:12:41 -06:00
friendica
f07658accf Merge https://github.com/friendica/friendica into pull 2012-08-28 19:11:52 -07:00
friendica
724583e386 rev update 2012-08-28 19:08:17 -07:00
fermionic
9ae5ae6df5 Merge pull request #448 from fermionic/limit-items-on-all-pages
limit number of items on profile page too
2012-08-28 19:03:15 -07:00
fermionic
597e96e156 Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags
regular expressions were grabbing too much
2012-08-28 19:03:04 -07:00
fermionic
8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings
automatically make posts private for new users
2012-08-28 19:02:51 -07:00
c2b4dc2e60 DE: some translations 2012-08-28 18:14:57 +02:00
Fabrixxm
9ecb984285 Merge remote branch 'friendica/master' into bid-prov 2012-08-28 10:38:40 -04:00
d9ffb0578c quattro: display date info as "ago" with mouse over date stamp 2012-08-27 19:47:04 +02:00
647802f92e get "ago" information into the mail thread view 2012-08-27 19:46:35 +02:00
cf91a7f79a quattro: mail_display has no ago information so don't display it 2012-08-27 19:39:31 +02:00
036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp 2012-08-27 19:32:23 +02:00
1e9d35fb0e pass "ago" information to the mail_list template 2012-08-27 19:31:41 +02:00
37a0504f96 quattro: expanded the new prvmessage field a bit 2012-08-27 08:13:07 +02:00
Zach Prezkuta
c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta
72712175b5 regular expressions were grabbing too much 2012-08-26 14:56:34 -06:00
fermionic
0765ab5203 Merge pull request #446 from fermionic/frost-scrollbars-are-annoying
Frost scrollbars are annoying
2012-08-26 08:32:52 -07:00
Zach Prezkuta
a77081f659 remove show more/less from frost mobile--it is too great a load 2012-08-26 09:31:37 -06:00
Zach Prezkuta
0fe1727d74 remove show more/less animation on mobile 2012-08-26 09:22:49 -06:00
fermionic
17b59a7e3f Merge pull request #445 from fermionic/frost-scrollbars-are-annoying
Frost scrollbars are annoying
2012-08-25 21:45:52 -07:00
Zach Prezkuta
7c9c92e542 update version 2012-08-25 22:43:32 -06:00
Zach Prezkuta
193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta
1ffd67f291 hey: you missed a spot 2012-08-25 15:07:39 -06:00
Zach Prezkuta
f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
fermionic
5cb618bcf1 Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show
restore nav element to login pages, since system messages are sent in it
2012-08-25 09:10:01 -07:00
Zach Prezkuta
3413cc1006 restore nav element to login pages, since system messages are sent in it 2012-08-25 10:08:25 -06:00
Zach Prezkuta
bd59f3d152 probably shouldn't require exact match for non-string 2012-08-24 21:46:42 -06:00
fermionic
5fbad0d925 Merge pull request #442 from fermionic/frost-image-upload-and-post-local-time
fix image and file upload on frost moble; add support to frost for local...
2012-08-24 20:30:27 -07:00
Zach Prezkuta
7c5f5f3113 automatically make posts private for new users 2012-08-24 21:28:28 -06:00
Zach Prezkuta
54d4fc73c4 fix image and file upload on frost moble; add support to frost for local post time 2012-08-24 21:25:39 -06:00
Domovoy
79e748b705 Remove wall to wall checking base on @ tags, too heavy for the database.
This should be done when we store the item (https://social.errlock.org/display/domovoy/26698)
2012-08-24 05:53:45 +02:00
Domovoy
f746e06a37 wall to wall detection: fallback using @ tags, and check if one is a forum. 2012-08-24 05:21:08 +02:00
Domovoy
9390eda5e6 Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum) 2012-08-24 05:11:39 +02:00
Domovoy
5cd1dde59b Logic error 2012-08-24 05:04:35 +02:00
Domovoy
32bf36bf97 method, not property 2012-08-24 04:58:51 +02:00