1
0
Fork 0
Commit graph

7856 commits

Author SHA1 Message Date
pixelroot
a2102e1ca0 Merge remote branch 'upstream/master' 2013-05-08 11:09:39 +02:00
pixelroot
e90c89f3fc new file: view/theme/smoothly/images/power.png
new file:   view/theme/smoothly/images/up.png
2013-05-08 11:09:08 +02:00
pixelroot
523548ff22 modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
2013-05-08 11:08:21 +02:00
fabrixxm
2da4f8268e fix smarty3 folder not writable message 2013-05-08 11:34:30 +03:00
fabrixxm
1e3455d71a Merge pull request #675 from fabrixxm/templateengine
check if view/smarty3 folder is writable by webserver
2013-05-08 00:29:02 -07:00
Fabrixxm
4bf41b8e5d check if view/smarty3 folder is writable by webserver 2013-05-08 03:26:20 -04:00
pixelroot
258604f036 modified: view/theme/smoothly/css/typography.css 2013-05-07 14:30:04 +02:00
pixelroot
8c8d3913cc modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-05-07 14:01:54 +02:00
pixelroot
5ac6e82e7d modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-05-07 09:39:14 +02:00
friendica
04681618da spelling 2013-05-02 22:21:06 -07:00
friendica
886c3d1472 bad checkin 2013-05-02 22:19:16 -07:00
friendica
ed5768c4a3 optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured 2013-05-02 21:59:20 -07:00
friendica
2a3288b01e Merge https://github.com/friendica/friendica into pull 2013-05-02 21:42:54 -07:00
friendica
185d29c41e undefined element 2013-05-02 21:42:34 -07:00
friendica
cc8a4fbf16 Merge pull request #672 from cpfeiffer/email-notification-sitename-fix
fix reading sitename config
2013-04-29 22:41:32 -07:00
friendica
dc0376402d Merge pull request #673 from cpfeiffer/pgettext_missing_dba
pgettext needs dba.php for q()
2013-04-29 22:41:07 -07:00
Carsten Pfeiffer
5ee19401c4 pgettext needs dba.php for q() 2013-04-29 22:51:08 +02:00
b66d4b8cbd Merge pull request #670 from fabrixxm/help
doc update
2013-04-29 00:36:26 -07:00
friendica
c08e791e43 Merge https://github.com/friendica/friendica into pull 2013-04-28 21:03:21 -07:00
friendica
1d358fe6de system support for complete blocking 2013-04-28 21:02:53 -07:00
0bbd0939e4 ZH-CN: update to the strings 2013-04-28 15:35:34 +02:00
friendica
2883c8bbc4 Merge https://github.com/friendica/friendica into pull 2013-04-28 04:31:11 -07:00
friendica
61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
friendica
dd52acebba Merge pull request #671 from cpfeiffer/OAuthException
Wrap class OAuthException with !class_exists
2013-04-27 14:32:57 -07:00
Carsten Pfeiffer
7f6a7af2b3 fix reading sitename config 2013-04-27 21:40:40 +02:00
Carsten Pfeiffer
7e5ec9fceb Wrap class OAuthException with !class_exists
Same problem and solution as discussed on
https://drupal.org/node/1334528
2013-04-27 21:08:45 +02:00
f84c57e7f2 DE: update to the strings 2013-04-27 10:57:06 +02:00
friendica
1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00
pixelroot
f41c5dd1e5 modified: view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/templates/nav.tpl
	modified:   view/theme/smoothly/theme.php
2013-04-24 14:09:24 +02:00
Fabrixxm
92c7ec6c8b doc update
add BBCode reference
update 'Creating posts', change screenshot (use duepuntozero theme)
update 'Install', add point on create view/smarty3 folder
update 'Plugins', add section on templates
2013-04-24 07:59:06 -04:00
friendica
36f2930e52 http status for disallowed feeds 2013-04-23 20:12:49 -07:00
friendica
115c8a53bf issue546 via Tobias 2013-04-23 18:58:52 -07:00
friendica
f090564f0f Merge https://github.com/friendica/friendica into pull 2013-04-23 18:51:50 -07:00
friendica
f4b3cf980d rev update 2013-04-23 18:51:35 -07:00
friendica
eef66da145 Merge pull request #669 from fabrixxm/templateengine
Use smarty3 as default template engine
2013-04-23 04:56:39 -07:00
Fabrixxm
4dc72742ae remove unneeded files 2013-04-23 07:52:36 -04:00
Fabrixxm
379c761c3f missing "templates" folders 2013-04-23 07:47:57 -04:00
Fabrixxm
d36292c532 template: set smarty3 as default template engine in theme info array.
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
2013-04-23 03:35:31 -04:00
Fabrixxm
6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir 2013-04-23 03:35:31 -04:00
Fabrixxm
ddf1caf0fd template engine rework
- use smarty3 as default engine
- new pluggable template engine system
2013-04-23 03:27:52 -04:00
friendica
a34b1ceb3a Merge https://github.com/friendica/friendica into pull 2013-04-21 16:07:26 -07:00
friendica
bc68892cf9 rev update 2013-04-21 16:07:02 -07:00
fabrixxm
ce23f9cd7b Merge pull request #667 from fabrixxm/bug557
drop items to group pages if no mentions in it. should fix bug 557
2013-04-20 00:45:44 -07:00
Fabrixxm
dd02b7bd00 drop items to group pages if no mentions in it. should fix bug 557 2013-04-19 09:55:07 -04:00
friendica
65e0cbd730 Merge https://github.com/friendica/friendica into pull 2013-04-19 04:52:20 -07:00
friendica
a13e7b8a38 rev update 2013-04-19 04:51:43 -07:00
fermionic
d861225d40 Merge pull request #666 from fermionic/20130418-frost-mobile-password-check
update mobile theme settings pages
2013-04-18 18:48:38 -07:00
Zach Prezkuta
78e747016f update mobile theme settings pages 2013-04-18 19:47:27 -06:00
fermionic
44f4b9a29f Merge pull request #665 from tobiasd/foreach_arg
invalid arguments for a foreach loop found
2013-04-18 18:37:39 -07:00
fermionic
7b342d7297 Merge pull request #664 from tobiasd/issue_554
Issue 554
2013-04-18 18:37:11 -07:00