Commit graph

7573 commits

Author SHA1 Message Date
Olaf Conradi 492a42eebe Add ttf and svg to skip the front controller
This makes themes that rely on the correct mimetype work.
2013-01-15 10:28:24 +01:00
fermionic b42427d576 Merge pull request #586 from fermionic/20130114-maintenance-mode
check plugins in separate function
2013-01-14 19:35:46 -08:00
Zach Prezkuta c32f754b6e remove commented-out check_config() 2013-01-14 20:34:28 -07:00
Zach Prezkuta 6d77237f06 check plugins in separate function 2013-01-14 20:31:32 -07:00
fermionic b920ce732c Merge pull request #585 from fermionic/20130114-maintenance-mode
add maintenance mode
2013-01-14 18:18:34 -08:00
Zach Prezkuta 2a8e5032e0 run check_config() in a separate process 2013-01-14 16:58:32 -07:00
friendica 917acd6eb7 Merge https://github.com/friendica/friendica into pull 2013-01-14 15:51:31 -08:00
friendica 66a6970bb8 config cli will also work with Friendica without change - so bringing it over 2013-01-14 15:50:39 -08:00
Zach Prezkuta 28c9123ac8 module to show system down message 2013-01-14 16:48:01 -07:00
Zach Prezkuta 31c3bbf549 add maintenance mode 2013-01-14 16:35:41 -07:00
fermionic aea7b84e92 Merge pull request #584 from fermionic/20130113-multiple-delete-comments
comments inherit pagedropping state of the top-level
2013-01-13 11:44:20 -08:00
Zach Prezkuta 98d83f5d0b comments inherit pagedropping state of the top-level 2013-01-13 10:51:19 -07:00
Tobias Diekershoff e8952541af ZH-CN: update to the strings 2013-01-13 12:55:13 +01:00
friendica 449b44fe4c Merge https://github.com/friendica/friendica into pull 2013-01-12 15:09:35 -08:00
friendica b5c0714bc4 fix live update on display page 2013-01-12 15:08:59 -08:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
fixes and tweaks to Smarty processing
2013-01-12 12:28:14 -08:00
friendica ceaedb41e4 Merge pull request #582 from fermionic/20130112-various-fixes
Various fixes
2013-01-12 12:24:51 -08:00
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
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -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
Tobias Diekershoff 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
Tobias Diekershoff df9f3b3db3 ZH-CN: update to the strings 2013-01-10 06:49:35 +01:00
Tobias Diekershoff 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
Tobias Diekershoff 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