fermionic
|
ef39edd845
|
Merge pull request #638 from tobiasd/issue_197
put edited meta info in item object to give theme developers the chance ...
|
2013-03-03 07:48:51 -08:00 |
|
Michael Vogel
|
05597b564d
|
Merge remote-tracking branch 'upstream/master'
|
2013-03-03 16:30:18 +01:00 |
|
 Tobias Diekershoff
|
4e68a6b3e0
|
typo
|
2013-03-03 12:02:45 +01:00 |
|
|
Tobias Diekershoff
|
0b925899d4
|
put edited meta info in item object to give theme developers the chance to display this in a fancy way
|
2013-03-03 11:47:01 +01:00 |
|
friendica
|
583e82aeb5
|
Merge https://github.com/friendica/friendica into pull
|
2013-03-02 15:47:23 -08:00 |
|
|
friendica
|
f07df4f667
|
merge
|
2013-03-02 15:46:54 -08:00 |
|
|
friendica
|
59c03edbc9
|
fix util/config
|
2013-03-02 15:44:00 -08:00 |
|
|
Michael Vogel
|
2866f62c88
|
Suppoorting Open Graph and Dublin Core when displaying single item
Following link shorteners in parse_url
|
2013-03-02 14:46:06 +01:00 |
|
Thomas Willingham
|
7e7e88d4ad
|
Add sample lighttpd config, from the mailing list.
|
2013-03-01 19:55:33 +00:00 |
|
fabrixxm
|
40f61f7841
|
Merge pull request #637 from fabrixxm/lang/it
update IT strings
|
2013-03-01 08:29:02 -08:00 |
|
|
Fabrixxm
|
1524c15ba5
|
update IT strings
|
2013-03-01 11:27:43 -05:00 |
|
|
Tobias Diekershoff
|
c54b61cf81
|
DE: update to the strings
|
2013-03-01 16:24:58 +01:00 |
|
|
Fabrixxm
|
4791e5b245
|
install: add check for php-cli
Check won't pass if $php -v won't return "(cli)"
|
2013-03-01 04:43:04 -05:00 |
|
|
fermionic
|
78cc56309b
|
Merge pull request #633 from tobiasd/admin-info-themes
Admin info themes
|
2013-02-28 17:00:56 -08:00 |
|
|
fabrixxm
|
570f67187d
|
Merge pull request #635 from fabrixxm/addonlangs
fix bug in run_xgettext, update messages.po
|
2013-02-28 07:16:18 -08:00 |
|
|
Fabrixxm
|
3d3aebeda1
|
fix bug in run_xgettext, update messages.po
|
2013-02-28 10:14:40 -05:00 |
|
|
Tobias Diekershoff
|
a84e9196fb
|
ZH-CN: update to the strings
|
2013-02-28 08:59:06 +01:00 |
|
|
Tobias Diekershoff
|
56b8118485
|
PL: update to the strings
|
2013-02-28 08:55:38 +01:00 |
|
|
Tobias Diekershoff
|
cd478ecdca
|
exp account info in decaf-mobile
|
2013-02-28 08:10:05 +01:00 |
|
|
Tobias Diekershoff
|
42a054c667
|
exp account info in frost-mobile
|
2013-02-28 08:07:41 +01:00 |
|
|
Tobias Diekershoff
|
209ebd4e74
|
exp account info in frost
|
2013-02-28 08:03:34 +01:00 |
|
|
Tobias Diekershoff
|
36959cfc4b
|
exp accounts info in diabook
|
2013-02-28 08:01:37 +01:00 |
|
|
friendica
|
079c638403
|
Merge pull request #631 from fabrixxm/addonlangs
Per addon translation
|
2013-02-27 16:53:08 -08:00 |
|
|
friendica
|
90a596339d
|
Merge pull request #632 from beardy-unixer/master
Add support for members-only apps menu
|
2013-02-27 16:51:56 -08:00 |
|
|
Thomas Willingham
|
f5d15a7ff8
|
Add support for members-only addons
|
2013-02-28 00:29:06 +00:00 |
|
|
Fabrixxm
|
d302bd070c
|
add check for false returned by query in load_translation_table
|
2013-02-27 10:16:05 -05:00 |
|
|
Fabrixxm
|
7b01e735ae
|
move load_traslation_table after db setup
|
2013-02-27 10:15:09 -05:00 |
|
|
Fabrixxm
|
5214eb2bda
|
update util/messages.po
|
2013-02-27 09:44:05 -05:00 |
|
|
Fabrixxm
|
a1746a9fd2
|
run_xgettext: check for dir before run xgettext
|
2013-02-27 09:42:20 -05:00 |
|
|
Fabrixxm
|
057110e08b
|
update strings, add plural select function definition check
|
2013-02-27 09:36:25 -05:00 |
|
pixelroot
|
e1c24377ee
|
new file: view/theme/smoothly/images/larrow.gif
new file: view/theme/smoothly/images/rarrow.gif
|
2013-02-27 14:27:41 +01:00 |
|
|
pixelroot
|
43e88508c9
|
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/smarty3/login.tpl
modified: view/theme/smoothly/smarty3/wall_thread.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_thread.tpl
|
2013-02-27 14:27:06 +01:00 |
|
|
Fabrixxm
|
9d99a531b9
|
update translation utils:
po2php: add "if function_exists" around plural select function
run_xgettext: add option to extract strings from addon folder
|
2013-02-27 08:25:03 -05:00 |
|
|
Fabrixxm
|
cd8346694b
|
load_translation_table: load translation strings from enabled plugins
|
2013-02-27 08:23:00 -05:00 |
|
|
friendica
|
3ea5d6591d
|
Merge pull request #630 from mexon/bbcode-regex-fix
For very large posts (~18k) with lots of markup, these regexes were caus...
|
2013-02-27 01:55:59 -08:00 |
|
Matthew Exon
|
63be0062b6
|
For very large posts (~18k) with lots of markup, these regexes were causing enough backtracking for php to run out of memory, silently generating an empty entry. This tightens up the regexes so they do less backtracking.
|
2013-02-27 17:04:07 +08:00 |
|
|
friendica
|
0433263866
|
Merge https://github.com/friendica/friendica into pull
|
2013-02-26 17:33:47 -08:00 |
|
|
friendica
|
5205a374ee
|
block injection vector
|
2013-02-26 17:33:18 -08:00 |
|
|
fabrixxm
|
52614bd72b
|
Merge pull request #629 from tobiasd/admin-info
Admin info
|
2013-02-25 05:04:58 -08:00 |
|
|
Tobias Diekershoff
|
f97c81c178
|
kill some newlines
|
2013-02-25 13:05:30 +01:00 |
|
|
Tobias Diekershoff
|
7186331a89
|
Admin panel: show if an account has expired
|
2013-02-25 13:02:17 +01:00 |
|
|
Tobias Diekershoff
|
6100ae98a2
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-24 18:19:55 +01:00 |
|
|
fermionic
|
cf677a3003
|
Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports
run limit_body_size on imported emails, which don't go through consume_feed
|
2013-02-24 07:13:21 -08:00 |
|
|
Michael Vogel
|
c35feb27f2
|
community: Only show top postings, no comments
parse_url: Follow location in "meta"-header
|
2013-02-24 12:54:53 +01:00 |
|
|
Tobias Diekershoff
|
ab81be3bb1
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-24 12:31:25 +01:00 |
|
|
Tobias Diekershoff
|
521ccc38c6
|
Merge pull request #625 from tobiasd/master
make sure conv_as->items is an array or don't proceed
|
2013-02-23 23:27:21 -08:00 |
|
|
Tobias Diekershoff
|
69776fc54e
|
Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates
some smarty templates needed updating
|
2013-02-23 23:26:48 -08:00 |
|
|
Tobias Diekershoff
|
c83b82ee2b
|
Merge pull request #626 from fermionic/20130223-disable-content-in-notifications
admin option to disable content in email notifications
|
2013-02-23 23:25:49 -08:00 |
|
|
Tobias Diekershoff
|
c0d1caa47d
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2013-02-23 19:57:31 +01:00 |
|
|
Tobias Diekershoff
|
023752ae46
|
DE: update to the strings
|
2013-02-23 19:56:21 +01:00 |
|