Commit Graph

  • d62483f526 Merge pull request #580 from fermionic/20130111-better-conversion-scripts fermionic 2013-01-11 16:30:25 -08:00
  • c43ff35fe7 newline at end of header Zach Prezkuta 2013-01-11 10:00:10 -07:00
  • 1656c63a55 add warning message about automatically generated templates Zach Prezkuta 2013-01-11 09:57:11 -07:00
  • f24d460522 automatic, command-line conversion Zach Prezkuta 2013-01-11 09:41:45 -07:00
  • b9c0341c0c Merge pull request #579 from 23n/patch-4 tobiasd 2013-01-11 06:57:46 -08:00
  • a543a1a0c2 typo correction Oliver 2013-01-11 14:15:17 +01:00
  • 637cfdd7cb modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-01-11 10:56:14 +01:00
  • c26cf428a6 The search now searches in the new tag table Michael Vogel 2013-01-11 08:51:58 +01:00
  • f620495c7a App::get_template_engine() redeclared friendica 2013-01-10 22:34:25 -08:00
  • 6881edf1f7 Merge https://github.com/friendica/friendica into pull friendica 2013-01-10 22:27:53 -08:00
  • dfee9faca5 rev update friendica 2013-01-10 22:27:41 -08:00
  • c21573e237 Merge pull request #578 from fermionic/20130110-update-smarty-conversion-script friendica 2013-01-10 22:22:49 -08:00
  • 1cfc660e6d update a few more Smarty templates Zach Prezkuta 2013-01-10 22:36:44 -07:00
  • cd017282e4 use Python 2.4 compatible script; update Smarty templates Zach Prezkuta 2013-01-10 22:34:23 -07:00
  • fb69fe500b Merge pull request #577 from fermionic/20130110-restore-intl-smarty friendica 2013-01-10 21:05:00 -08:00
  • 5f1ef732e0 remove now-unnecessary line in text.php Zach Prezkuta 2013-01-10 21:48:33 -07:00
  • bce29054b9 allow Smarty use on international templates Zach Prezkuta 2013-01-10 21:46:48 -07:00
  • 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. Michael Vogel 2013-01-11 01:20:16 +01:00
  • eb6c46a303 Merge https://github.com/friendica/friendica into pull friendica 2013-01-10 01:09:02 -08:00
  • 51eb0cd59d rev update friendica 2013-01-10 01:08:36 -08:00
  • df9f3b3db3 ZH-CN: update to the strings Tobias Diekershoff 2013-01-10 06:49:35 +01:00
  • 5ad382d797 DE: update to the strings Tobias Diekershoff 2013-01-10 06:48:54 +01:00
  • 82820d8e95 Now the third most likely languages are shown. In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant. Michael Vogel 2013-01-09 20:54:18 +01:00
  • f6a63abd7d update smarty diabook templates bug 525 friendica 2013-01-08 14:45:19 -08:00
  • de0315396c missing session template_engine calls friendica 2013-01-08 12:24:13 -08:00
  • 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) friendica 2013-01-07 20:14:00 -08:00
  • 972060a8ff Merge pull request #575 from beardy-unixer/master friendica 2013-01-05 19:32:11 -08:00
  • 0cf3d70875 If we find a home.html, also look for a home.css Thomas Willingham 2013-01-05 14:31:10 +00:00
  • e09c31b627 CS: update to the strings Tobias Diekershoff 2013-01-05 09:29:26 +01:00
  • 07ba4da634 email header encoding everywhere friendica 2013-01-04 15:47:29 -08:00
  • a5755b59a8 preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 friendica 2013-01-04 15:21:05 -08:00
  • 8209ae6455 Merge https://github.com/friendica/friendica into pull friendica 2013-01-04 15:14:33 -08:00
  • 9fbaa0d383 rev update friendica 2013-01-04 15:14:00 -08:00
  • 88cc414355 Merge pull request #570 from annando/master friendica 2013-01-04 15:13:09 -08:00
  • c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init friendica 2013-01-04 14:36:47 -08:00
  • 602ca63111 PL: update to the strings Tobias Diekershoff 2013-01-04 09:18:21 +01:00
  • a8ea3d6e48 We haven't Got Zot Thomas Willingham 2013-01-03 20:18:43 +00:00
  • 3e59b0715b better location for toggle_mobile code Zach Prezkuta 2013-01-03 11:16:10 -07:00
  • 0ba1bdbb08 profile_uid bug in boot.php Zach Prezkuta 2013-01-03 10:53:11 -07:00
  • fdd142c42e never use profile_load outside of a module's _init() function Zach Prezkuta 2013-01-03 10:47:45 -07:00
  • 0d5b8dfafd Merge https://github.com/friendica/friendica into pull friendica 2013-01-03 03:50:17 -08:00
  • e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original friendica 2013-01-03 03:47:08 -08:00
  • 1c81409bf8 Merge pull request #573 from oohlaf/fixes Olaf Conradi 2013-01-02 05:32:19 -08:00
  • 2943550fe2 No need to remove data-src attributes Olaf Conradi 2013-01-02 14:28:13 +01:00
  • 68d304cc0f Merge branch 'master' of git://github.com/friendica/friendica Tobias Diekershoff 2013-01-02 11:10:59 +01:00
  • e56c041579 DE: update to the strings Tobias Diekershoff 2013-01-02 11:10:24 +01:00
  • 9bb9350126 Merge https://github.com/friendica/friendica into pull friendica 2013-01-01 17:33:33 -08:00
  • 66b1448cdb rev update friendica 2013-01-01 17:32:46 -08:00
  • 3c49a1b769 Merge pull request #572 from cvogeley/master fermionic 2013-01-01 15:12:45 -08:00
  • d9961bc3b4 revert one change Christian Vogeley 2013-01-01 23:47:56 +01:00
  • 457a3b5220 Change templates remove var modifiers Christian Vogeley 2013-01-01 23:41:26 +01:00
  • 4ab7820663 . Christian Vogeley 2013-01-01 22:44:02 +01:00
  • 5bfd4cf5c4 Move HTML part of oid to template + replace outside the tpl Christian Vogeley 2013-01-01 22:40:05 +01:00
  • 0472ab7282 DE: update to the strings Tobias Diekershoff 2013-01-01 22:25:55 +01:00
  • 2a3f8f8ee2 . Christian Vogeley 2013-01-01 21:08:30 +01:00
  • cde9b6370d Fix registration form Christian Vogeley 2013-01-01 21:05:24 +01:00
  • 966d786982 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2013-01-01 16:42:52 +01:00
  • 405f37b7ae Merge https://github.com/friendica/friendica into pull friendica 2012-12-31 14:54:31 -08:00
  • 017042d5d4 rev update friendica 2012-12-31 14:54:04 -08:00
  • c7d820dee5 Merge pull request #571 from fermionic/20121230-diabook-template-dashes fermionic 2012-12-30 19:46:46 -08:00
  • 1d1c8f4771 replace dashes with underscores in diabook Zach Prezkuta 2012-12-30 20:46:03 -07:00
  • 6a2bd8b29f Don't replace data-src with src in acl-template Olaf Conradi 2012-12-31 00:01:15 +01:00
  • 348f43157a Vier: Some templates were missing Michael Vogel 2012-12-30 22:58:05 +01:00
  • e50c0efcdf Merge remote-tracking branch 'upstream/master' Michael Vogel 2012-12-30 21:32:18 +01:00
  • ad287914c7 Support of "share" through the API. Michael Vogel 2012-12-30 21:30:39 +01:00
  • e05725fb44 Merge pull request #569 from oohlaf/fixes Olaf Conradi 2012-12-30 08:17:36 -08:00
  • 215a7f139c make smarty error reporting a bit less chatty friendica 2012-12-30 00:29:07 -08:00
  • c5845be74e Merge branch 'master' into fixes Olaf Conradi 2012-12-30 01:30:00 +01:00
  • dbf8f711cf Fix browser prefetch in notifications menu Olaf Conradi 2012-12-30 00:28:48 +01:00
  • 94c8d7693f Keep html in template, use data attribute for img Olaf Conradi 2012-12-29 23:44:26 +01:00
  • 4b2de6fdf2 if snautofollow - make all SN contacts writable friendica 2012-12-29 02:51:15 -08:00
  • f962ecdd64 Merge https://github.com/friendica/friendica into pull friendica 2012-12-29 02:36:19 -08:00
  • 05996457f9 receiving post from archived Diaspora contacts friendica 2012-12-29 02:35:41 -08:00
  • 14611753cc Merge pull request #568 from fermionic/20121228-set-explicit-include-paths fermionic 2012-12-28 15:18:22 -08:00
  • 708e7e51db missed an explicit include Zach Prezkuta 2012-12-28 16:17:33 -07:00
  • a41692120e Also change acl stuff in the other themes Olaf Conradi 2012-12-28 23:51:40 +01:00
  • 239110a2bc Change acl selection box templating Olaf Conradi 2012-12-28 23:28:53 +01:00
  • 307cada234 Merge pull request #567 from fermionic/20121228-set-explicit-include-paths fermionic 2012-12-28 13:55:10 -08:00
  • e684324032 use explicit include paths Zach Prezkuta 2012-12-28 14:51:50 -07:00
  • 6f6b1f95c8 vier: With IE there are no borders around images anymore bbcode: Multiple new lines are now reduced Michael Vogel 2012-12-28 11:31:30 +01:00
  • f03ac60725 Merge https://github.com/friendica/friendica into pull friendica 2012-12-27 13:36:49 -08:00
  • 255771f295 rev update friendica 2012-12-27 13:36:23 -08:00
  • 1139adc2dc Merge pull request #566 from fermionic/20121227-update-frost fermionic 2012-12-27 11:24:27 -08:00
  • 8066f2109e update smarty templates Zach Prezkuta 2012-12-27 12:23:37 -07:00
  • 659ae4ed04 incremental improvements Zach Prezkuta 2012-12-27 12:20:47 -07:00
  • 98c86d46d4 Merge pull request #565 from fermionic/20121227-eliminate-template-dashes fermionic 2012-12-27 08:40:09 -08:00
  • b6981768ee remove more dashes in templates Zach Prezkuta 2012-12-27 09:38:42 -07:00
  • d3d5557393 Merge pull request #564 from fabrixxm/master fabrixxm 2012-12-27 07:26:20 -08:00
  • b620b6e608 api: add 'allow_api' to user authenticated via oauth Fabrixxm 2012-12-27 10:20:51 -05:00
  • 763504f0d5 Vier: Now the language of a post is shown Michael Vogel 2012-12-27 01:05:59 +01:00
  • e189e6582a fix profile_vcard all themes friendica 2012-12-26 13:38:08 -08:00
  • 792b4f63e7 remove dashes from variable names in profile_vcard.tpl friendica 2012-12-26 13:20:18 -08:00
  • f519b90737 Merge https://github.com/friendica/friendica into pull friendica 2012-12-26 13:09:20 -08:00
  • 2684981941 rev update friendica 2012-12-26 13:09:00 -08:00
  • e935fa78c6 Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3 friendica 2012-12-26 13:08:25 -08:00
  • d3c54438df Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas fermionic 2012-12-26 09:44:27 -08:00
  • 263fe0f6bc revert unnecessary variable name changes Zach Prezkuta 2012-12-26 10:42:01 -07:00
  • b31bc6c3a6 Merge pull request #562 from fermionic/20121225-smarty-includes-like-friendicas fermionic 2012-12-25 11:29:46 -08:00
  • 189c8ccf6f some missed templates Zach Prezkuta 2012-12-25 12:28:24 -07:00
  • 7e9730089f Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas fermionic 2012-12-25 11:08:06 -08:00