keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Browse source
This commit is contained in:
Domovoy 2012-07-30 13:36:33 +02:00
commit 07f87848b4
8 changed files with 977 additions and 685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1418' );
define ( 'FRIENDICA_VERSION', '3.0.1419' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 );

1
include/conversation.php
View file

@ -1486,6 +1486,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
'$mobileapp' => t('Friendica mobile web'),
));

1
mod/editpost.php
View file

@ -132,6 +132,7 @@ function editpost_content(&$a) {
'$profile_uid' => $_SESSION['uid'],
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$mobileapp' => t('Friendica mobile web'),
));
return $o;

1635
util/messages.po
View file

File diff suppressed because it is too large Load diff

1
view/theme/frost-mobile/jot.tpl
View file

@ -13,6 +13,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="source" value="$mobileapp" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>

2
view/theme/frost-mobile/style.css
View file

@ -360,7 +360,7 @@ section {
}
.tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
.tabs a {
padding: 0.2em 2em;
padding: 0.4em 2em;
border: 1px solid #aaa;
border-radius: 8px;
-moz-border-radius: 8px;

18
view/theme/frost/field_combobox.tpl Normal file
View file

@ -0,0 +1,18 @@
<div class='field combobox'>
<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
{# html5 don't work on Chrome, Safari and IE9
<input id="id_$field.0" type="text" list="data_$field.0" >
<datalist id="data_$field.0" >
{{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
</datalist> #}
<input id="id_$field.0" type="text" value="$field.2">
<select id="select_$field.0" onChange="$j('#id_$field.0').val($j(this).val())">
<option value="">$field.5</option>
{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
</select>
<span class='field_help'>$field.3</span>
</div>

2
view/theme/frost/style.css
View file

@ -2222,7 +2222,7 @@ aside input[type='text'] {
.widget {
border: 1px solid #DDDDDD;
padding: 8px;
padding: 1em 2em;
margin-top: 5px;
-moz-border-radius:5px;
-webkit-border-radius:5px;