Commit graph

6552 commits

Author SHA1 Message Date
friendica
1478229abc allow comments on other folks wall-to-wall postings 2012-09-05 18:24:06 -07:00
friendica
f7c4b033c7 Merge https://github.com/friendica/friendica into pull 2012-09-05 16:27:30 -07:00
friendica
3968dc932f update writable for dfrn contacts when using local delivery 2012-09-05 16:26:11 -07:00
friendica
f8b81b31f2 rev update 2012-09-05 15:43:19 -07:00
fermionic
79a2a1c37d Merge pull request #457 from fermionic/testbubble-broken-with-threading
Add wall_thread and wallwall_thread
2012-09-05 10:13:46 -07:00
Zach Prezkuta
c6f4404914 conversation.tpl doesnt appear to be necessary 2012-09-05 11:12:08 -06:00
Zach Prezkuta
0d45fec969 add threading files to make testbubble not broken with threading 2012-09-05 11:11:03 -06:00
friendica
9e5fa5b9a9 ignore exif orientation if we can't parse the particular flavour of exif 2012-09-05 04:02:30 -07:00
friendica
411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
friendica
a9deda1e5e rev update 2012-09-04 20:41:44 -07:00
fermionic
e079ffdce6 Merge pull request #455 from fermionic/previews-dont-work
conversation needs preview parameter
2012-09-04 17:50:33 -07:00
Zach Prezkuta
79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
friendica
5beda888b8 Merge https://github.com/friendica/friendica into pull 2012-09-03 21:32:47 -07:00
friendica
cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work 2012-09-03 21:31:35 -07:00
friendica
ca371de509 rev update 2012-09-03 21:31:00 -07:00
fermionic
6f7e8eee9e Merge pull request #454 from CyberDomovoy/mass_vhost
VirtualDocumentRoot and mod_rewrite
2012-09-02 14:18:00 -07:00
Domovoy
2b51e91414 Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot 2012-09-02 23:00:58 +02:00
Tobias Diekershoff
a287b34eb3 DE strings (pokes THX @zottel) 2012-09-02 11:59:44 +02:00
friendica
115310f1f4 Merge https://github.com/friendica/friendica into pull 2012-09-02 01:48:24 -07:00
friendica
39c7b34276 rev update 2012-09-02 01:47:04 -07:00
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
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
Tobias Diekershoff
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
Tobias Diekershoff
d9ffb0578c quattro: display date info as "ago" with mouse over date stamp 2012-08-27 19:47:04 +02:00
Tobias Diekershoff
647802f92e get "ago" information into the mail thread view 2012-08-27 19:46:35 +02:00
Tobias Diekershoff
cf91a7f79a quattro: mail_display has no ago information so don't display it 2012-08-27 19:39:31 +02:00
Tobias Diekershoff
036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp 2012-08-27 19:32:23 +02:00
Tobias Diekershoff
1e9d35fb0e pass "ago" information to the mail_list template 2012-08-27 19:31:41 +02:00
Tobias Diekershoff
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