Commit graph

21463 commits

Author SHA1 Message Date
fabrixxm
5fb971d060 Merge pull request #1003 from annando/master
app.net feeds, number of comments and better handling of the reply button in "vier"
2014-05-30 09:38:26 +02:00
Michael Vogel
6a28ae8b52 Just some better handling of tracker variables (url encoding) 2014-05-30 01:02:32 +02:00
Michael Vogel
13fea42d8c Merge remote-tracking branch 'upstream/master' 2014-05-29 23:04:57 +02:00
Michael Vogel
1fdfd614f0 Vier: Make the smiley button look better integrated into the theme. 2014-05-29 22:56:04 +02:00
Michael Vogel
00b8355ad5 The number of comments per post are now editable. 2014-05-29 22:26:03 +02:00
Michael Vogel
b0df06dd72 Vier: When clicking on the reply button, the focus now automatically changes to the textarea. 2014-05-29 20:27:06 +02:00
Michael Vogel
c759ee55e1 Better handling of app.net feeds. 2014-05-29 20:26:33 +02:00
fabrixxm
f58104e357 Merge pull request #1000 from fabrixxm/master
update IT strings
2014-05-29 15:04:39 +02:00
Fabrixxm
46dd72643f update IT 2014-05-29 14:55:15 +02:00
tobiasd
248b4fbcce rev up 2014-05-29 14:44:19 +02:00
fabrixxm
d5f80f54d4 Merge pull request #999 from annando/master
Starring now works again
2014-05-29 14:22:15 +02:00
Michael Vogel
3da39a0b0d Starring now works again 2014-05-29 14:17:37 +02:00
fabrixxm
77a54c66be Merge pull request #998 from annando/master
"Vier": New font version, fallback for oembed, more tracking variables removed
2014-05-29 14:04:04 +02:00
Michael Vogel
0eafed3353 Vier: New "font awesome" version, changed "reply" button, comment area is now hidden until the first reply came. (Saves space) 2014-05-29 11:51:13 +02:00
Michael Vogel
53d925095f Added some functionality if oembed isn't working. (Should be extended in the future) 2014-05-29 11:45:32 +02:00
Michael Vogel
135a403cec Added some tracking variables from facebook in the function to clean up URLs. 2014-05-29 11:43:37 +02:00
Michael Vogel
d001e19035 Detecting "type-video" at the conversion. (Mostly used by reimporting posts from pump.io that come from friendica) 2014-05-29 11:42:41 +02:00
Michael Vogel
b6c1d7dc2b fetching the hostname from the .htpreconfig.php if present 2014-05-29 11:40:54 +02:00
tobiasd
b91238a8e9 Merge pull request #997 from tobiasd/20140529
update to the NB NO translation and initial RO translation
2014-05-29 07:17:59 +02:00
Tobias Diekershoff
a6f89ef8bb RO: added smarty3 template translations 2014-05-29 07:12:10 +02:00
Tobias Diekershoff
5fbdc60333 RO: added strings 2014-05-29 07:06:09 +02:00
Tobias Diekershoff
e3122c4bf3 NB NO: update to the strings 2014-05-29 07:03:42 +02:00
tobiasd
5a55541dbd rev up 2014-05-25 08:00:22 +02:00
tobiasd
97e74f1570 Merge pull request #987 from annando/master
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
2014-05-25 07:59:22 +02:00
Michael Vogel
235eae66bb New query parameter that Speeds up the network viee when there are many contacts 2014-05-24 11:01:52 +02:00
Michael Vogel
5ae9c5e538 Added some logging 2014-05-24 11:01:33 +02:00
Michael Vogel
4924f527d2 plaintext: Moving some code from "plaintext" function to "get_attached_data" to have it accessible for non-plaintext exports 2014-05-24 11:00:05 +02:00
Michael Vogel
e32f9c4fff Dead processes will be deleted when they are running for more than 9 minutes. 2014-05-22 00:16:36 +02:00
Michael Vogel
58cea13707 Cron/Queue: Setting a limit to avoid endless PHP jobs. 2014-05-21 07:28:33 +02:00
tobiasd
6ad8e8cd76 Merge pull request #985 from tobiasd/lng20140519
updates ti the NL and PT BR translations
2014-05-19 08:11:29 +02:00
Tobias Diekershoff
e908d88e47 PT BR: update to the strings 2014-05-19 08:09:49 +02:00
Tobias Diekershoff
a0b9665a38 NL: update to the strings 2014-05-19 08:09:10 +02:00
tobiasd
1388b7ac27 Merge pull request #984 from annando/master
Better look for embedded videos, removing tracking parameters, new shortening function
2014-05-19 08:05:16 +02:00
Michael Vogel
d964e7e08f New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey. 2014-05-18 23:39:34 +02:00
Michael Vogel
6b461a74cb Cleaning up tracking parameters in urls. 2014-05-18 20:32:06 +02:00
Michael Vogel
665139660a Make embedded videos look better. (better margin data) 2014-05-18 20:30:27 +02:00
tobiasd
d3db9365cb Merge pull request #983 from annando/master
"red"-bookmarks and better plaintext export
2014-05-18 20:01:29 +02:00
Michael Vogel
31886ecd4f Content got lost sometimes due to a needless security function (HTML content is handled in the bbcode function) 2014-05-18 18:59:10 +02:00
Michael Vogel
7cc2723e2d Improvement for shortening of the new plaintext option. 2014-05-18 18:57:31 +02:00
Michael Vogel
35fbe3be14 Diaspora: Better handling of "red"-links 2014-05-18 18:56:07 +02:00
tobiasd
5205849e00 Merge pull request #981 from tobiasd/lng20140517_2
small update to the CS and DE strings
2014-05-17 14:50:16 +02:00
Tobias Diekershoff
13d578234d small update to the CS and DE strings 2014-05-17 14:49:05 +02:00
tobiasd
b4d85a151c Merge pull request #980 from tobiasd/lng20140517
updates for the CS and FR translations
2014-05-17 08:56:26 +02:00
Tobias Diekershoff
b1b6fa21fa FR + CS: register_adminadd template from transifex 2014-05-17 08:50:39 +02:00
Tobias Diekershoff
801d0a85f9 CS: update to the strings 2014-05-17 08:48:29 +02:00
Tobias Diekershoff
5cbcf79e27 FR: update to the strings 2014-05-17 08:46:51 +02:00
Tobias Diekershoff
5c941ad978 FR: update to the strings 2014-05-17 08:44:45 +02:00
tobiasd
ad9f4ec85f Merge pull request #978 from tobiasd/de20140516
DE: update to the strings
2014-05-16 12:10:20 +02:00
Tobias Diekershoff
bcafa23292 DE: update for the strings 2014-05-16 12:08:41 +02:00
fabrixxm
1e8e10796b Merge pull request #977 from fabrixxm/master
update master strings
2014-05-16 11:06:43 +02:00