friendica
|
8d19dff6dc
|
Merge pull request #583 from fermionic/20130112-diaspora-photo-queue
Diaspora photo queue
|
2013-01-12 12:16:12 -08:00 |
|
Zach Prezkuta
|
7f19018cd4
|
fix leak
|
2013-01-12 06:56:45 -07:00 |
|
Zach Prezkuta
|
1507ec37a4
|
give post a chance to arrive before rejecting photos from Diaspora
|
2013-01-12 06:52:15 -07:00 |
|
fermionic
|
d62483f526
|
Merge pull request #580 from fermionic/20130111-better-conversion-scripts
automatic, command-line conversion
|
2013-01-11 16:30:25 -08:00 |
|
Zach Prezkuta
|
c43ff35fe7
|
newline at end of header
|
2013-01-11 10:00:10 -07:00 |
|
Zach Prezkuta
|
1656c63a55
|
add warning message about automatically generated templates
|
2013-01-11 09:57:11 -07:00 |
|
Zach Prezkuta
|
f24d460522
|
automatic, command-line conversion
|
2013-01-11 09:41:45 -07:00 |
|
|
|
b9c0341c0c
|
Merge pull request #579 from 23n/patch-4
no Hilde is welcome too :-)
merged
|
2013-01-11 06:57:46 -08:00 |
|
Oliver
|
a543a1a0c2
|
typo correction
we don't want to drop Hilde
|
2013-01-11 14:15:17 +01:00 |
|
pixelroot
|
637cfdd7cb
|
modified: view/theme/smoothly/css/typography.css
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2013-01-11 10:56:14 +01:00 |
|
friendica
|
f620495c7a
|
App::get_template_engine() redeclared
|
2013-01-10 22:34:25 -08:00 |
|
friendica
|
6881edf1f7
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-10 22:27:53 -08:00 |
|
friendica
|
dfee9faca5
|
rev update
|
2013-01-10 22:27:41 -08:00 |
|
friendica
|
c21573e237
|
Merge pull request #578 from fermionic/20130110-update-smarty-conversion-script
use Python 2.4 compatible script; update Smarty templates
|
2013-01-10 22:22:49 -08:00 |
|
Zach Prezkuta
|
1cfc660e6d
|
update a few more Smarty templates
|
2013-01-10 22:36:44 -07:00 |
|
Zach Prezkuta
|
cd017282e4
|
use Python 2.4 compatible script; update Smarty templates
|
2013-01-10 22:34:23 -07:00 |
|
friendica
|
fb69fe500b
|
Merge pull request #577 from fermionic/20130110-restore-intl-smarty
Restore intl smarty
|
2013-01-10 21:05:00 -08:00 |
|
Zach Prezkuta
|
5f1ef732e0
|
remove now-unnecessary line in text.php
|
2013-01-10 21:48:33 -07:00 |
|
Zach Prezkuta
|
bce29054b9
|
allow Smarty use on international templates
|
2013-01-10 21:46:48 -07:00 |
|
friendica
|
eb6c46a303
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-10 01:09:02 -08:00 |
|
friendica
|
51eb0cd59d
|
rev update
|
2013-01-10 01:08:36 -08:00 |
|
|
|
df9f3b3db3
|
ZH-CN: update to the strings
|
2013-01-10 06:49:35 +01:00 |
|
|
|
5ad382d797
|
DE: update to the strings
|
2013-01-10 06:48:54 +01:00 |
|
friendica
|
f6a63abd7d
|
update smarty diabook templates bug 525
|
2013-01-08 14:45:19 -08:00 |
|
friendica
|
de0315396c
|
missing session template_engine calls
|
2013-01-08 12:24:13 -08:00 |
|
friendica
|
4ab363ed71
|
bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)
|
2013-01-07 20:14:00 -08:00 |
|
friendica
|
972060a8ff
|
Merge pull request #575 from beardy-unixer/master
If we find a home.html, also look for a home.css
|
2013-01-05 19:32:11 -08:00 |
|
Thomas Willingham
|
0cf3d70875
|
If we find a home.html, also look for a home.css
|
2013-01-05 14:31:10 +00:00 |
|
|
|
e09c31b627
|
CS: update to the strings
|
2013-01-05 09:29:26 +01:00 |
|
friendica
|
07ba4da634
|
email header encoding everywhere
|
2013-01-04 15:47:29 -08:00 |
|
friendica
|
a5755b59a8
|
preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570
|
2013-01-04 15:21:05 -08:00 |
|
friendica
|
8209ae6455
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-04 15:14:33 -08:00 |
|
friendica
|
9fbaa0d383
|
rev update
|
2013-01-04 15:14:00 -08:00 |
|
friendica
|
88cc414355
|
Merge pull request #570 from annando/master
Vier, caches and "share" via API
|
2013-01-04 15:13:09 -08:00 |
|
friendica
|
c0fd572fec
|
Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init
Finalize theme decision in a module's _init function
|
2013-01-04 14:36:47 -08:00 |
|
|
|
602ca63111
|
PL: update to the strings
|
2013-01-04 09:18:21 +01:00 |
|
Thomas Willingham
|
a8ea3d6e48
|
We haven't Got Zot
|
2013-01-03 20:18:43 +00:00 |
|
Zach Prezkuta
|
3e59b0715b
|
better location for toggle_mobile code
|
2013-01-03 11:16:10 -07:00 |
|
Zach Prezkuta
|
0ba1bdbb08
|
profile_uid bug in boot.php
|
2013-01-03 10:53:11 -07:00 |
|
Zach Prezkuta
|
fdd142c42e
|
never use profile_load outside of a module's _init() function
|
2013-01-03 10:47:45 -07:00 |
|
friendica
|
0d5b8dfafd
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-03 03:50:17 -08:00 |
|
friendica
|
e394ccd0a8
|
If we're going to encode the email headers, we probably should use the encoded version rather than the original
|
2013-01-03 03:47:08 -08:00 |
|
Olaf Conradi
|
1c81409bf8
|
Merge pull request #573 from oohlaf/fixes
Don't add src attributes inside acl-template
|
2013-01-02 05:32:19 -08:00 |
|
Olaf Conradi
|
2943550fe2
|
No need to remove data-src attributes
Better comment string also
|
2013-01-02 14:28:13 +01:00 |
|
|
|
68d304cc0f
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2013-01-02 11:10:59 +01:00 |
|
|
|
e56c041579
|
DE: update to the strings
|
2013-01-02 11:10:24 +01:00 |
|
friendica
|
9bb9350126
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-01 17:33:33 -08:00 |
|
friendica
|
66b1448cdb
|
rev update
|
2013-01-01 17:32:46 -08:00 |
|
fermionic
|
3c49a1b769
|
Merge pull request #572 from cvogeley/master
Fix registration form
|
2013-01-01 15:12:45 -08:00 |
|
Christian Vogeley
|
d9961bc3b4
|
revert one change
|
2013-01-01 23:47:56 +01:00 |
|
