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
405f37b7ae
Merge https://github.com/friendica/friendica into pull
2012-12-31 14:54:31 -08:00
friendica
017042d5d4
rev update
2012-12-31 14:54:04 -08:00
fermionic
c7d820dee5
Merge pull request #571 from fermionic/20121230-diabook-template-dashes
...
replace dashes with underscores in diabook
2012-12-30 19:46:46 -08:00
Zach Prezkuta
1d1c8f4771
replace dashes with underscores in diabook
2012-12-30 20:46:03 -07:00
Olaf Conradi
e05725fb44
Merge pull request #569 from oohlaf/fixes
...
Fix browser prefetch of template strings in images
2012-12-30 08:17:36 -08:00
friendica
215a7f139c
make smarty error reporting a bit less chatty
2012-12-30 00:29:07 -08:00
Olaf Conradi
c5845be74e
Merge branch 'master' into fixes
2012-12-30 01:30:00 +01:00
Olaf Conradi
dbf8f711cf
Fix browser prefetch in notifications menu
...
Fix browser prefetch by substituting data-src with src for images
2012-12-30 00:28:48 +01:00
Olaf Conradi
94c8d7693f
Keep html in template, use data attribute for img
...
Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them.
2012-12-29 23:44:26 +01:00
friendica
4b2de6fdf2
if snautofollow - make all SN contacts writable
2012-12-29 02:51:15 -08:00
friendica
f962ecdd64
Merge https://github.com/friendica/friendica into pull
2012-12-29 02:36:19 -08:00
friendica
05996457f9
receiving post from archived Diaspora contacts
2012-12-29 02:35:41 -08:00
fermionic
14611753cc
Merge pull request #568 from fermionic/20121228-set-explicit-include-paths
...
missed an explicit include
2012-12-28 15:18:22 -08:00
Zach Prezkuta
708e7e51db
missed an explicit include
2012-12-28 16:17:33 -07:00
Olaf Conradi
a41692120e
Also change acl stuff in the other themes
2012-12-28 23:51:40 +01:00
Olaf Conradi
239110a2bc
Change acl selection box templating
...
Keep dynamic templating in javascript so browsers don't
prefetch non-existing files.
2012-12-28 23:28:53 +01:00
fermionic
307cada234
Merge pull request #567 from fermionic/20121228-set-explicit-include-paths
...
use explicit include paths
2012-12-28 13:55:10 -08:00
Zach Prezkuta
e684324032
use explicit include paths
2012-12-28 14:51:50 -07:00
friendica
f03ac60725
Merge https://github.com/friendica/friendica into pull
2012-12-27 13:36:49 -08:00
friendica
255771f295
rev update
2012-12-27 13:36:23 -08:00
fermionic
1139adc2dc
Merge pull request #566 from fermionic/20121227-update-frost
...
20121227 update frost
2012-12-27 11:24:27 -08:00
Zach Prezkuta
8066f2109e
update smarty templates
2012-12-27 12:23:37 -07:00
Zach Prezkuta
659ae4ed04
incremental improvements
2012-12-27 12:20:47 -07:00
fermionic
98c86d46d4
Merge pull request #565 from fermionic/20121227-eliminate-template-dashes
...
remove more dashes in templates
2012-12-27 08:40:09 -08:00
Zach Prezkuta
b6981768ee
remove more dashes in templates
2012-12-27 09:38:42 -07:00
fabrixxm
d3d5557393
Merge pull request #564 from fabrixxm/master
...
fix small bug to oauth authentication
2012-12-27 07:26:20 -08:00
Fabrixxm
b620b6e608
api: add 'allow_api' to user authenticated via oauth
2012-12-27 10:20:51 -05:00
friendica
e189e6582a
fix profile_vcard all themes
2012-12-26 13:38:08 -08:00
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
