Thomas Willingham
|
35a44d8d27
|
Diabook - first part of clean-up to make the theme maintainable.
|
2012-10-23 19:20:49 +01:00 |
|
pixelroot
|
e43097dbc1
|
modified: view/theme/smoothly/css/typography.css
modified: view/theme/smoothly/style.css
|
2012-10-23 15:47:48 +02:00 |
|
pixelroot
|
db5482e609
|
Merge remote branch 'upstream/master'
|
2012-10-23 14:23:48 +02:00 |
|
pixelroot
|
136175047d
|
modified: view/theme/smoothly/profile_vcard.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/vcard-widget.tpl
|
2012-10-23 14:23:28 +02:00 |
|
friendica
|
e757f3cb53
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-23 03:29:50 -07:00 |
|
friendica
|
89d0b6926c
|
rev update
|
2012-10-23 03:29:27 -07:00 |
|
pixelroot
|
5f61290811
|
modified: view/theme/smoothly/css/typography.css
modified: view/theme/smoothly/style.css
|
2012-10-23 10:58:50 +02:00 |
|
pixelroot
|
f8787b6762
|
modified: view/theme/smoothly/default.php
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
new file: view/theme/smoothly/tobottom.png
|
2012-10-23 10:22:39 +02:00 |
|
pixelroot
|
215f084a2e
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2012-10-23 09:24:19 +02:00 |
|
Tobias Diekershoff
|
09a36fc05c
|
IT: update to the strings
|
2012-10-22 17:54:17 +02:00 |
|
Tobias Diekershoff
|
b157a00c34
|
DE: update to the strings
|
2012-10-22 17:48:30 +02:00 |
|
pixelroot
|
e4ab5dd32f
|
new file: view/theme/smoothly/css/typography.css
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2012-10-22 16:53:56 +02:00 |
|
Thomas Willingham
|
05bfd3bbf7
|
DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
|
2012-10-22 01:49:35 +01:00 |
|
Thomas Willingham
|
97b4cb7b5e
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-10-22 01:24:04 +01:00 |
|
Thomas Willingham
|
c03eb332a3
|
Friendicaland
|
2012-10-22 01:23:16 +01:00 |
|
friendica
|
c2af58da01
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-21 14:44:32 -07:00 |
|
friendica
|
02251f23df
|
undefined fn: init_groups_visitor in mod_profile, rev update
|
2012-10-21 14:41:10 -07:00 |
|
Thomas Willingham
|
1b9438120c
|
Diabook - remove redundant TPL to bring back all admin settings
|
2012-10-21 18:44:23 +01:00 |
|
Tobias Diekershoff
|
298aeb5bf5
|
CS: update to the strings
|
2012-10-20 12:57:34 +02:00 |
|
Tobias Diekershoff
|
64a0dc1eed
|
ES: update to the strings
|
2012-10-20 12:57:09 +02:00 |
|
Tobias Diekershoff
|
50cf6c0797
|
FR: update to the strings
|
2012-10-20 12:56:47 +02:00 |
|
Tobias Diekershoff
|
21ffccbe72
|
DE: update to the strings
|
2012-10-20 12:56:25 +02:00 |
|
pixelroot
|
5016a589fb
|
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
|
2012-10-19 11:53:22 +02:00 |
|
friendica
|
2347a4326c
|
get rid of 'Friendika'
|
2012-10-18 21:51:45 -07:00 |
|
friendica
|
abba881a02
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-17 15:22:54 -07:00 |
|
friendica
|
f6f3042d00
|
imagick exception
|
2012-10-17 15:22:29 -07:00 |
|
friendica
|
b39d9d3e71
|
rev update
|
2012-10-17 15:22:09 -07:00 |
|
Thomas Willingham
|
2940f25df9
|
Merge pull request #514 from hmeine/master
Cleanups in diabook theme code
|
2012-10-16 09:05:50 -07:00 |
|
Hans Meine
|
ba503b9927
|
diabook: use proper defaults in popup sidebar config
|
2012-10-16 13:44:27 +02:00 |
|
Hans Meine
|
d0775be2e2
|
diabook boxes: use a common hide/show form entry definition
|
2012-10-16 13:42:18 +02:00 |
|
Hans Meine
|
2d614b6700
|
remove lots of duplicated code in diabook config handling
|
2012-10-16 13:33:53 +02:00 |
|
friendica
|
80513e4332
|
Trying this fix for endless redirection
|
2012-10-15 18:51:22 -07:00 |
|
friendica
|
fd6a21f522
|
oops - missingfile from last checking, the important one
|
2012-10-15 16:33:00 -07:00 |
|
friendica
|
a02e5f692e
|
disabling auto_redir until we prevent it from infinite looping
|
2012-10-15 16:28:43 -07:00 |
|
friendica
|
3af16ff92a
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-14 17:16:41 -07:00 |
|
friendica
|
dec5298248
|
rev update
|
2012-10-14 17:16:25 -07:00 |
|
friendica
|
4bf6604d88
|
Merge pull request #513 from unary/photo-comments
Moved comment box on photos to be after the last comment, added text for...
|
2012-10-14 14:33:10 -07:00 |
|
Michael Johnston
|
939227e820
|
Moved comment box on photos to be after the last comment, added text for the Preview link
|
2012-10-14 14:41:31 -04:00 |
|
Tobias Diekershoff
|
f5a458d139
|
DE/FR/PT-BR: update to the strings
|
2012-10-13 09:38:47 +02:00 |
|
Thomas Willingham
|
a126005877
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-10-12 21:35:32 +01:00 |
|
Thomas Willingham
|
a01dd4d9be
|
German help file images
|
2012-10-12 21:34:17 +01:00 |
|
Thomas Willingham
|
022c1e8995
|
German helpfiles
|
2012-10-12 21:33:21 +01:00 |
|
fermionic
|
ca21f1bbc8
|
Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
for profile and photos, detect contacts from local hub and auto-redir
|
2012-10-11 17:24:11 -07:00 |
|
fermionic
|
2f3d118e77
|
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
allow themes to decide where live updates appear
|
2012-10-10 17:34:28 -07:00 |
|
friendica
|
816db4396a
|
better fix for threads with no parent showing up as unseen
|
2012-10-10 16:17:40 -07:00 |
|
friendica
|
8a1f9d32ab
|
Merge https://github.com/friendica/friendica into pull
|
2012-10-10 15:59:05 -07:00 |
|
friendica
|
675aa56b02
|
rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared
|
2012-10-10 15:57:40 -07:00 |
|
fermionic
|
1c66fed5c4
|
Merge pull request #507 from fermionic/imagick-profile-photos-squashed
use getWidth and getHeight, which are agnostic to Imagick being enabled
|
2012-10-10 07:04:22 -07:00 |
|
fermionic
|
14d8033e54
|
Merge pull request #510 from fermionic/lockview-plugin-support
allow changing the lockview content with a plugin
|
2012-10-10 07:04:08 -07:00 |
|
fermionic
|
551ab568ab
|
Merge pull request #511 from fermionic/manage-doesnt-obey-startpage-plugin
add home_init hook to manage to call startpage plugin
|
2012-10-10 07:03:49 -07:00 |
|