Commit graph

7361 commits

Author SHA1 Message Date
friendica
792b4f63e7 remove dashes from variable names in profile_vcard.tpl 2012-12-26 13:20:18 -08:00
friendica
f519b90737 Merge https://github.com/friendica/friendica into pull 2012-12-26 13:09:20 -08:00
friendica
2684981941 rev update 2012-12-26 13:09:00 -08:00
friendica
e935fa78c6 Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3
add write access to view/smarty3/ as a requirement for the installer
2012-12-26 13:08:25 -08:00
fermionic
d3c54438df Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas
revert unnecessary variable name changes
2012-12-26 09:44:27 -08:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
fermionic
b31bc6c3a6 Merge pull request #562 from fermionic/20121225-smarty-includes-like-friendicas
some missed templates
2012-12-25 11:29:46 -08:00
Zach Prezkuta
189c8ccf6f some missed templates 2012-12-25 12:28:24 -07:00
fermionic
7e9730089f Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas
20121225 smarty includes like friendicas
2012-12-25 11:08:06 -08:00
fermionic
b4738906ac Merge pull request #559 from fermionic/20121224-better-cookie-handling
delete cookie on browser close after logout
2012-12-25 11:07:51 -08:00
Zach Prezkuta
e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Zach Prezkuta
f0f8d0f687 delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
fermionic
6603758a5e Merge pull request #558 from fermionic/20121222-use-smarty-template-engine
fix a few more templates for correct conversion to Smarty3 templates
2012-12-24 07:47:06 -08:00
Zach Prezkuta
ce445a385f fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
Zach Prezkuta
f74a443c1b add write access to view/smarty3/ as a requirement for the installer 2012-12-24 07:59:46 -07:00
fermionic
e5dac2d387 Merge pull request #556 from fermionic/20121224-smarty3-template-collision
change field_*.tpl to * in some missed templates
2012-12-24 06:06:56 -08:00
Zach Prezkuta
f0bc8aa1dc change field_*.tpl to * in some missed templates 2012-12-24 07:05:42 -07:00
friendica
685a677bc9 Merge pull request #555 from annando/master
Vier: Changed buttons
2012-12-24 03:22:43 -08:00
Michael Vogel
e0df845fa3 Vier: Changed the buttons to a flat style that suites more the style of "vier" 2012-12-24 11:07:51 +01:00
Tobias Diekershoff
4cae1fea81 DE: update to the strings 2012-12-24 09:34:47 +01:00
fermionic
80ea740cca Merge pull request #554 from fermionic/20121222-use-smarty-template-engine
couple more places where file_get_contents was used
2012-12-23 18:30:45 -08:00
Zach Prezkuta
fdd9ed7e51 couple more places where file_get_contents was used 2012-12-23 19:29:19 -07:00
fermionic
1392c58377 Merge pull request #552 from annando/master
Vier: Forgotten CSS file and some more design changes
2012-12-23 17:16:20 -08:00
fermionic
c5b536f9ac Merge pull request #553 from unary/filer-dialog-fix
fix filer dialog
2012-12-23 17:15:40 -08:00
Michael Johnston
cd5b9c10c4 fix filer dialog 2012-12-23 18:34:55 -05:00
Michael Vogel
6649cb8e1a Vier: New CSS file adde that acts like a translator between font awesome and the friendica classes 2012-12-23 23:54:28 +01:00
fermionic
974f60d132 Merge pull request #551 from fermionic/20121222-use-smarty-template-engine
20121222 use smarty template engine
2012-12-23 05:31:11 -08:00
Zach Prezkuta
232deadfd2 missed a couple more template engine assignments 2012-12-23 06:29:58 -07:00
Zach Prezkuta
b9f4687260 one more place where the template engine is changed 2012-12-23 06:25:50 -07:00
fermionic
a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine
only use Smarty if the view/smarty3/ directory is writable
2012-12-23 05:19:02 -08:00
Zach Prezkuta
53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
friendica
e98dc70008 sn subscription fix 2012-12-23 02:47:14 -08:00
Michael Vogel
3a32372ffa vier: Problems with firefox on small displays fixed 2012-12-23 10:58:04 +01:00
Michael Vogel
ed4eaed7e0 Vier: Content is now aligned left - like before. 2012-12-23 10:47:12 +01:00
Michael Vogel
2e83034fc3 Vier: Background color of popup menus changed 2012-12-23 10:31:46 +01:00
friendica
a29842e301 Merge https://github.com/annando/friendica into annando
Conflicts:
	view/admin_site.tpl
2012-12-22 23:02:21 -08:00
friendica
453082516e Merge https://github.com/friendica/friendica into pull 2012-12-22 22:59:37 -08:00
friendica
6b36927d32 rev update 2012-12-22 22:59:12 -08:00
friendica
1d6dd1666f Merge pull request #549 from fermionic/20121222-use-smarty-template-engine
Implement Smarty3
2012-12-22 22:57:47 -08:00
Michael Vogel
4b240c9109 vier: Changed color of sidebar links, made the content centered. 2012-12-23 03:26:29 +01:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel
b0759e9a9f Some more system settings are now reachable via front-end
Bugfixing in the mail import when a reply header isn't set correctly
2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel
34128925dc "vier": Now the search results containing a link to the original thread 2012-12-21 15:03:22 +01:00
Michael Vogel
61b51d40e7 Vier: disabling the "community" works now 2012-12-21 13:13:22 +01:00
Tobias Diekershoff
5cedd3430f CS: update to the strings 2012-12-21 13:10:03 +01:00
Tobias Diekershoff
e441f3286c DE: update to the strings 2012-12-21 13:09:33 +01:00
Michael Vogel
d7073f7884 Vier: All optical glitches should be removed now. 2012-12-21 13:02:39 +01:00
Michael Vogel
293a794973 "vier": More icons replaced 2012-12-21 03:53:07 +01:00