friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8530 commits 1 branch 22 tags 59 MiB
Commit graph

8530 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Fabrixxm ca5da9f9af update master strings 2014-05-16 11:05:16 +02:00
fabrixxm b072b8f284 Update bbcode.php 
Fix translatable string.
 2014-05-16 10:55:29 +02:00
Tobias Diekershoff ed748f2d15 Merge pull request #976 from tobiasd/lng20140516 
update to the master strings
 2014-05-16 07:56:57 +02:00
Tobias Diekershoff 4075b872bf update to the master strings 2014-05-16 07:55:17 +02:00
Tobias Diekershoff 40b1e40b33 Merge pull request #973 from tobiasd/FR20140515 
FR: update to the strings
 2014-05-15 07:56:39 +02:00
Tobias Diekershoff e275494090 FR: update to the strings 2014-05-15 07:54:55 +02:00
Michael Vogel 6253d61803 Merge pull request #967 from fabrixxm/issue_737 
add check for expiration time in item_store()
 2014-05-13 10:16:15 +02:00
fabrixxm 0774a5c5fd Merge pull request #970 from annando/master 
Deleted the duplicate file "wall_attach.php"
 2014-05-12 22:07:41 +02:00
Michael Vogel 0f16672176 Deleted the duplicate file "wall_attach.php" 2014-05-12 21:30:53 +02:00
fabrixxm f55a22cb19 fix query as @annado comment 2014-05-12 19:02:03 +02:00
Fabrixxm d7b514c2c0 add check for expiration time in item_store() 2014-05-12 15:33:20 +02:00
fabrixxm 1a5da0ae60 Merge pull request #954 from fabrixxm/issue_936 
Show unknown contacts in thread comment mention autocomplete
 2014-05-12 11:56:05 +02:00
Fabrixxm bb4296e686 exclude know contacts from unknown contact list 2014-05-12 05:46:02 -04:00
Tobias Diekershoff bd2dd90d0a Merge pull request #966 from annando/master 
Repeated messages to Diaspora now contain a link to the original content at the bottom of the message.
 2014-05-12 06:58:06 +02:00
Michael Vogel a6742d3db6 Repeated messages to Diaspora now contain a link to the original content at the bottom of the message. 2014-05-11 22:07:37 +02:00
Tobias Diekershoff 01c146414c Merge pull request #965 from annando/master 
Only show connectors when not "hide wall" is enabled
 2014-05-10 06:28:41 +02:00
Michael Vogel acf1c3956c Only show connectors when not "hide wall" is enabled. 2014-05-10 00:24:15 +02:00
Tobias Diekershoff 31312ab1d2 Merge pull request #956 from annando/master 
New database system that uses PDO if present/Test script for doing database upgrades.
 2014-05-09 21:55:01 +02:00
Michael Vogel 5616c58535 Better error handling during install. 2014-05-09 20:44:25 +02:00
Michael Vogel dfa52185ca Reenabled PDO engine. 2014-05-09 20:43:06 +02:00
Michael Vogel 018b1f0086 Added buffer image (needed for plugin) 2014-05-09 20:42:23 +02:00
fabrixxm 7afe5afcf1 Merge pull request #963 from tabacha/master 
Make uimport URL work for Sites with subfolder
 2014-05-06 14:16:54 +02:00
Sven Anders 0dac5bf804 Make uimport URL work for Sites with subfolder 
BUGFIX: If you have a site like http://exmaple.com/friendica you will get a wrong url
 2014-05-06 14:15:15 +02:00
Michael Vogel 407ea6977a Plaintext: Regular expressions were too greedy. 2014-05-06 00:33:56 +02:00
Tobias Diekershoff 4dbfae7883 Merge pull request #962 from tobiasd/fix961 
save selection to suppress language results (fix 961)
 2014-05-05 13:46:03 +02:00
Tobias Diekershoff fd7e17f91e save selection to suppress language results (fix 961) 2014-05-05 13:44:33 +02:00
Michael Vogel 6b38968f80 The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. 2014-05-04 21:11:25 +02:00
Michael Vogel 30f1f40a1e No functional changes, only removed spaces 2014-05-03 23:40:34 +02:00
Michael Vogel 04ba988f75 Plaintext: If a picture link went directly to a picture, this wasn't recognized. Additionally there was a situation when a post could be empty. 2014-05-03 23:34:53 +02:00
Michael Vogel 4b0cc51ae4 The PDO functionality is deactivated until the last differences in functionality are removed. 2014-05-03 12:14:43 +02:00
Michael Vogel c27bd7d0b4 The pagetypes are rearrange to make the differences better understandable. 2014-05-03 12:10:38 +02:00
Michael Vogel 059b88b7a0 The CSS code for shared messages is moved from "vier" to the global.css, so that it is usable for all themes. 2014-05-03 12:08:42 +02:00
Michael Vogel 426e0045ee The function "short_url" is used in several addons, so it deserves a central place. 2014-05-03 12:07:34 +02:00