a8df4cf04b
PL: update to the strings
2012-12-17 11:14:26 +01:00
1353e8ef4c
DE: update to the strings
2012-12-17 11:11:32 +01:00
Michael Vogel
a6b1275f16
Merge remote-tracking branch 'upstream/master'
2012-12-17 10:32:53 +01:00
Michael Vogel
9c0de28622
bbcode: New element "share" for shared content
...
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
2012-12-17 03:01:40 +01:00
Michael Vogel
d253d59668
vier: Added Delegations and optical changes.
2012-12-15 14:39:37 +01:00
Michael Vogel
a61ac769a0
vier: Expanding and collapsing now works
2012-12-15 11:25:52 +01:00
friendica
6faadc9662
anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.
2012-12-13 14:15:18 -08:00
friendica
4793ebb141
change profile photo link on profile edit page
2012-12-07 16:02:40 -08:00
5a634f3d9b
NB_NO: update to the strings
2012-12-04 11:09:48 +01:00
62d4034a5a
RU: update to the strings
2012-12-04 11:06:02 +01:00
fc8c01750b
PT-BR: update to the strings
2012-12-04 11:03:23 +01:00
71054f1483
RU: update to the strings
2012-12-03 09:35:07 +01:00
23c873fc51
Merge pull request #542 from annando/master
...
Some minor changes to "vier"
2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c
Merge remote-tracking branch 'upstream/master'
2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f
vier: maximum width of comments defined
2012-12-03 08:29:41 +01:00
Vasya Novikov
480af990ec
added translations where they were empty
2012-12-03 00:14:34 +04:00
daa56a94d3
DE: update to the strings
2012-11-30 09:17:58 +01:00
af1ebc932f
FR: update to the strings
2012-11-30 09:17:29 +01:00
Thomas Willingham
785fa1e070
Remove unsupported tag from Darkzero-NS since I have been supporting it.
2012-11-29 02:33:11 +00:00
Thomas Willingham
512729073b
Unmark Diabook experimental
2012-11-27 17:14:13 +00:00
Thomas Willingham
8c3ea4b4d4
Add max_daily_registrations to admin panel.
2012-11-27 17:13:32 +00:00
Thomas Willingham
7de455602c
Revert Diabook.
2012-11-27 16:28:12 +00:00
Thomas Willingham
95322ff5f4
Diabook - of all the things to miss...wall-item-content.
2012-11-26 05:49:13 +00:00
Thomas Willingham
fa5d25ec7a
Diabook - better 1024 resolution support.
2012-11-26 04:38:19 +00:00
Thomas Willingham
b0b4baa331
Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.
2012-11-26 02:11:19 +00:00
54bcfd2535
PL: update to the strings
2012-11-25 12:57:55 +01:00
50aa5face7
DE: update to the strings
2012-11-25 12:57:28 +01:00
ae58049110
ZH-CN: Update to the strings
2012-11-25 12:52:18 +01:00
Michael Vogel
88f5865738
Vier: Maximum with for content area
2012-11-23 12:15:03 +01:00
friendica
226d1ba7c1
Merge pull request #537 from fermionic/20121121-features
...
Port Features from Red
2012-11-22 20:54:16 -08:00
Zach Prezkuta
04f5506318
forgot some slightly important files
2012-11-22 09:20:03 -07:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285
Vier: Margin problems with code fixed.
2012-11-22 15:06:15 +01:00
c40740d19f
ZH-CN: Update to the strings
2012-11-20 17:26:54 +01:00
Thomas Willingham
7139e60b94
Diabook - fix wall-to-wall posts
2012-11-19 15:58:50 +00:00
Thomas Willingham
1a5d4f91cd
Diabook red. All that's left to do now is...all sorts of other things.
2012-11-18 23:30:48 +00:00
Thomas Willingham
f644cbb30b
Diabook pink
2012-11-18 22:52:44 +00:00
Thomas Willingham
a7982caf71
Diabook - should probably add *all* the files...
2012-11-18 22:06:53 +00:00
Thomas Willingham
96633cb0e5
Diabook - kill thousands more lines. Two more to go then we can start on the bugs...
2012-11-18 22:06:02 +00:00
Thomas Willingham
589f3603ae
Diabook - grep replace missed this
2012-11-18 21:27:02 +00:00
f9fbab948e
ZH-CN: initial pieces of the Chinese (China) translation. Thx to matthew_exon
2012-11-18 20:10:05 +01:00
Michael Vogel
c0376339e0
Merge remote-tracking branch 'upstream/master'
2012-11-17 14:29:09 +01:00
Michael Vogel
f17377e6de
New cache system with subdirectories
2012-11-17 00:50:39 +01:00
Thomas Willingham
3f9eef1ef6
Diabook - some more heavy lifting.
2012-11-16 22:29:39 +00:00
94a16f23c4
DE: update to the strings
2012-11-16 09:58:00 +01:00
Thomas Willingham
c12a27c73c
More diabook...
2012-11-16 02:49:05 +00:00
Thomas Willingham
da2aabd61d
Diabook - couple of fixes.
2012-11-16 01:58:28 +00:00
Thomas Willingham
bb86214698
Add the event/birthday thing from Andreas.
2012-11-16 01:44:09 +00:00
Thomas Willingham
da1b4939f0
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-16 00:37:53 +00:00
Thomas Willingham
b19c832381
Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now.
2012-11-16 00:36:52 +00:00
Thomas Willingham
09150cb5dc
Diabook - some heavy lifting. Lots more still to do.
2012-11-15 23:54:13 +00:00
Michael Vogel
e67062d9cf
Merge remote-tracking branch 'upstream/master'
2012-11-15 21:52:35 +01:00
Michael Vogel
fce18fd223
Vier: New Icon set
2012-11-15 21:47:36 +01:00
Michael Vogel
ff5ab7e9c6
Vier: Further improvements.
2012-11-15 08:18:25 +01:00
pixelroot
a00723fb9c
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_thread.tpl
2012-11-14 20:10:08 +01:00
pixelroot
7c4e3984be
new file: view/theme/smoothly/search_item.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_thread.tpl
2012-11-14 11:43:26 +01:00
Thomas Willingham
6fd47ba78e
Even shinier Dispy.
2012-11-14 03:01:15 +00:00
Thomas Willingham
79f35d01a7
"Everything" now includes Vier
2012-11-13 16:21:03 +00:00
Thomas Willingham
4c6401cfb0
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-13 15:52:16 +00:00
4b5dea5c89
Update view/pl/strings.php
2012-11-13 16:52:18 +01:00
Thomas Willingham
13ffe6274c
Everything is shiny (except frost and smoothly).
2012-11-13 15:50:48 +00:00
pixelroot
7e16909d0e
deleted: view/theme/smoothly/events_reminder.tpl
2012-11-13 16:37:53 +01:00
pixelroot
0e2fdee20e
modified: view/theme/smoothly/jot-header.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-11-13 16:36:36 +01:00
fabrixxm
ce12b3d2f0
Merge pull request #535 from fabrixxm/master
...
fix \"" issue in util/po2php.php
2012-11-13 07:16:22 -08:00
Fabrixxm
7093c1b9f6
update all languages strings.php
2012-11-13 10:13:28 -05:00
9886139d71
PL: update to the strings
2012-11-13 15:39:07 +01:00
fabrixxm
5a2c01d572
Merge pull request #532 from fabrixxm/quattrofixs
...
template: new $item.shiny; some fix to quattro
2012-11-13 03:08:26 -08:00
Fabrixxm
d40099e97c
add $item.shiny to default template
2012-11-12 12:55:18 -05:00
Fabrixxm
f3716d51ef
quattro: fix tag item template
...
add correct initial and final divs
2012-11-12 12:45:49 -05:00
pixelroot
9f09955925
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
2012-11-12 15:35:16 +01:00
pixelroot
8395966cf2
modified: view/theme/smoothly/css/typography.css
...
new file: view/theme/smoothly/screenshot.png
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-11-12 15:01:19 +01:00
Michael Vogel
30e429e6ce
Vier: Changed the color of links and notification counter.
2012-11-12 08:22:49 +01:00
Michael Vogel
b6b85b9773
Vier: Colors of links changed
2012-11-12 00:38:45 +01:00
Thomas Willingham
4c3e9fde28
Diabook - move pause icon.
2012-11-11 18:44:13 +00:00
Thomas Willingham
fccc76371f
Move the language selector.
2012-11-11 18:42:35 +00:00
Thomas Willingham
1a884e4065
Diabook - an out of date buglink probably shouldn't be in the navigation.
2012-11-11 18:39:16 +00:00
Thomas Willingham
9ea96c74a2
Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers.
2012-11-11 18:31:11 +00:00
Thomas Willingham
8b961b0a39
Diabook - yeah, we're supposed to *stop* duplicating code...
2012-11-11 17:49:41 +00:00
Thomas Willingham
4bd70c15db
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-11 15:46:04 +00:00
Thomas Willingham
10e84c548c
Diabook threaded comments.
2012-11-11 15:44:36 +00:00
f28b49e6d8
PL: update to the strings
2012-11-11 10:56:07 +01:00
c88e7d75c0
CS: update to the strings
2012-11-11 10:55:47 +01:00
Michael Vogel
197a12adb5
Vier: Further design improvements
2012-11-11 00:39:08 +01:00
Michael Vogel
b875191237
Diaspora: Avatars of repeated items weren't found
...
Vier: Complete redesign of the navigation header
2012-11-10 23:19:32 +01:00
7187107034
glitch with DE, PL strings
2012-11-10 08:50:26 +01:00
286578542f
DE: update to the strings
2012-11-10 08:37:21 +01:00
85feaa1a8d
PL: update to the strings
2012-11-10 08:36:43 +01:00
Michael Vogel
71e43e68d4
Merge remote-tracking branch 'upstream/master'
2012-11-09 23:40:17 +01:00
Fabrixxm
ff659a822b
add apple/gnome web app tags
2012-11-09 13:23:47 -05:00
Fabrixxm
b15352f650
quattro: collapse threaded comment box
2012-11-09 11:58:35 -05:00
Fabrixxm
c8b4ce9cca
quattro: fix shiny items with threads. fix 'tagged' template
2012-11-09 11:24:49 -05:00
Michael Vogel
fb02d72a35
vier: toggle comments only with threaded comments
2012-11-09 08:01:16 +01:00
friendica
f71db67a36
Merge https://github.com/friendica/friendica into pull
2012-11-08 20:47:04 -08:00
friendica
4199f49b54
remember me to base theme
2012-11-08 20:46:44 -08:00
fermionic
a6c05b5186
Merge pull request #530 from fermionic/20121108-dispy-menu-fix
...
fix help button position in dispy
2012-11-08 18:16:01 -08:00
Michael Vogel
b41687e209
"vier": Button for show/hide of text area for comments
2012-11-09 01:56:51 +01:00
Zach Prezkuta
36a9b2ed9a
fix help button position
2012-11-08 17:50:37 -07:00
friendica
824dcb8e76
Merge pull request #529 from fermionic/20121107-remember-me
...
add ability to remember logged in user after browser closes
2012-11-08 16:29:02 -08:00
Michael Vogel
b14e557575
Vier: Fixing "vier" so that it looks again like it was intended.
2012-11-09 01:19:24 +01:00
Michael Vogel
4196b6a96c
Merge remote-tracking branch 'upstream/master'
2012-11-08 21:44:17 +01:00
225fd777fd
PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-)
2012-11-08 18:54:42 +01:00
815d48e5e4
frost-mobile: on subdirectory installs the login screen image was not found
2012-11-08 06:48:49 +01:00
Zach Prezkuta
e116712bf5
add ability to remember logged in user after browser closes
2012-11-07 18:59:30 -07:00
Zach Prezkuta
bff31a49eb
leaked local change
2012-11-06 08:49:03 -07:00
Zach Prezkuta
999c3439e6
fix mobile photo uploads; better theme control; frost improvements
2012-11-06 08:43:19 -07:00
Fabrixxm
5b4944fe8e
Merge remote-tracking branch 'remotes/friendica/master' into moveme
2012-11-05 09:37:58 +01:00
Fabrixxm
aa20042bec
moveme: fix contact photos
2012-11-05 09:18:55 +01:00
2093fa8b3f
DE: update to the strings
2012-11-05 07:29:55 +01:00
Michael
ff40442768
Restoring the community pages in diabook
2012-11-05 00:20:32 +01:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c
add a confirm dialog and a busy rotator for delete selected
2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
c177a5e5b2
vier: threads
2012-11-01 15:05:31 +01:00
9086641fd1
ES: update to the strings
2012-11-01 13:12:54 +01:00
4832bc74f5
FR: update to the strings
2012-11-01 13:03:25 +01:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
70f8a69ef3
IT: update to the strings
2012-10-31 07:42:23 +01:00
Zach Prezkuta
2bfacda2df
missed quattro threaded_conversation live update field
2012-10-29 13:04:59 -06:00
Zach Prezkuta
4fa5b76167
delete template files that are identical to the defaults
2012-10-29 12:56:17 -06:00
Fabrixxm
dbc6cbe024
moveme: send and receive DFRN "relocate" message (WIP)
2012-10-29 17:50:55 +01:00
Fabrixxm
c51e057fe6
Merge remote branch 'friendica/master' into moveme
2012-10-29 05:57:58 -04:00
pixelroot
c1299bc689
view/theme/smoothly/screenshot.png
2012-10-25 13:50:26 +02:00
pixelroot
8e9c9992b0
new file: view/theme/smoothly/images/arrow.png
...
new file: view/theme/smoothly/images/calendar.png
new file: view/theme/smoothly/images/connect.png
new file: view/theme/smoothly/images/dot.png
new file: view/theme/smoothly/images/down.png
new file: view/theme/smoothly/images/file.gif
new file: view/theme/smoothly/images/groups.png
new file: view/theme/smoothly/images/icons.png
new file: view/theme/smoothly/images/icons.svg
new file: view/theme/smoothly/images/login-bg.gif
new file: view/theme/smoothly/images/lrarrow.gif
new file: view/theme/smoothly/images/menu-user-pin.jpg
new file: view/theme/smoothly/images/menu-user-pin.png
new file: view/theme/smoothly/images/nav-bg.png
new file: view/theme/smoothly/images/next.png
new file: view/theme/smoothly/images/notifications.png
new file: view/theme/smoothly/images/photo-menu.jpg
new file: view/theme/smoothly/images/photography.png
new file: view/theme/smoothly/images/premium.png
new file: view/theme/smoothly/images/prev.png
new file: view/theme/smoothly/images/search.png
new file: view/theme/smoothly/images/shiny.png
new file: view/theme/smoothly/images/star.png
new file: view/theme/smoothly/images/tobottom.png
new file: view/theme/smoothly/images/totop.png
new file: view/theme/smoothly/images/user.png
2012-10-25 12:27:05 +02:00
pixelroot
272cccb47f
deleted: view/theme/smoothly/arrow.png
...
deleted: view/theme/smoothly/calendar.png
deleted: view/theme/smoothly/connect.png
modified: view/theme/smoothly/css/typography.css
deleted: view/theme/smoothly/dot.png
deleted: view/theme/smoothly/down.png
deleted: view/theme/smoothly/file.gif
deleted: view/theme/smoothly/groups.png
deleted: view/theme/smoothly/icons.png
deleted: view/theme/smoothly/icons.svg
deleted: view/theme/smoothly/login-bg.gif
deleted: view/theme/smoothly/lrarrow.gif
deleted: view/theme/smoothly/menu-user-pin.jpg
deleted: view/theme/smoothly/menu-user-pin.png
deleted: view/theme/smoothly/nav-bg.png
modified: view/theme/smoothly/nav.tpl
deleted: view/theme/smoothly/nets.tpl
deleted: view/theme/smoothly/next.png
deleted: view/theme/smoothly/notifications.png
deleted: view/theme/smoothly/photo-menu.jpg
deleted: view/theme/smoothly/photo_album.tpl
deleted: view/theme/smoothly/photo_top.tpl
deleted: view/theme/smoothly/photo_view.tpl
deleted: view/theme/smoothly/photography.png
deleted: view/theme/smoothly/premium.png
deleted: view/theme/smoothly/prev.png
deleted: view/theme/smoothly/profile_entry.tpl
deleted: view/theme/smoothly/profile_vcard.tpl
deleted: view/theme/smoothly/saved_searches_aside.tpl
deleted: view/theme/smoothly/screenshot.png
deleted: view/theme/smoothly/search.png
deleted: view/theme/smoothly/search_item.tpl
deleted: view/theme/smoothly/shiny.png
deleted: view/theme/smoothly/star.png
2012-10-25 12:26:09 +02:00
Simon L'nu
00ee068b65
fix for preview post thingy blocking the posting buttons
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-10-25 02:59:49 -04:00
Simon L'nu
1d9633b0cc
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Friendicaland - remove states no longer flying the Friendica banner.
deleted: view/theme/smoothly/categories_widget.tpl deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css
2012-10-25 02:11:38 -04:00
pixelroot
fa7157492a
deleted: view/theme/smoothly/categories_widget.tpl
...
deleted: view/theme/smoothly/contact_template.tpl
deleted: view/theme/smoothly/footer.tpl
deleted: view/theme/smoothly/generic_links_widget.tpl
deleted: view/theme/smoothly/group_drop.tpl
deleted: view/theme/smoothly/group_side.tpl
deleted: view/theme/smoothly/header.tpl
deleted: view/theme/smoothly/mail_head.tpl
deleted: view/theme/smoothly/message_side.tpl
deleted: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
2012-10-24 16:41:56 +02:00
pixelroot
c92e7a3521
modified: view/theme/smoothly/style.css
2012-10-24 14:04:57 +02:00
pixelroot
6d1614e8fa
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
2012-10-24 12:24:12 +02:00
Simon L'nu
cf42b6f78d
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (23 commits)
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
Diabook - first part of clean-up to make the theme maintainable.
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css
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
rev update
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css
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
modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
IT: update to the strings
DE: update to the strings
new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
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.
Friendicaland
undefined fn: init_groups_visitor in mod_profile, rev update
Diabook - remove redundant TPL to bring back all admin settings
CS: update to the strings
ES: update to the strings
FR: update to the strings
...
2012-10-24 05:41:11 -04:00
pixelroot
cc59cb2755
modified: view/theme/smoothly/style.css
2012-10-24 11:13:12 +02:00
pixelroot
fe4e6f05d7
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-10-24 10:33:39 +02:00
Thomas Willingham
a8084fa540
Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
2012-10-23 20:05:55 +01:00
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
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
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
09a36fc05c
IT: update to the strings
2012-10-22 17:54:17 +02:00
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
1b9438120c
Diabook - remove redundant TPL to bring back all admin settings
2012-10-21 18:44:23 +01:00
298aeb5bf5
CS: update to the strings
2012-10-20 12:57:34 +02:00
64a0dc1eed
ES: update to the strings
2012-10-20 12:57:09 +02:00
50cf6c0797
FR: update to the strings
2012-10-20 12:56:47 +02:00
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
Simon L'nu
6ee4e4a93d
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
imagick exception
rev update
diabook: use proper defaults in popup sidebar config
diabook boxes: use a common hide/show form entry definition
remove lots of duplicated code in diabook config handling
2012-10-18 11:30:58 -04:00
Fabrixxm
65d235017c
move account. first step.
...
export basic account data as json
import basic account data in db (dbs must be at same schema version)
2012-10-17 11:13:01 -04: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
Simon L'nu
2c15bdd99e
merge HEAD
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-10-15 22:48:25 -04:00
f5a458d139
DE/FR/PT-BR: update to the strings
2012-10-13 09:38:47 +02: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
Zach Prezkuta
0d56f82efa
frost style improvements; various tweaks
2012-10-09 09:44:56 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
c0c8869f89
CS: update to the strings
2012-10-09 08:23:52 +02:00
1fa88bb79e
DE/PT-BR: update to the strings
2012-10-06 10:43:14 +02:00
Thomas Willingham
ffe7209114
Darkzero - make "visible to" legible.
2012-10-06 01:18:03 +01:00
Zach Prezkuta
5f2826f84e
update themes for new All Networks option
2012-10-04 19:59:30 -06:00
Thomas Willingham
d33abe2de9
Dispy - selecting any network and then switching back to "all networks"
...
didn't work. Remove nets.tpl to make it use the default one.
2012-10-04 23:19:50 +01:00
pixelroot
ceb8b8b77f
new file: view/theme/smoothly/file.gif
...
modified: view/theme/smoothly/search_item.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-10-04 16:37:02 +02:00
ef9eec5561
DE: update to the strings
2012-10-04 10:33:49 +02:00
65b52878c4
CS: update to the strings
2012-10-03 09:00:59 +02:00
122cf96ffd
FR: update to the strings
2012-10-03 07:56:29 +02:00
d651291916
DE: update to the strings
2012-10-03 07:56:12 +02:00
Christian Vogeley
44acbb25e4
Bring back BB-Code in comments
2012-10-02 21:29:00 +02:00
Zach Prezkuta
e850e0c6d5
frost suport for categories and folder updates
2012-10-01 14:22:32 -06:00
fabrixxm
9d4fdee65d
Merge pull request #500 from fabrixxm/quattro-fontsoptions
...
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
c7a4c08081
quattro: fix jot "video link" tooltip
2012-10-01 09:59:55 -04:00
Fabrixxm
871f182414
quattro: add quattro-lilac to theme Makefile
2012-10-01 09:53:02 -04:00
Fabrixxm
ca34d89482
quattro: fix post tags style, add icons for mentions, folders and categories
2012-10-01 09:38:25 -04:00
Fabrixxm
9d738570ee
quattro: options for posts and textareas font size
2012-10-01 08:58:05 -04:00
friendica
a620d5d9f3
Merge pull request #493 from fermionic/toggle-mobile-all-themes
...
Toggle mobile all themes
2012-09-30 01:58:51 -07:00
friendica
b03edcd8e5
Merge pull request #499 from fermionic/network-remember-filters
...
Network view updates
2012-09-30 01:54:00 -07:00
db81050edd
IT: update to the strings
2012-09-30 09:07:14 +02:00
cacd28d045
deleted nb_NO folder manually
2012-09-30 09:01:40 +02:00
e476a7126c
should be nb-no
2012-09-30 08:52:40 +02:00
2e8ac578cc
RU: update to the strings
2012-09-30 08:49:16 +02:00
f547387ada
FR: update to the strings
2012-09-30 08:43:15 +02:00
f73df7d209
DE: update to the strings
2012-09-30 08:41:43 +02:00
4845aa229c
nb_NO: added from Transifex
2012-09-30 08:41:03 +02:00
Zach Prezkuta
421c72d10f
remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters
2012-09-29 17:56:50 -06:00
Zach Prezkuta
4c2dd162a4
add new template file
2012-09-29 17:51:39 -06:00
Zach Prezkuta
cee50502d3
toggle mobile on all themes; Frost updates
2012-09-29 17:47:47 -06:00
Fabrixxm
de076afd6b
quattro: update wall_thread.tpl to separate tags/mentions/folder/category display
2012-09-28 10:17:26 -04:00
Fabrixxm
574631c17a
Merge remote branch 'friendica/master' into quattro-fontsoptions
2012-09-28 10:06:00 -04:00
ce8b6c4285
FR: update to the strings
2012-09-28 06:44:30 +02:00
friendica
9337441491
class not id
2012-09-27 02:54:14 -07:00
friendica
d615f0b563
forumlist changes
2012-09-27 02:47:50 -07:00
44469afe86
added IS from transifex, kudos to axelt
2012-09-27 06:42:57 +02:00
0209edb25c
FR: update to the strings
2012-09-27 06:31:55 +02:00
1880ad40d9
CA: update to the strings
2012-09-27 06:30:37 +02:00
88642699e7
EO: update to the strings
2012-09-27 06:29:25 +02:00
5fb4ca346b
CS: update to the strings
2012-09-27 06:27:06 +02:00
7b7e3aab1f
ES: update to the strings
2012-09-27 06:24:49 +02:00
ce38e574a2
DE: update to the strings
2012-09-27 06:21:16 +02:00
friendica
4a8100a409
frost-mobile - everything is walltowall
2012-09-25 21:55:53 -07:00
friendica
2cacbdb9e7
Merge https://github.com/friendica/friendica into pull
2012-09-25 19:11:58 -07:00
friendica
e433f20cd8
sort out the 'delete selected' mess
2012-09-25 19:10:46 -07:00
pixelroot
75d65db785
Merge remote branch 'upstream/master'
2012-09-25 12:00:29 +02:00
pixelroot
0bf9ff5821
modified: view/theme/smoothly/events_reminder.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-25 11:59:58 +02:00
friendica
245d9f0aca
one template to rule them all
2012-09-25 01:31:48 -07:00
friendica
a798ef1a56
one template to rule them all
2012-09-24 21:43:03 -07:00
pixelroot
0592a9e3ca
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-24 16:07:41 +02:00
friendica
8df6f249fd
Merge https://github.com/friendica/friendica into pull
2012-09-24 01:31:23 -07:00
pixelroot
0834779405
Merge remote branch 'upstream/master'
2012-09-24 10:16:05 +02:00
pixelroot
05223cc325
modified: view/theme/smoothly/search_item.tpl
...
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_item.tpl
modified: view/theme/smoothly/wall_thread.tpl
modified: view/theme/smoothly/wallwall_item.tpl
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-24 10:15:31 +02:00
friendica
94f3aef1ea
allow a bit more height
2012-09-24 00:46:00 -07:00
friendica
316014e4ea
restore category/file display on dispy/diabook
2012-09-24 00:35:19 -07:00
pixelroot
c44d068adf
Merge branch 'master' of http://github.com/friendica/friendica
2012-09-24 08:46:25 +02:00
friendica
054f8edb59
zeros - theming for new categories/folder display
2012-09-23 19:22:48 -07:00
930169a8aa
DE: update to the strings
2012-09-22 08:42:07 +02:00
pixelroot
57849ff959
modified: view/theme/smoothly/style.css
2012-09-21 08:57:22 +02:00
pixelroot
fa2156a9c1
modified: view/theme/smoothly/style.css
2012-09-20 13:26:53 +02:00
pixelroot
8a8fe725af
modified: view/theme/smoothly/style.css
2012-09-20 13:25:12 +02:00
pixelroot
85c0260f33
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-20 13:15:01 +02:00
pixelroot
12f7c32f9b
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-20 11:32:55 +02:00
pixelroot
49098ed11d
deleted: view/theme/smoothly/match.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-20 09:25:53 +02:00
Zach Prezkuta
1aa111387a
-- Fix Diaspora profile update avatar bugs
...
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00
friendica
c11aa30ef4
this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted.
2012-09-19 18:24:20 -07:00
friendica
51bee79b21
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/theme/smoothly/follow.tpl
2012-09-19 15:39:19 -07:00
friendica
09a00a9a07
html tag completed early
2012-09-19 15:34:21 -07:00
pixelroot
31064a15ec
modified: view/theme/smoothly/theme.php
2012-09-19 16:16:58 +02:00
pixelroot
a4f25f6eaa
modified: view/theme/smoothly/style.css
2012-09-19 16:14:45 +02:00
pixelroot
05a61b80e2
modified: view/theme/smoothly/follow.tpl
...
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_item.tpl
modified: view/theme/smoothly/wall_thread.tpl
modified: view/theme/smoothly/wallwall_item.tpl
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-19 15:53:37 +02:00
friendica
82678e7bbf
bad html in view/follow.tpl
2012-09-19 03:17:41 -07:00
Thomas Willingham
96d6d6b988
Pull request #487
2012-09-18 16:15:36 +01:00
Alex
61eb884a20
Update view/theme/smoothly/bottom.tpl
2012-09-18 13:13:05 +03:00
friendica
863e036b76
Merge pull request #483 from fabrixxm/bug471
...
admin: Don't allow to block or delete site admin in users admin page.
2012-09-17 17:39:32 -07:00
Thomas Willingham
69182360ef
Merge pull request #486 from cvogeley/master
...
Show notifications in title, ignore OSX .DS_Store files
2012-09-17 14:44:17 -07:00
Christian Vogeley
c024ed601e
Remove and ignore .DS_Store
2012-09-17 23:03:34 +02:00
808b0f2ed8
ES: bringing the strings to 100% thx to csolisr
2012-09-17 21:52:21 +02:00
Christian Vogeley
318bc23e8a
Add notifications in title
2012-09-17 20:39:34 +02:00
Thomas Willingham
e34b8e6d46
Pull request #484 (Smoothly)
2012-09-17 18:37:44 +01:00
tomtom84
68c2316ce3
Corrected titlebar notifications in Diabook
2012-09-17 17:54:07 +02:00
Thomas Willingham
11eebf7091
Add titlebar notifications to Dispy.
2012-09-17 14:54:40 +01:00
Thomas Willingham
9cabcad36c
Add title bar notifications to Smoothly
2012-09-17 14:53:17 +01:00
Fabrixxm
6aa45fb9cc
admin: Don't allow to block or delete site admin in users admin page. fix bug 471
2012-09-17 08:48:43 -04:00
Alex
f558a1fe8d
Merge pull request #482 from pixelroot/master
...
bug fix
2012-09-17 05:12:53 -07:00
pixelroot
ede6b4ad12
modified: view/theme/smoothly/style.css
2012-09-17 14:16:13 +02:00
pixelroot
176fe0351a
new file: view/theme/smoothly/shiny.png
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-17 13:49:09 +02:00
Alex
01daaafc92
Merge pull request #481 from pixelroot/master
...
Better mark new posts
2012-09-17 04:46:00 -07:00
pixelroot
cd3938dfda
new file: view/theme/smoothly/default.php
...
new file: view/theme/smoothly/footer.tpl
new file: view/theme/smoothly/header.tpl
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-17 11:22:12 +02:00
Alex
06c9330c5e
Merge pull request #480 from pixelroot/master
...
Bug fixes
2012-09-17 02:20:07 -07:00
Fabrixxm
6deb070890
quattro: first work on font size options
2012-09-17 03:29:58 -04:00
Zach Prezkuta
ab10a7b56b
missed one
2012-09-16 18:57:04 -06:00
Zach Prezkuta
3c7419ec57
various bug fixes
2012-09-16 18:56:31 -06:00
d29da99dbd
frost: added some missing baseurls to nav.tpl
2012-09-16 18:33:55 +02:00
Thomas Willingham
f198953790
Merge branch 'master' of https://github.com/friendica/friendica
2012-09-16 16:17:43 +01:00
Thomas Willingham
225c9bb30e
Make 'Friendika' 'Friendica' in open search.
2012-09-16 16:16:22 +01:00
89981b33bb
DE: update to the strings
2012-09-16 10:48:29 +02:00
friendica
2abbd1dc19
permissions selector showing up for guests, testbubble and smoothly
2012-09-15 20:21:17 -07:00
21d685b21c
DE: update to the strings
2012-09-15 10:38:08 +02:00
pixelroot
816680ca85
new file: view/theme/smoothly/bottom.tpl
...
new file: view/theme/smoothly/js/jquery.autogrow.textarea.js
new file: view/theme/smoothly/js/modernizr.custom.2.5.3.js
new file: view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
2012-09-14 19:08:39 +02:00
pixelroot
3c846547f7
modified: view/theme/smoothly/style.css
2012-09-14 19:08:21 +02:00
Alex
7ae1e4620d
Merge pull request #476 from pixelroot/master
...
new funktion
2012-09-14 10:07:17 -07:00
pixelroot
6537a94b1a
new file: view/theme/smoothly/down.png
2012-09-14 17:55:27 +02:00
pixelroot
a300973084
modified: view/theme/smoothly/style.css
2012-09-14 17:55:17 +02:00
Alex
5d22b13242
Merge pull request #475 from pixelroot/master
...
Bugs
2012-09-14 08:53:27 -07:00
cb1c9de069
quattro: lilac color schema
2012-09-14 17:01:26 +02:00
6c44125fb5
DE: update to the strings
2012-09-14 15:46:14 +02:00
882f437149
quattro: mail link to profile page
2012-09-14 15:35:40 +02:00
pixelroot
252e112ad5
modified: view/theme/smoothly/style.css
2012-09-14 12:46:32 +02:00
Alex
98540b630e
Merge pull request #474 from pixelroot/master
...
Bug fix
2012-09-14 03:43:48 -07:00
pixelroot
e78b86f534
modified: view/theme/smoothly/style.css
2012-09-14 11:57:13 +02:00
Alex
9c7d5d42e1
Merge pull request #473 from pixelroot/master
...
Editor redesign
2012-09-14 02:54:30 -07:00
pixelroot
bdc5a3ab29
deleted: view/theme/smoothly/group_edit.tpl
2012-09-14 10:16:35 +02:00
Alex
ac0ad8fecf
Merge pull request #472 from pixelroot/master
...
Group-Edit bug
2012-09-14 01:14:48 -07:00
pixelroot
d002573543
deleted: view/theme/smoothly/default.php
...
modified: view/theme/smoothly/nav.tpl
2012-09-14 09:55:54 +02:00
Alex
2a404ae6dd
Merge pull request #471 from pixelroot/master
...
Theme Smoothly
2012-09-14 00:54:54 -07:00
pixelroot
1c4bea295f
new file: view/theme/smoothly/default.php
2012-09-14 09:33:47 +02:00
pixelroot
d1984c4c64
modified: view/theme/smoothly/nav.tpl
...
modified: view/theme/smoothly/style.css
2012-09-14 09:33:21 +02:00
pixelroot
bff9c3d460
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-14 08:50:10 +02:00
friendica
32d4a359f1
reverse the default newuser privacy setting to public. Sites can over-ride.
2012-09-13 19:11:07 -07:00
Thomas Willingham
290da6c845
Merge pull request #469 from pixelroot/master
...
Theme Smoothly
2012-09-13 07:59:16 -07:00
pixelroot
0cc661dd9c
modified: view/theme/smoothly/style.css
2012-09-13 16:50:55 +02:00
pixelroot
664680cdd8
modified: view/theme/smoothly/style.css
2012-09-13 16:30:12 +02:00
friendica
d3699498ac
Merge pull request #468 from pixelroot/master
...
Theme Smoothly
2012-09-13 03:50:55 -07:00
pixelroot
a1ed9c72c2
modified: view/theme/smoothly/star.png
...
modified: view/theme/smoothly/theme.php
2012-09-13 11:41:14 +02:00
pixelroot
2b9c2b2d1d
modified: view/theme/smoothly/style.css
2012-09-13 09:54:27 +02:00
pixelroot
931e1c6c66
modified: view/theme/smoothly/style.css
2012-09-13 09:48:02 +02:00
pixelroot
16e35d1787
new file: view/theme/smoothly/message_side.tpl
2012-09-13 09:35:12 +02:00
pixelroot
4ba7ce0308
modified: view/theme/smoothly/peoplefind.tpl
...
modified: view/theme/smoothly/style.css
2012-09-13 09:34:50 +02:00
Zach Prezkuta
e8acdb31bc
add mobile toggle to frost mobile
2012-09-12 21:35:51 -06:00
pixelroot
864e2c03d9
modified: view/theme/smoothly/style.css
2012-09-12 17:25:44 +02:00
pixelroot
e3d20b51c8
modified: view/theme/smoothly/style.css
2012-09-12 16:27:31 +02:00
pixelroot
a3add1d851
modified: view/theme/smoothly/profile_vcard.tpl
...
modified: view/theme/smoothly/style.css
2012-09-12 16:20:44 +02:00
250c615058
Merge pull request #466 from pixelroot/master
...
Theme Smoothly
2012-09-12 07:02:40 -07:00
pixelroot
77aee41280
modified: view/theme/smoothly/style.css
2012-09-12 15:49:18 +02:00
pixelroot
a283d6844c
modified: view/theme/smoothly/theme.php
2012-09-12 14:44:42 +02:00
pixelroot
207451d82d
modified: view/theme/smoothly/style.css
2012-09-12 14:42:10 +02:00
friendica
ec1abfda46
Merge https://github.com/friendica/friendica into pull
2012-09-11 18:57:40 -07:00
friendica
a8d12061ca
rev update + multiple profile photos
2012-09-11 18:56:38 -07:00
fermionic
984274659d
Merge pull request #464 from pixelroot/master
...
theme smoothly
2012-09-11 07:27:19 -07:00
pixelroot
5ae445b1ff
new file: view/theme/smoothly/generic_links_widget.tpl
...
modified: view/theme/smoothly/style.css
2012-09-11 15:23:49 +02:00
pixelroot
4cc4404752
new file: view/theme/smoothly/arrow.png
...
new file: view/theme/smoothly/categories_widget.tpl
modified: view/theme/smoothly/style.css
2012-09-11 14:02:36 +02:00
pixelroot
30a9db78f5
modified: view/theme/smoothly/style.css
2012-09-11 11:25:01 +02:00
pixelroot
5f7f1fb7b1
modified: view/theme/smoothly/nav.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/totop.png
2012-09-11 11:06:55 +02:00
36bd5286f2
DE: update to the strings
2012-09-11 09:19:11 +02:00
friendica
fa65db9aa1
bring back comment edit buttons
2012-09-10 18:06:18 -07:00
friendica
4b7c6329e9
Merge pull request #462 from CyberDomovoy/threaded_items
...
Threaded items, objects
2012-09-10 16:19:13 -07:00
fermionic
9e9765a89f
Merge pull request #463 from pixelroot/master
...
Version 0.5
2012-09-10 08:08:24 -07:00
pixelroot
9685ba3fbc
modified: view/theme/smoothly/style.css
2012-09-10 16:31:36 +02:00
pixelroot
ee20708f75
modified: view/theme/smoothly/style.css
2012-09-10 16:21:54 +02:00
pixelroot
b5dee575a8
modified: style.css
2012-09-10 15:38:44 +02:00
pixelroot
e51440ec98
modified: view/theme/smoothly/style.css
2012-09-10 15:19:43 +02:00
pixelroot
264f32db80
modified: view/theme/smoothly/style.css
2012-09-10 14:58:57 +02:00
pixelroot
aef0824cc8
modified: view/theme/smoothly/style.css
2012-09-10 14:52:47 +02:00
pixelroot
c059f92b5a
modified: view/theme/smoothly/style.css
2012-09-10 14:36:51 +02:00
pixelroot
7603e2de75
deleted: view/theme/smoothly/comment_item.tpl
...
deleted: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
2012-09-10 14:18:24 +02:00
pixelroot
e492664325
new file: view/theme/smoothly/follow.tpl
...
new file: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
2012-09-10 12:30:34 +02:00
pixelroot
f96b91c254
modified: view/theme/smoothly/style.css
2012-09-10 11:01:43 +02:00
Domovoy
bb68461c6d
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-09-10 09:19:08 +02:00
friendica
0d9ffd07c2
remove mobile file
2012-09-10 00:15:01 -07:00
656604a5ff
DE: getting the strings back to 100%
2012-09-09 18:31:15 +02:00
63ab82d3dd
frost-mobile: was missing infront of the nav-images
2012-09-09 13:26:15 +02:00
fermionic
1088257aad
Merge pull request #461 from pixelroot/master
...
Version 0.4
2012-09-08 07:33:26 -07:00
pixelroot
a04d0e6832
deleted: view/theme/smoothly/mobile
2012-09-08 09:26:13 +02:00
pixelroot
b6d310675b
deleted: view/theme/smoothly/icons/dot.png
...
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
2012-09-08 09:25:06 +02:00
pixelroot
393a91ea78
modified: view/theme/smoothly/comment_item.tpl
...
new file: view/theme/smoothly/dot.png
new file: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
deleted: view/theme/smoothly/icons/dot.png
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
2012-09-08 09:24:37 +02:00
pixelroot
002168ebd9
new file: view/theme/smoothly/js/jquery.ae.image.resize.js
...
new file: view/theme/smoothly/js/jquery.ae.image.resize.min.js
modified: view/theme/smoothly/theme.php
2012-09-08 08:54:18 +02:00
Zach Prezkuta
63d02d98c5
add settings sections and add contacts; other tweaks and fixes
2012-09-07 12:17:03 -06:00
pixelroot
c616b05a33
modified: view/theme/smoothly/jot.tpl
...
modified: view/theme/smoothly/style.css
2012-09-07 17:13:51 +02:00
pixelroot
9f7fbbdee3
modified: view/theme/smoothly/style.css
2012-09-07 16:32:20 +02:00
pixelroot
8685ca5a7f
new file: view/theme/smoothly/mobile
2012-09-07 10:10:25 +02:00
pixelroot
1157b627af
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
view/theme/smoothly/mobile
2012-09-07 10:09:24 +02:00
Zach Prezkuta
af3e36f665
mark all mobile themes
2012-09-06 17:30:24 -06:00
Zach Prezkuta
77529ccdf1
allow individual choice of mobile themes
2012-09-06 17:24:34 -06:00
fermionic
41439804f4
Merge pull request #456 from pixelroot/master
...
New Theme "Smoothly"
2012-09-06 11:08:48 -07:00
pixelroot
6a46717e1a
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 16:25:16 +02:00
pixelroot
6ac28c97f1
modified: view/theme/smoothly/jot.tpl
...
modified: view/theme/smoothly/style.css
2012-09-06 15:50:02 +02:00
pixelroot
a6f7ff686c
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 14:15:38 +02:00
pixelroot
a888b59c42
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
2012-09-06 13:25:13 +02:00
pixelroot
5c91ca9687
new file: view/theme/smoothly/icons/dot.png
...
new file: view/theme/smoothly/lang_selector.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/style.css
new file: view/theme/smoothly/wall_thread.tpl
new file: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 12:04:56 +02:00
pixelroot
0d9f6c89cc
modified: view/theme/smoothly/comment_item.tpl
...
modified: view/theme/smoothly/contact_template.tpl
modified: view/theme/smoothly/jot-header.tpl
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/photo_top.tpl
modified: view/theme/smoothly/profile_entry.tpl
modified: view/theme/smoothly/profile_vcard.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
2012-09-06 11:17:17 +02:00
pixelroot
5e3076b5d2
view/theme/smoothly/icons/
...
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
2012-09-06 09:44:15 +02:00
Zach Prezkuta
c6f4404914
conversation.tpl doesnt appear to be necessary
2012-09-05 11:12:08 -06:00
Zach Prezkuta
0d45fec969
add threading files to make testbubble not broken with threading
2012-09-05 11:11:03 -06:00
pixelroot
92a9070e1e
view/theme/smoothly/lang_selector.tpl
2012-09-05 16:04:29 +02:00
pixelroot
e326e3e5d0
modified: view/theme/smoothly/style.css
2012-09-05 13:29:45 +02:00
pixelroot
89adfbeb80
deleted: view/theme/smoothly/back-gradient.jpg
...
modified: view/theme/smoothly/style.css
2012-09-05 10:28:15 +02:00
pixelroot
de9bcb5825
new file: view/theme/smoothly/login.tpl
2012-09-05 09:46:26 +02:00
pixelroot
2d37a18513
view/theme/smoothly/login.tpl
2012-09-05 09:42:52 +02:00
Zach Prezkuta
79012bf888
conversation needs preview parameter
2012-09-04 18:47:49 -06:00
pixelroot
05dda2f226
new file: view/theme/smoothly/back-gradient.jpg
...
new file: view/theme/smoothly/calendar.png
new file: view/theme/smoothly/comment_item.tpl
new file: view/theme/smoothly/connect.png
new file: view/theme/smoothly/contact_template.tpl
new file: view/theme/smoothly/conversation.tpl
new file: view/theme/smoothly/group_drop.tpl
new file: view/theme/smoothly/group_edit.tpl
new file: view/theme/smoothly/group_side.tpl
new file: view/theme/smoothly/groups.png
new file: view/theme/smoothly/icons.png
new file: view/theme/smoothly/icons.svg
new file: view/theme/smoothly/jot-header.tpl
new file: view/theme/smoothly/jot.tpl
new file: view/theme/smoothly/lock.cur
new file: view/theme/smoothly/login-bg.gif
new file: view/theme/smoothly/lrarrow.gif
new file: view/theme/smoothly/mail_head.tpl
new file: view/theme/smoothly/match.tpl
new file: view/theme/smoothly/menu-user-pin.jpg
new file: view/theme/smoothly/menu-user-pin.png
new file: view/theme/smoothly/nav-bg.png
new file: view/theme/smoothly/nav.tpl
new file: view/theme/smoothly/nets.tpl
new file: view/theme/smoothly/next.png
new file: view/theme/smoothly/notifications.png
new file: view/theme/smoothly/photo-menu.jpg
new file: view/theme/smoothly/photo_album.tpl
new file: view/theme/smoothly/photo_top.tpl
new file: view/theme/smoothly/photo_view.tpl
new file: view/theme/smoothly/photography.png
new file: view/theme/smoothly/premium.png
new file: view/theme/smoothly/prev.png
new file: view/theme/smoothly/profile_entry.tpl
new file: view/theme/smoothly/profile_vcard.tpl
new file: view/theme/smoothly/saved_searches_aside.tpl
new file: view/theme/smoothly/screenshot.jpg
new file: view/theme/smoothly/screenshot.png
new file: view/theme/smoothly/search.png
new file: view/theme/smoothly/search_item.tpl
new file: view/theme/smoothly/star.png
new file: view/theme/smoothly/style.css
new file: view/theme/smoothly/theme.php
new file: view/theme/smoothly/user.png
new file: view/theme/smoothly/wall_item.tpl
new file: view/theme/smoothly/wallwall_item.tpl
2012-09-02 13:11:17 +02:00
pixelroot
0aebf15f03
deleted: view/theme/softy/back-gradient.jpg
...
deleted: view/theme/softy/calendar.png
deleted: view/theme/softy/comment_item.tpl
deleted: view/theme/softy/connect.png
deleted: view/theme/softy/contact_template.tpl
deleted: view/theme/softy/conversation.tpl
deleted: view/theme/softy/group_drop.tpl
deleted: view/theme/softy/group_edit.tpl
deleted: view/theme/softy/group_side.tpl
deleted: view/theme/softy/groups.png
deleted: view/theme/softy/icons.png
deleted: view/theme/softy/icons.svg
deleted: view/theme/softy/jot-header.tpl
deleted: view/theme/softy/jot.tpl
deleted: view/theme/softy/lock.cur
deleted: view/theme/softy/login-bg.gif
deleted: view/theme/softy/lrarrow.gif
deleted: view/theme/softy/mail_head.tpl
deleted: view/theme/softy/match.tpl
deleted: view/theme/softy/menu-user-pin.jpg
deleted: view/theme/softy/menu-user-pin.png
deleted: view/theme/softy/nav-bg.png
deleted: view/theme/softy/nav.tpl
deleted: view/theme/softy/nets.tpl
deleted: view/theme/softy/next.png
deleted: view/theme/softy/notifications.png
deleted: view/theme/softy/photo-menu.jpg
deleted: view/theme/softy/photo_album.tpl
deleted: view/theme/softy/photo_top.tpl
deleted: view/theme/softy/photo_view.tpl
deleted: view/theme/softy/photography.png
deleted: view/theme/softy/premium.png
deleted: view/theme/softy/prev.png
deleted: view/theme/softy/profile_entry.tpl
deleted: view/theme/softy/profile_vcard.tpl
deleted: view/theme/softy/saved_searches_aside.tpl
deleted: view/theme/softy/screenshot.jpg
deleted: view/theme/softy/screenshot.png
deleted: view/theme/softy/search.png
deleted: view/theme/softy/search_item.tpl
deleted: view/theme/softy/star.png
deleted: view/theme/softy/style.css
deleted: view/theme/softy/theme.php
deleted: view/theme/softy/user.png
deleted: view/theme/softy/wall_item.tpl
deleted: view/theme/softy/wallwall_item.tpl
view/theme/smoothly/
2012-09-02 13:09:16 +02:00
a287b34eb3
DE strings (pokes THX @zottel)
2012-09-02 11:59:44 +02:00
Fabrixxm
02037e345d
quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas
2012-09-01 04:52:01 -04:00
friendica
2ace7d6646
Merge pull request #451 from fabrixxm/master
...
fixes and tweaks
2012-08-31 01:26:03 -07:00
Fabrixxm
51686cce01
quattro: remove 'experimental'
2012-08-31 03:32:10 -04:00
Fabrixxm
ad45d9a78a
quattro: fix live update
2012-08-31 03:31:33 -04:00
pixelroot
9346de5686
deleted: view/theme/softy/style.alex
...
deleted: view/theme/softy/style.alt
2012-08-30 16:50:22 +02:00
pixelroot
d96e3d95c1
new file: view/theme/softy/back-gradient.jpg
...
new file: view/theme/softy/calendar.png
new file: view/theme/softy/comment_item.tpl
new file: view/theme/softy/connect.png
new file: view/theme/softy/contact_template.tpl
new file: view/theme/softy/conversation.tpl
new file: view/theme/softy/group_drop.tpl
new file: view/theme/softy/group_edit.tpl
new file: view/theme/softy/group_side.tpl
new file: view/theme/softy/groups.png
new file: view/theme/softy/icons.png
new file: view/theme/softy/icons.svg
new file: view/theme/softy/jot-header.tpl
new file: view/theme/softy/jot.tpl
new file: view/theme/softy/lock.cur
new file: view/theme/softy/login-bg.gif
new file: view/theme/softy/lrarrow.gif
new file: view/theme/softy/mail_head.tpl
new file: view/theme/softy/match.tpl
new file: view/theme/softy/menu-user-pin.jpg
new file: view/theme/softy/menu-user-pin.png
new file: view/theme/softy/nav-bg.png
new file: view/theme/softy/nav.tpl
new file: view/theme/softy/nets.tpl
new file: view/theme/softy/next.png
new file: view/theme/softy/notifications.png
new file: view/theme/softy/photo-menu.jpg
new file: view/theme/softy/photo_album.tpl
new file: view/theme/softy/photo_top.tpl
new file: view/theme/softy/photo_view.tpl
new file: view/theme/softy/photography.png
new file: view/theme/softy/premium.png
new file: view/theme/softy/prev.png
new file: view/theme/softy/profile_entry.tpl
new file: view/theme/softy/profile_vcard.tpl
new file: view/theme/softy/saved_searches_aside.tpl
new file: view/theme/softy/screenshot.jpg
new file: view/theme/softy/screenshot.png
new file: view/theme/softy/search.png
new file: view/theme/softy/search_item.tpl
new file: view/theme/softy/star.png
new file: view/theme/softy/style.alex
new file: view/theme/softy/style.alt
new file: view/theme/softy/style.css
new file: view/theme/softy/theme.php
new file: view/theme/softy/user.png
new file: view/theme/softy/wall_item.tpl
new file: view/theme/softy/wallwall_item.tpl
2012-08-30 16:42:50 +02:00
Domovoy
ef52ff6b01
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-30 07:47:21 +02:00
Zach Prezkuta
2ef1081c68
make the show more line look nicer
2012-08-28 20:19:47 -06:00
fermionic
9ae5ae6df5
Merge pull request #448 from fermionic/limit-items-on-all-pages
...
limit number of items on profile page too
2012-08-28 19:03:15 -07:00
fermionic
8c064069d9
Merge pull request #443 from fermionic/new-users-privacy-settings
...
automatically make posts private for new users
2012-08-28 19:02:51 -07:00
c2b4dc2e60
DE: some translations
2012-08-28 18:14:57 +02:00
d9ffb0578c
quattro: display date info as "ago" with mouse over date stamp
2012-08-27 19:47:04 +02:00
cf91a7f79a
quattro: mail_display has no ago information so don't display it
2012-08-27 19:39:31 +02:00
036d5db0c0
quattro: use "ago" for date information and on mouse the date stamp
2012-08-27 19:32:23 +02:00
37a0504f96
quattro: expanded the new prvmessage field a bit
2012-08-27 08:13:07 +02:00
Zach Prezkuta
c681e69794
limit number of items on profile page too; add show more back to Frost mobile; some show more fixes
2012-08-26 15:21:26 -06:00
Zach Prezkuta
a77081f659
remove show more/less from frost mobile--it is too great a load
2012-08-26 09:31:37 -06:00
Zach Prezkuta
0fe1727d74
remove show more/less animation on mobile
2012-08-26 09:22:49 -06:00
Zach Prezkuta
7c9c92e542
update version
2012-08-25 22:43:32 -06:00
Zach Prezkuta
193cc2c537
try to get rid of scrollbars in Frost
2012-08-25 22:42:12 -06:00
Zach Prezkuta
f062ccbb66
add documentation; add to admin panel; some tweaks and interface stuff
2012-08-25 15:03:16 -06:00
fermionic
5cb618bcf1
Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show
...
restore nav element to login pages, since system messages are sent in it
2012-08-25 09:10:01 -07:00
Zach Prezkuta
3413cc1006
restore nav element to login pages, since system messages are sent in it
2012-08-25 10:08:25 -06:00
Zach Prezkuta
54d4fc73c4
fix image and file upload on frost moble; add support to frost for local post time
2012-08-24 21:25:39 -06:00
Domovoy
5dd3e8a990
One click comments on threaded items.
...
comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.
2012-08-23 13:09:35 +02:00
Domovoy
3e5c711a72
Sync objects with upstream
2012-08-23 10:54:21 +02:00
friendica
386b6d081b
moods
2012-08-22 21:36:55 -07:00
friendica
4f72e656ca
Merge https://github.com/friendica/friendica into pull
2012-08-21 19:42:37 -07:00
friendica
ff0e0782a5
restore old comment behaviour when threading turned off
2012-08-21 19:41:50 -07:00
07a27d217c
DE more updates to the strings
2012-08-21 08:23:47 +02:00
d470496ead
Quattro: added localtime timestamp title to entries
2012-08-20 11:20:49 +02:00
96e6be3c19
DE strings update
2012-08-20 11:12:40 +02:00
friendica
bcec1bddc0
put the real post time into the post
2012-08-19 14:39:43 -07:00
Zach Prezkuta
b4a4ccfb2b
include login style when necessary
2012-08-18 14:47:59 -06:00
Zach Prezkuta
045f98cddd
another javascript
2012-08-16 21:51:36 -06:00
Thomas Willingham
ee998864e6
Make Vier threaded comments not broken.
...
These should be inherited from Quattro really, but aren't.
2012-08-16 18:21:33 +01:00
Zach Prezkuta
3531704d08
admin page selector for mobile theme
2012-08-15 08:54:30 -06:00
a09c200799
add selector for mobile theme to admin panel
2012-08-15 10:16:42 +02:00
52908d5e80
lets mark mobile themes similar to experimental ones
2012-08-15 10:15:21 +02:00
Zach Prezkuta
77626cca74
missed something again
2012-08-14 19:54:22 -06:00
Zach Prezkuta
45b21c1d20
basic updates for Dispy and Diabook to try to make them at least not broken with threading updates
2012-08-14 19:42:07 -06:00
a763a064ff
DE some updates to the translation
2012-08-14 12:37:32 +02:00
fermionic
8d89a915fc
Merge pull request #434 from fermionic/frost-update-for-threaded-comments
...
sigh I always miss something when copying over
2012-08-11 19:53:08 -07:00
Zach Prezkuta
91aacdbb3d
sigh I always miss something when copying over
2012-08-11 20:51:51 -06:00
friendica
6348634a1b
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
friendica
1cd23860cb
rev update
2012-08-11 15:39:45 -07:00
Zach Prezkuta
5890e3fa3a
update frost mobile TODO
2012-08-11 14:43:13 -06:00
Zach Prezkuta
5e09fc31f5
Threading updates
...
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
2012-08-11 14:36:58 -06:00
friendica
20be1778db
bring likes back - comment ordering is still a bit funky
2012-08-10 16:36:44 -07:00
Zach Prezkuta
bcf214debb
readability in TODO
2012-08-10 08:37:31 -06:00
Zach Prezkuta
d9279da369
- Frost Mobile: redo CSS to adjust automatically to the screen width
...
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
Fabrixxm
ec3d8a80cd
quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread
2012-08-10 06:27:01 -04:00
Fabrixxm
0f15c117ee
quattro: move comment box for top-level item at the end of comments list
2012-08-10 04:53:39 -04:00
Fabrixxm
c4bff3d393
quattro: add comment tools icons, fix hide/show comment tools
2012-08-10 04:29:22 -04:00
Fabrixxm
64a6e8693c
quattro: remove unused parameter 'comment' from function cmtBbClose
2012-08-10 04:27:50 -04:00
Fabrixxm
2b7d08508d
head.tpl: commentOpen() and commentClose() return true/false
...
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
2012-08-10 04:25:08 -04:00
Domovoy
9c920fd7b9
Merge pull request #5 from fabrixxm/threaded_items
...
Threaded items support for Quattro theme
2012-08-09 02:14:22 -07:00
Domovoy
afaa5f2038
Removed useless comment box (from old non-threaded template, to comment box where displayed)
2012-08-07 12:13:42 +02:00
Domovoy
5ca71d04b2
Wall to wall items should now be threaded too.
2012-08-07 12:08:36 +02:00
Domovoy
c0024daff7
Added view/wallwall_thread.tpl
2012-08-07 12:02:06 +02:00
Domovoy
f3b1391501
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-07 09:40:21 +02:00
friendica
3032d663f6
Merge pull request #427 from fermionic/frost-embedded-videos
...
allow themes to change the size of embedded videos
2012-08-06 15:58:17 -07:00
Simon L'nu
7ceb213859
add a 'manage' icon to clarify things
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-08-06 17:05:25 -04:00
Simon L'nu
76e1e07571
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
Frost-mobile: media query in css for tablets
expire issue
rev update
2012-08-06 13:18:00 -04:00
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
Fabrixxm
4062312e9c
quattro: collaps threaded items
2012-08-06 04:48:24 -04:00
Fabrixxm
fd7ea5cc91
quattro: support threaded comments
2012-08-05 16:55:20 -04:00
Christian Vogeley
e6067e6694
Frost-mobile: media query in css for tablets
...
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
2012-08-05 16:08:07 +02:00
Domovoy
e247915f48
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
include/conversation.php
2012-08-05 13:43:53 +02:00
Simon L'nu
3d0fc813dc
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
missed an instance of $mobileapp in switch to generic app label
ImageMagick rotates CW while imagerotate() rotates CCW
update main frost version
update version and todo
-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
put back notags
fix angle char storage and transmission, rev update
Darkzero/NS .contact-photo-menu
rev update
2012-08-04 23:41:51 -04:00
Zach Prezkuta
ed9811762d
missed an instance of $mobileapp in switch to generic app label
2012-08-04 21:05:25 -06:00
Zach Prezkuta
1f8182a453
update main frost version
2012-08-04 14:05:56 -06:00
Zach Prezkuta
849720f160
update version and todo
2012-08-04 14:04:18 -06:00
Zach Prezkuta
63628910b2
-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
...
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
Domovoy
8742beb772
Flatten children when threads are disabled
2012-08-03 22:28:21 +02:00
Domovoy
75700a725e
Comment box is inside the item
2012-08-03 19:18:56 +02:00
Domovoy
66848b0471
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
update.php
2012-08-03 18:57:37 +02:00
Thomas Willingham
208019ea9c
Darkzero/NS .contact-photo-menu
2012-08-03 03:07:29 +01:00
Simon L'nu
9433d229ed
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
rev update
Changed markdown to enable diaspora postings with images that contain links
bbcode: two new bbcode elements (style, class) for CSS
Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
network: Caching of images
scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
Further performance improvements
Speed improvements in the database
2012-08-02 12:46:36 -04:00
Michael Vogel
b904a21134
Merge remote branch 'upstream/master'
2012-08-02 10:27:11 +02:00
Simon L'nu
31eff37693
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
ugly fix to make editplain work
quattro: readd sparkle cursor
quattro: style for "show more" addon
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
logic was reversed - should work now
fix almost all errant divs in view/ and frost folders
Provide backend ability to poke as a comment rather than top-level post
rev update
2012-08-01 22:59:54 -04:00
Zach Prezkuta
3e8e1ab830
ugly fix to make editplain work
2012-08-01 19:09:28 -06:00
Michael Vogel
04c31d194f
Merge remote branch 'upstream/master'
...
Conflicts:
update.php
2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2
bbcode: two new bbcode elements (style, class) for CSS
2012-08-02 00:13:37 +02:00
Fabrixxm
fde3edaa21
quattro: readd sparkle cursor
2012-08-01 04:45:27 -04:00
Fabrixxm
bf04fb450a
quattro: style for "show more" addon
2012-08-01 04:41:21 -04:00
friendica
14282a40bb
Merge pull request #419 from fermionic/more-div-problems
...
fix almost all errant divs in view/ and frost folders
2012-07-31 21:58:08 -07:00
Zach Prezkuta
fc22c356ff
fix almost all errant divs in view/ and frost folders
2012-07-31 22:43:18 -06:00
friendica
764ee653ba
Provide backend ability to poke as a comment rather than top-level post
2012-07-31 20:59:51 -07:00
Simon L'nu
0e7f6d1417
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix /display bug; oembed audio bug; other tweaks
Frost: reduce DOM elements by about 20%; other tweaks and fixes
rev update
errant div in events_reminder.tpl
pass deleted flag to display
rev update
fix filer bug; some interface tweaks
Update view/theme/frost/nav.tpl
Update view/theme/frost-mobile/nav.tpl
don't show birthday/event details on mobile devices
rev update
remove server-specific change
update version of frost and frost-mobile
Modify Javascript to improve page loading times
rev update
Friendicaland got bigger.
2012-07-31 23:16:56 -04:00
Zach Prezkuta
885bb50f0d
fix /display bug; oembed audio bug; other tweaks
2012-07-31 18:53:18 -06:00
Zach Prezkuta
b522ffeea5
Frost: reduce DOM elements by about 20%; other tweaks and fixes
2012-07-31 08:00:50 -06:00
Zach Prezkuta
72df6ff664
errant div in events_reminder.tpl
2012-07-30 07:59:08 -06:00
Domovoy
07f87848b4
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e
fix filer bug; some interface tweaks
2012-07-29 14:49:12 -06:00
Domovoy
30d7db5e42
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-07-29 22:43:49 +02:00
fermionic
4f13618b18
Merge pull request #414 from 23n/patch-1
...
Update view/theme/frost-mobile/nav.tpl
2012-07-29 12:36:22 -07:00
Domovoy
2fc0fcdc18
Unlimited level threading is now a site option.
2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9
Update now handles threaded items.
2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342
Collapsing is back for threaded comments.
...
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
2012-07-29 17:13:21 +02:00
23n
5b5e4b6cb7
Update view/theme/frost/nav.tpl
...
moved identity/page management-link to system-menu
2012-07-29 15:28:59 +03:00
23n
0f1b33a278
Update view/theme/frost-mobile/nav.tpl
...
move identity management link to menu
2012-07-29 15:07:52 +03:00
Domovoy
10eb873f7c
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-07-29 10:03:17 +02:00
Zach Prezkuta
38d4df77c6
remove server-specific change
2012-07-28 10:14:28 -06:00
Zach Prezkuta
231b37217b
update version of frost and frost-mobile
2012-07-28 10:03:56 -06:00
Zach Prezkuta
1f09e7ad23
Modify Javascript to improve page loading times
...
1. Add template category 'end' that places content right before final </body> tag
2. Move most Javascript from tpl files into one cacheable file, theme.js
3. Load scripts at end of the HTML document instead of in the header
4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
Domovoy
eaf0d04bfb
Comment box is now inside the item. Makes it easier to know what we are commenting on.
2012-07-27 22:58:51 +02:00
Domovoy
d558d25540
CommentBox is now hidden by default, this can be toggled with a fake link
2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db
Threaded comments are starting to work.
...
For now, only on normal view, and not during update
2012-07-27 22:08:57 +02:00
Simon L'nu
c5603cf756
fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:35:50 -04:00
Simon L'nu
794ae669ce
fixes to cursor
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:28:09 -04:00
Fabrixxm
727c93cb8c
quattro: add id to items container div
...
needed to make commit 4c6a4321
2012-07-25 08:12:21 -04:00
Zach Prezkuta
2e080f594e
update head.tpl for dispy
2012-07-24 18:29:23 -06:00
friendica
57a75d240b
Merge pull request #406 from fermionic/frost-theme
...
Introducing Frost
2012-07-24 15:28:16 -07:00
Zach Prezkuta
9378bc1375
disable tos and privacy links
2012-07-24 09:27:27 -06:00
Zach Prezkuta
178329b6dc
disable tos and privacy links
2012-07-24 09:26:12 -06:00
Zach Prezkuta
f9809102a2
Introducing Frost Mobile
2012-07-24 09:16:51 -06:00
Zach Prezkuta
8126e8ea47
Introducing Frost
2012-07-24 09:15:57 -06:00
friendica
aa5e60248a
Merge pull request #405 from fermionic/support-for-mobile-themes
...
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
Zach Prezkuta
5cb979f5e4
changes to support a mobile theme
2012-07-23 20:37:00 -06:00
friendica
b20a80bf39
rev update
2012-07-23 15:27:25 -07:00
friendica
0ff93edeee
poke privacy
2012-07-20 04:03:32 -07:00
friendica
d1243c9ad7
allow to prefill - url/poke?f=&c=nn - nn is contact id
2012-07-19 20:54:23 -07:00
friendica
a54278649f
poke notifications
2012-07-19 20:13:40 -07:00
friendica
b78bd8cc94
duplicate input names
2012-07-19 19:48:33 -07:00
friendica
d442bbc482
have fun...
2012-07-19 18:17:16 -07:00
Martin Schmitt
eae6e665c0
Esperanto -> 100%
2012-07-16 22:33:23 +02:00
Simon L'nu
021f0829e6
re-add the sparkle stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-15 12:03:53 -04:00
friendica
15cae001d9
move plink sparkles to the right html element in dispy
2012-07-13 04:22:42 -07:00
Simon L'nu
10ce535cac
add doctitle thingy, and update cursor
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 04:35:16 -04:00
Simon L'nu
d08a97bb9f
add some sparkle ;)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 02:37:45 -04:00
Thomas Willingham
bd08a6b565
Add sparkle cursor to Quattro/Vier/TestBubble
2012-07-12 19:21:21 +01:00
friendica
085b589468
add some sparkle to plinks
2012-07-11 21:04:08 -07:00
tomtom84
f475850739
diabook: add notification in website-title, whenever new notifications arrive
2012-07-08 21:50:17 +02:00
Vasudev Kamath
ba4db236ec
Merge branch 'master' of git://github.com/friendica/friendica
2012-07-06 22:47:27 +05:30
friendica
8b19168999
a bit more colour
2012-07-05 22:20:27 -07:00
friendica
f40b056e3b
some initial code and benchmarking for "red" content rendering engine
2012-07-04 20:37:15 -07:00
friendica
fd626022ec
add smarty engine, remove some obsolete zot1 stuff
2012-07-03 22:23:08 -07:00
Thomas Willingham
badaa68340
Diabook directory wide variants.
2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc)
424797138f
Limiting .directory-photo-wrapper styles to <section> so as not to
...
interfere with .directory-photo-wrapper in <aside>
2012-07-03 21:49:02 +03:00
friendica
f7144e671c
fix diabook directory pages (only the normal style - any volunteers for the wide?)
2012-07-02 16:56:37 -07:00
Thomas Willingham
74a819980f
Various theme stuff.
...
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
2012-07-02 03:40:12 +01:00
friendica
696d78d658
Merge pull request #369 from rdc/master
...
Added more profile data and CSS styling to the /directory page
2012-07-01 16:44:21 -07:00
Martin Schmitt
85c078f862
Esperanto -> 100%
2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5
Added more profile data and CSS styling to the /directory page
2012-07-01 14:46:03 +03:00
friendica
31718968c6
advanced profile theming
2012-06-30 01:29:29 -07:00
Fabrixxm
a03e6b96ea
quattro: fix Forum widget, hide edit profile link
2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff
quattro: some updates
...
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
2012-06-29 05:29:58 -04:00
friendica
be658788de
maintain page position when hovering on pop-outs
2012-06-28 22:19:12 -07:00
Simon L'nu
ecf9ad9a08
fix item-delete-selected* css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-28 12:15:32 -04:00
friendica
eb3bbd9081
insidious little parsing bug
2012-06-26 22:32:07 -07:00
friendica
f995a11641
have no idea why the if/endif macro block was getting printed and not processed.
2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd
highlight js events-reminder on birthday events
2012-06-27 13:49:35 +10:00
friendica
359a98cd22
change event behaviour so that title is required but description is not
2012-06-25 21:20:08 -07:00
friendica
fbaca4b742
event summary/title
2012-06-25 20:55:27 -07:00
Simon L'nu
eb6bf7e7fa
fix margin of wall-item-body
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:42:18 -04:00
Simon
d944ff7833
Merge pull request #361 from simonlnu/master
...
cleaned up the css a bit
2012-06-25 14:25:33 -07:00
Simon L'nu
2ed3af55a8
fix delete thingy, and minor clean up
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc)
51ef8fb7ff
Added App::get_cached_avatar_image usage for displaying "Last users"
...
avatar thumbs in right sidebar
2012-06-25 14:01:16 +03:00
friendica
35a098e0dc
service limits for photo uploads
2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea
implement "follow" service limits
2012-06-24 22:23:17 -07:00
friendica
c464bc494c
add like/dislike to profiles
2012-06-24 21:16:55 -07:00
Simon L'nu
3b1d9d9695
update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-23 13:33:58 -04:00
friendica
7614d35cad
liking comments backend
2012-06-23 04:44:48 -07:00
Vasudev Kamath
6e4760dd9c
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-23 08:11:35 +05:30
Simon L'nu
5cfa7dd041
minor tweaks to some tpl files
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-22 13:07:42 -04:00
Zach Prezkuta
54c76ca822
allow rotation either CW or CCW
2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077
Darkzero-NS fix weeks old BBIcon error
2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92
Darkzero/NS - make the archives font the same colour as the other widgets.
2012-06-21 02:42:38 +01:00
Simon L'nu
0be715d271
icon change; tweak button in toolbar; move site-location
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-20 05:04:04 -04:00
79357ec60d
Merge pull request #342 from fabrixxm/master
...
quattro: auto scroll and flash comment in display page
2012-06-19 10:12:09 -07:00
friendica
8b502bb486
position tweak
2012-06-19 03:34:31 -07:00
c2842efd3f
[DE] strings
2012-06-19 08:44:11 +02:00
Fabio Comuni
4c6a432130
quattro: in post display page, scroll to and flash selected comment
2012-06-19 06:54:41 +02:00
friendica
d614089582
make subdued elements jump out at you on hover
2012-06-17 22:50:02 -07:00
friendica
40e6d87d08
highlight the lost contact message
2012-06-14 17:41:24 -07:00
friendica
8c94fa23bf
Merge https://github.com/friendica/friendica into pull
2012-06-14 17:39:17 -07:00
friendica
be090cc851
better handling of dead contacts
2012-06-14 16:56:46 -07:00
fabrixxm
2f5e891cd1
quattro theme: show uncollapsed comments on display page
2012-06-14 09:25:18 -04:00
friendica
4229debff8
ajax append placeholder, fix some html warnings
2012-06-13 21:40:02 -07:00
friendica
920ea2e1c7
archive widget
2012-06-12 20:46:30 -07:00
Vasudev Kamath
11974b4d94
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-11 20:47:11 +05:30
Simon L'nu
1605bcd901
minor template update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-09 18:07:19 -04:00
friendica
52d90674ea
better events-reminder theming
2012-06-07 18:08:15 -07:00
fabrixxm
1d832618a4
fix a random profile error message
2012-06-07 08:49:33 -04:00
friendica
d2e86bdabc
Merge https://github.com/friendica/friendica into pull
2012-06-06 22:29:35 -07:00
friendica
3b49035636
admin page untranslated strings, remove empty list element for update
2012-06-06 22:28:30 -07:00
zottel
6a95d483c7
A few corrections in German translations.
2012-06-07 01:43:32 +02:00
friendica
dd001e32f4
rev update
2012-06-06 16:02:10 -07:00
friendica
ae08d2c49b
Merge https://github.com/friendica/friendica into pull
2012-06-05 17:59:49 -07:00
c7b1b4b752
DE: update for the strings
2012-06-05 11:42:57 +02:00
Vasudev Kamath
079fdecff1
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-04 19:59:23 +05:30
friendica
fe1dc1bf98
named anchors on display page
2012-06-04 04:28:20 -07:00
b13c6ea9ad
quattro: added editor buttons to comments
2012-06-04 11:49:16 +02:00
Vasudev Kamath
12474e3c2e
Merge branch 'master' of git://github.com/friendica/friendica
2012-06-04 12:04:17 +05:30
ca105f1c66
quattro: cleanup the less file
2012-06-04 07:17:23 +02:00
Simon L'nu
34f210bc2d
fix mini photo-menu bug
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-03 18:10:04 -04:00
Zach Prezkuta
77962aa79d
Fix bugs in the retraction code
...
Currently, the following seems to be the functional status:
For a Diaspora top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete for top-level owner
Diaspora comments show up for non-owner
Diaspora comments sometimes don't delete for non-owner
-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log
Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
Diaspora likes show up
Diaspora non-owner can't unlike
-> Same as comments, seems to be Diaspora's fault
For a Friendica top-level post:
Friendica comments show up AND delete
Diaspora comments show up AND delete
Friendica likes don't show up in Diaspora sometimes
Friendica doesn't even message Diaspora for unlikes (sometimes?)
Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a
Implement relaying of relayable_retractions
...
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
959b264c44
quattro: admin panel styling and 1st buttons for addon/theme overview
2012-06-03 22:32:42 +02:00
2741ce67f8
privacy settings: make submit button translateable
2012-06-03 17:38:05 +02:00
283524d990
DE: update to the strings
2012-06-03 17:33:28 +02:00
6fbeafc843
prv messages: make submit translateable
2012-06-03 17:16:29 +02:00
friendica
d27c6de84e
add hometown to profiles
2012-06-02 20:58:20 -07:00
friendica
608d424b0b
"howlong" added to marital status.
2012-06-02 02:30:26 -07:00
friendica
1180919c89
some zero theming on settings page
2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd
transition to beta for private forums
2012-05-30 15:52:17 -07:00
friendica
88a0d6a1d5
private group tests, cont.
2012-05-29 22:57:15 -07:00
friendica
b6fe837a64
hide private group if desired
2012-05-29 18:43:56 -07:00
Simon
43c185ce04
Merge pull request #316 from annando/master
...
Speed improvements
2012-05-29 13:13:10 -07:00
Simon L'nu
dd666e93d8
fix toolbar. more size dynamicism
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-29 16:09:02 -04:00
Michael Vogel
68757f2504
Merge remote branch 'upstream/master'
2012-05-29 16:09:26 +02:00
friendica
2eafa9a475
ability to only expire contacts, not self
2012-05-29 01:14:53 -07:00
friendica
2dc7e53435
more theme cleanup
2012-05-28 19:17:06 -07:00
Simon L'nu
cb259098dd
fixed font-size/line-height stuffs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-28 19:25:10 -04:00
friendica
6962989e52
slackr - tone down the shadows a smidgin
2012-05-27 23:02:25 -07:00
Michael Vogel
a71e3134bf
Merge remote branch 'upstream/master'
2012-05-25 16:19:10 +02:00
friendica
d1345e5054
Merge https://github.com/friendica/friendica into pull
2012-05-25 00:43:09 -07:00
friendica
abb9fecf09
rev update
2012-05-25 00:42:38 -07:00
07535692dc
DE update to strings and templates
2012-05-25 06:04:33 +02:00
Simon
5bc0cfa067
Merge pull request #313 from fabrixxm/master
...
install wizard: fix php executable path
2012-05-24 16:30:22 -07:00
Simon L'nu
2a32917e3a
update dark a bit. i messed up some buttons
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-24 19:28:12 -04:00
root
60df67b9e3
fix small js error when user not logged in
2012-05-24 04:29:33 -04:00
root
a5b8339a75
install wizard: fix php executable path
...
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
2012-05-24 04:21:33 -04:00
friendica
f0ddcb979b
slackr: improve interactivity
2012-05-23 23:29:45 -07:00
friendica
6c78d42050
slackr: hide calendar when posting
2012-05-23 18:20:24 -07:00
friendica
5d06e0060d
Merge https://github.com/friendica/friendica into pull
2012-05-23 16:58:58 -07:00
friendica
60723702f1
more theme stuff
2012-05-23 16:58:31 -07:00
Simon L'nu
16f9d7fd35
clean up and more fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 19:22:07 -04:00
friendica
19bf0aa283
slackr - better highlighting of current selections
2012-05-23 16:16:59 -07:00
friendica
5b7865f8f9
slackr - knock the sharp edges off the events calendar
2012-05-23 15:55:09 -07:00
Simon
5acd0a1c32
Merge pull request #309 from fabrixxm/master
...
Update install wizard
2012-05-23 15:10:24 -07:00
Simon L'nu
5198260e3a
clean up and make nice the dispy photo edit stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 18:06:49 -04:00
Simon L'nu
789063da39
add a placeholder attribute on search-text; dispy fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
root
325343a492
Update install wizard
...
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
2012-05-23 07:38:31 -04:00
friendica
61dba985c1
photo rotation
2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef
event calendar theming
2012-05-22 22:34:35 -07:00
friendica
86a38cca24
import quattro event reminder
2012-05-22 22:06:52 -07:00
friendica
af495879af
mark bubbles unsupported
2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859
keep FB out of private notes
2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef
Merge https://github.com/friendica/friendica into pull
2012-05-22 18:06:34 -07:00
friendica
e70573f34c
if identity (uid) changes - reload any other open browser windows on next ping.
2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932
Fix darkzero/ns BB icon background colours.
2012-05-22 19:14:58 +01:00
friendica
f29f861d25
add queue totals to admin summary page
2012-05-22 03:44:03 -07:00
be64437b14
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
Simon L'nu
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon L'nu
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
friendica
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
Simon L'nu
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon L'nu
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
2ac55c9f21
fix dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Thomas Willingham
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
Michael Vogel
8c80fe0bf5
Performance tests
2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97
Darkzero, another missing part of "everything"
2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad
Diabook-dark - some more cleaning up
2012-05-19 17:20:27 +01:00
Thomas Willingham
a1b96d11a7
Okay, so maybe not *everything*
2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42
Give Darkzero some loving.
...
Everything that used to be hidden with light text on light backgrounds is legible now.
2012-05-19 14:51:10 +01:00
Simon L'nu
4a35a51724
fix -desc again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-19 03:15:35 -04:00
friendica
3821744450
apply max-width to images in posts, duepuntozero
2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
Simon L'nu
331013f281
fix admin links...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 13:33:20 -04:00
Simon L'nu
a8a3732f05
*sigh*. fix dark *again*
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:51:29 -04:00
Simon L'nu
7eb73bc600
get rid of the monstrosity for .button. need to find alternate solution
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:32:08 -04:00
Simon L'nu
fca09c9d4c
slight re-design of wall stuff and css/font cleaning
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 01:58:55 -04:00
68dc7c3568
DE strings
2012-05-15 10:44:01 +02:00
friendica
0faa0c2ab1
slackr drop shadows extended
2012-05-14 21:45:37 -07:00
Simon L'nu
db5fe14241
finish dipsy light colour fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-14 00:30:25 -04:00
tommy tomson
303856ce01
diabook-theme: small fixes
2012-05-13 20:51:39 +02:00
friendica
eaf028c9fb
Merge https://github.com/friendica/friendica into pull
2012-05-12 22:20:03 -07:00
friendica
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
Simon L'nu
93dc96e2cf
css fixes; new screenshots
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 18:53:01 -04:00
friendica
72d8e0459d
Merge pull request #294 from mschmitt/master
...
Esperanto at 100% again
2012-05-12 15:01:05 -07:00
Martin Schmitt
ae300bceb9
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.
2012-05-12 16:56:31 +02:00
Vasudev Kamath
3a45d4f9e0
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 20:20:26 +05:30
tommy tomson
9699d9cd01
diabook-theme: fix in earthlayers
2012-05-12 16:11:46 +02:00
tommy tomson
2882012e1b
diabook-theme: some fixes
2012-05-12 13:50:22 +02:00
Simon L'nu
c6897d0dc4
finished migrating dispy light - maybe
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 07:29:36 -04:00
Vasudev Kamath
10db2f00f9
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 12:10:09 +05:30
Thomas Willingham
2454028ef6
Darkzero - fixed notifications bar.
2012-05-12 00:32:47 +01:00
tommy tomson
48c48d644f
diabook-theme: update mapquery and small fix
2012-05-11 16:41:16 +02:00
tommy tomson
74e79a06a8
diabook-theme: add "population density 2010"-layer to EarthLayers-box
2012-05-11 14:56:59 +02:00
friendica
49cd3f615d
Merge https://github.com/friendica/friendica into pull
2012-05-11 04:05:25 -07:00
tommy tomson
f9d5e602ac
diabook-theme:small fix
2012-05-11 13:04:25 +02:00
friendica
7600b9b1ee
Merge https://github.com/friendica/friendica into pull
2012-05-11 03:42:05 -07:00
friendica
496782e468
moderated comment templates
2012-05-11 03:41:29 -07:00
tommy tomson
e13e5070a7
diabook-theme: small fix
2012-05-11 09:01:58 +02:00
tommy tomson
a81faead6e
diabook-theme: include prv_message autocomplete
2012-05-11 08:39:39 +02:00
friendica
8a5dcf64d8
fix PM replies after autocomplete changes
2012-05-10 20:01:13 -07:00
tommy tomson
b2bd25a470
Merge remote-tracking branch 'origin/master'
2012-05-11 02:40:09 +02:00
tommy tomson
ccc825ccbc
diabook-theme: small fix
2012-05-11 02:39:54 +02:00
Thomas Willingham
e7b8e839ae
Diabook-dark. More touchups.
2012-05-10 17:14:27 +01:00
friendica
c5f6755bdd
specified background image does not exist
2012-05-10 05:49:48 -07:00
tommy tomson
3ac5d19b92
diabook-theme: some fixes
2012-05-10 12:19:51 +02:00
friendica
c9bb888611
priv mail autocomplete, improved contrast for darkzero, etc.
2012-05-10 02:01:08 -07:00
friendica
93ae6ee97b
Merge https://github.com/friendica/friendica into pull
2012-05-10 01:46:29 -07:00
friendica
774c51cc19
email autocomplete
2012-05-10 01:45:51 -07:00
tommy tomson
7b41c0a555
Merge remote-tracking branch 'origin/master'
2012-05-10 09:54:47 +02:00
tommy tomson
69b43582d0
diabook-theme: some css/bug-fixes
2012-05-10 09:54:16 +02:00
Simon L'nu
a077e63fa5
don't make -desc so obnoxious looking
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-10 02:27:48 -04:00
Thomas Willingham
89d3ce7b5d
Diabook-dark - do things the right way instead of the stupid way.
2012-05-09 04:54:17 +01:00
Thomas Willingham
d2bbd92889
Fix TinyMCE, but needs adding to theme.php
2012-05-09 03:42:09 +01:00
Thomas Willingham
8a1f8515ca
Fix jquery.fancybox, but still needs adding to theme.php
2012-05-09 03:31:56 +01:00
Thomas Willingham
a0293ae442
Diabook-dark cleaned up a bit.
2012-05-09 03:21:26 +01:00
friendica
a048fd806a
don't provide 'show more' on remote friends in common unless there are actually more
2012-05-08 17:40:56 -07:00
d2c2063084
DE update for the strings
2012-05-08 09:56:05 +02:00
tommy tomson
88443ed3fb
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
2012-05-08 03:29:25 +02:00
friendica
e8b9b8a403
separate poll_interval from delivery_interval - default is the same.
2012-05-07 04:21:54 -07:00
Simon L'nu
e554530430
more css tweaks. nothing major
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
tommy tomson
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
Simon L'nu
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
tommy tomson
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
tommy tomson
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
friendica
8f26e698e6
Merge pull request #289 from cvogeley/master
...
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
Christian Vogeley
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
Simon L'nu
20ea1b7d4b
fix lightbox; finished dark, now on to light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-04 17:06:17 -04:00
Martin Schmitt
52f4563f30
Esperanto 100%
2012-05-04 12:02:05 +02:00
friendica
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
22c8fe46a5
DE strings
2012-05-04 07:30:49 +02:00
friendica
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
Ludovic Grossard
1f86205ee8
proofreading the mail templates in fr
...
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
Simon L'nu
bb081e4bf5
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:35:21 -04:00
Simon L'nu
1a13c56fef
major reworking of dispy dark. light to follow
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:25:18 -04:00
tommy tomson
d72db2e1aa
diabook-theme: small fix
2012-05-03 07:57:40 +02:00
tommy tomson
ff2ddc319d
diabook-theme: small fix
2012-05-03 06:25:23 +02:00
tommy tomson
3521e22333
diabook-theme: made boxes at right_aside sortable
2012-05-03 06:05:55 +02:00
Max Weller
f0c11cac4a
Moved Meta Viewport from global head.tpl to diabook's header
...
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.
I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534
diabook-theme: tryied to improve performance a bit
2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b
diabook-theme: fix footer/impressum
2012-05-02 12:40:51 +02:00
friendica
1fab28c413
fix size
2012-05-01 20:38:06 -07:00
friendica
066d69b21c
add template
2012-05-01 20:22:59 -07:00
friendica
8bd6e1aef9
first try common friends for visitors
2012-05-01 19:16:18 -07:00
Thomas Willingham
671a10f5d4
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
2012-05-01 21:37:49 +01:00
tommy tomson
ab556857f0
diabook-themes: small fix at "community pages"-box
2012-05-01 16:46:08 +02:00
Simon L'nu
6d3ba2825b
lighten bg and darken font on dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
e245ecddf2
sub-minor change to head.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: add "community profiles"-box to right_column
change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
rev update
start adding tooltips to tab menus
fix join group notifications
* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f
diabook-themes: add "community profiles"-box to right_column
2012-05-01 06:21:40 +02:00
friendica
a3a55897e5
Merge https://github.com/friendica/friendica into pull
2012-04-30 19:04:28 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60
diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
2012-05-01 02:33:55 +02:00
Simon L'nu
9b7dac6ce1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
provide "xxx joined yyy" notifications
adding META viewport tag for better look on tablets
Update Esperanto to 100%
DE update to the strings
activitystreams schema constants for "join group"
missed a db field
typo in profile_selectors, fix remote tagging
not all profile selector choices have unique or direct translations
log db error strings in all cases
admin page to manage failed updates
improved db error logging
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664
Merge pull request #277 from mschmitt/master
...
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
Max Weller
9d8a0553ac
adding META viewport tag for better look on tablets
2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab
Update Esperanto to 100%
2012-04-30 09:00:03 +02:00
f08dc392df
DE update to the strings
2012-04-30 08:39:12 +02:00
friendica
0153d86b7f
admin page to manage failed updates
2012-04-29 19:10:07 -07:00
Simon L'nu
34eb843fb4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
the heart should really be red.
fix location change notification
enhanced profile reporting for single values
add db field for removed account, which will also be the first test of update error checking
toggle to archive unfriends, though render them useless
indicate successful updates
diabook-themes: small fix
diabook-themes: bug/css-fixes
some constants for the db update failure possibilities
bring back the email and logging of update failures, but without the transactions
* master:
2012-04-29 22:06:16 -04:00
tommy tomson
920d40acf4
diabook-themes: small fix
2012-04-29 05:58:23 +02:00
tommy tomson
3d054341ef
diabook-themes: bug/css-fixes
2012-04-29 04:12:04 +02:00
friendica
7919d00399
bring back the email and logging of update failures, but without the transactions
2012-04-28 17:50:28 -07:00
Simon L'nu
ecd1dab373
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
a few more continues that should be returns
small bugfix. sometimes also avatar pics were rescaled
* master:
2012-04-28 20:16:25 -04:00
Christian Vogeley
3f586bb962
small bugfix. sometimes also avatar pics were rescaled
2012-04-28 20:15:10 +02:00
Simon L'nu
c661dc502f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
break up poller into separate processes
add tooltip title to common_tabs
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
Diabook-dark update, it's almost useable now (if you're lenient).
Added "important changes" to admin menu for admins who don't follow the github properly.
* master:
2012-04-28 05:29:03 -04:00
friendica
f163aed66d
break up poller into separate processes
2012-04-27 23:17:40 -07:00
friendica
3bb06cc3e4
add tooltip title to common_tabs
2012-04-27 19:47:52 -07:00
Thomas Willingham
4b553de79f
Diabook-dark update, it's almost useable now (if you're lenient).
2012-04-28 03:01:27 +01:00
Simon L'nu
3bfa3f2a13
fix #search-text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Thomas Willingham
adc2fc18a5
Added "important changes" to admin menu for admins who don't follow
...
the github properly.
2012-04-28 01:25:55 +01:00
friendica
26c53580d1
implement contact archival
2012-04-27 17:17:58 -07:00
Christian Vogeley
731379fa25
another attempt to fix lower tab behaviour on small screens, community back in tab area
2012-04-27 23:48:44 +02:00
Simon L'nu
64f3af49fa
remove extra netsearch-box and fix
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu
d0d79196ba
fix contact-friend stuff on profile sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 13:31:06 -04:00
Vasudev Kamath
214ec91a3f
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-27 22:43:26 +05:30
friendica
4b92e3543c
Merge https://github.com/friendica/friendica into pull
2012-04-27 02:31:37 -07:00
friendica
266eaae439
put community back on the lower tab. It belongs with message streams
2012-04-27 02:30:49 -07:00
Simon L'nu
deae1df3be
fix some css errors
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
friendica
153534bc70
Merge https://github.com/friendica/friendica into pull
2012-04-27 01:10:33 -07:00
friendica
f06a554e05
fix view contacts
2012-04-27 01:10:09 -07:00
Simon L'nu
b936e3a18a
fix 2 issues. contacts img in finder; wall filer title
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00
friendica
a1f94ac59f
reset qcomment selector after insert.
2012-04-26 21:53:40 -07:00
friendica
d3992b78e6
put fakelink back in birthday notice
2012-04-26 20:08:57 -07:00
friendica
dee36c1b04
birthday contact link goes to event page instead of remote profile
2012-04-26 20:02:42 -07:00
friendica
dd33599a1d
Merge https://github.com/friendica/friendica into pull
2012-04-26 19:56:25 -07:00
friendica
3c6cf1f19c
make comment edit icons look more like base theme
2012-04-26 19:55:20 -07:00
Simon L'nu
8834944952
fix s/color/colour/g issue
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 20:13:11 -04:00
friendica
3ee998dbaf
Merge pull request #267 from tomtom84/master
...
add link "remove account" to /mod/settings.php
2012-04-26 15:33:34 -07:00
Simon L'nu
d6116b6979
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 16:14:42 -04:00
tommy tomson
328568943e
diabook-themes: small-fix
2012-04-26 21:07:46 +02:00
friendica
82abb14bf9
Merge pull request #265 from cvogeley/master
...
cleanzero theme added
2012-04-26 01:35:50 -07:00
Simon L'nu
c1f1974e44
convert stylesheets to less, and compress output css
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 02:38:18 -04:00
Thomas Willingham
20a9cdfc90
Diabook-dark more CSS fixes.
...
Slowly getting there.
2012-04-25 23:40:40 +01:00
Christian Vogeley
43a257f2f6
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:30:04 +02:00
Christian Vogeley
28370e320f
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:28:13 +02:00
Christian Vogeley
c0d4e39052
added BBCODE thing in comments
2012-04-25 21:08:31 +02:00
Christian Vogeley
4c1398c6b1
add cleanzero theme
2012-04-25 19:09:46 +02:00
friendica
37bc00094e
this turns out to be harder than I thought
2012-04-25 01:36:22 -07:00
friendica
38e822320c
Merge pull request #264 from mschmitt/master
...
Esperanto at 100% again
2012-04-25 00:25:05 -07:00
friendica
50f10a4fd7
Merge https://github.com/friendica/friendica into pull
2012-04-25 00:14:20 -07:00
friendica
ba0ade3380
cleanup - make bb-buttons vanish when comment closed
2012-04-25 00:13:36 -07:00
Martin Schmitt
15f7125df2
Esperanto at 100% again
2012-04-25 08:50:02 +02:00
tomtom84
5187faa595
Merge pull request #263 from tomtom84/master
...
diabook-themes: fix css to login.tpl
2012-04-24 18:42:32 -07:00
tommy tomson
9fe6333fd4
diabook-themes: fix css to login.tpl
2012-04-25 03:38:21 +02:00
friendica
5af80dbb89
restore qcomment selector
2012-04-24 18:23:48 -07:00
tommy tomson
e72eaf2408
zero-themes: add bbcode-toolbar to commentbox
2012-04-25 02:43:50 +02:00
tommy tomson
08b990a314
diabook-themes: small fix
2012-04-25 00:19:57 +02:00
friendica
5ebc221c28
Merge pull request #261 from fabrixxm/eventspage
...
Some tweak on events page and events/bitrhdays reminder
2012-04-24 14:50:22 -07:00
Thomas Willingham
a28fea987e
Diabook-dark css fix
2012-04-24 20:07:08 +01:00
Thomas Willingham
fade45ca76
Diabook-dark, couple of new icons, and another css fix.
2012-04-24 20:00:49 +01:00
Fabio Comuni
c9a8dbc322
quattro: small week calendar view for event/birthday reminders
2012-04-24 09:50:44 +02:00
Fabio Comuni
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
Fabio Comuni
fc61616c53
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
2012-04-24 08:12:30 +02:00
Martin Schmitt
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
Thomas Willingham
9443248fad
Improvements to diabook-dark
...
Still a long way to go, but some icons and a few CSS fixes
2012-04-24 04:55:39 +01:00
af7abcea27
DE strings, correction of a typo
2012-04-23 20:55:48 +02:00
tommy tomson
a305cf9f5c
diabok-themes: fixed bug in green-wide and dark-wide
2012-04-23 18:42:37 +02:00
tommy tomson
c5c419a785
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
2012-04-23 17:22:22 +02:00
tommy tomson
d072c12e7d
diabook-themes: bugfix in admin-section
2012-04-23 15:47:18 +02:00
tommy tomson
e74ae8b031
diabook-themes: bugfix
2012-04-22 23:58:34 +02:00
tommy tomson
d6c8a14fb0
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
2012-04-22 22:31:44 +02:00
9434b447f3
DE strings update
2012-04-22 13:13:27 +02:00
tommy tomson
c0a377e0de
diabook-themes: comment-bbcode-bugfix
2012-04-22 12:59:00 +02:00
Vasudev Kamath
f1d84c1045
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-22 12:08:05 +05:30
Simon L'nu
203aa819e2
fix tinymce theming
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-22 01:22:29 -04:00
tommy tomson
fe6567cb88
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
2012-04-22 03:15:06 +02:00
Simon L'nu
7a14f45904
fix checkbox/radio buttons for some browsers
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 20:18:47 -04:00
tommy tomson
8809e96310
diabook-themes: add diabook-dark
2012-04-21 01:06:17 +02:00
Vasudev Kamath
8465ad6e1e
Few more files with unnecessary executable permissions
2012-04-21 00:22:48 +05:30
tommy tomson
e052be606c
diabook-themes: add diabook-green and some minor css/bug-fixes
2012-04-20 17:16:42 +02:00
Simon
0e25376e4a
Merge pull request #254 from simonlnu/master
...
add some knobs to comment boxes
2012-04-20 03:43:55 -07:00
fabrixxm
16c308791f
Merge pull request #253 from fabrixxm/master
...
fix bug n385
2012-04-20 03:42:50 -07:00
Simon L'nu
5d2dd5798b
fix the buttons. don't hide the buttons once shown
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 06:42:08 -04:00
Simon L'nu
eb9ddb884a
optimise imgs; add some comment editing knobs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 05:56:54 -04:00
Fabio Comuni
6af5a3a485
escape email template var names. fix bug n385.
2012-04-20 11:39:36 +02:00
Fabio Comuni
3bb785fdad
Merge remote-tracking branch 'CatoTH/master' into req245
2012-04-20 09:25:51 +02:00
tommy tomson
f5f1956e8b
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
2012-04-20 01:44:21 +02:00
Simon L'nu
05173d0a8a
fix .item-select
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 13:02:41 -04:00
Simon L'nu
4fd1a17f06
tweak drop-down and add in filebrowser
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 12:54:53 -04:00
fabrixxm
44f4b4b9d1
Merge pull request #248 from fabrixxm/tmcefilebrowser
...
TinyMCE file browser
2012-04-19 00:30:45 -07:00
Martin Schmitt
25f6753a1f
Hadn't merged fixed typo from upstream.
2012-04-19 06:51:52 +02:00
Martin Schmitt
7e3c183601
EO translation fixes
2012-04-19 06:45:54 +02:00
Fabio Comuni
fddf21d983
filebrowser: fix style, show 10 recent photos if not in an album
2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455
filebrowser: more style, load min and max scale photos
2012-04-18 14:56:03 +02:00
Fabio Comuni
56efb42223
tinymce: add inlinepopups plugin
2012-04-18 14:55:21 +02:00
Fabio Comuni
e2e6b56c44
tinymce: add filebrowser for photos and attached files
2012-04-18 13:23:42 +02:00
Simon L'nu
a30ea16218
only affect immediate li children
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:17:20 -04:00
Simon L'nu
311f39f12f
fix silly abandonded typo. shouldn't affect translations
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04:00
Simon L'nu
af3e37ce20
fix alignment issues with toolbar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 05:59:50 -04:00
Tobias Hößl
b885fedee1
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:36:48 +00:00
Tobias Hößl
d7e750ad74
XSRF protection and PHPdoc for mod/admin.php
2012-04-18 07:24:47 +00:00
tommy tomson
1b6c84d8f4
diabook-themes: some css/bug-fixes
2012-04-18 02:36:30 +02:00
Martin Schmitt
2fbd5127ba
messages.po/strings.php at 100% Esperanto
2012-04-17 22:50:44 +02:00
tommy tomson
5b407b5ee7
diabook-themes: theme-settings: "wide"-option and new screenshots
2012-04-17 19:45:53 +02:00
Simon L'nu
f4ff75cace
[SECURITY] finish ripping out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:21:30 -04:00
Simon
04af5d9e2c
Merge pull request #241 from simonlnu/master
...
rip out fpostit
2012-04-17 10:16:56 -07:00
Simon L'nu
1b2209fb3c
rip out fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:15:11 -04:00
dbff4252d4
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-17 18:07:20 +02:00
757e3429ac
update to the German string files
2012-04-17 18:06:28 +02:00
tommy tomson
b30c761aae
diabook-themes: removed fpostit due to security issues and small fix in german translation
2012-04-17 16:15:49 +02:00
Simon L'nu
68e1523496
finally fix the ui in the settings. it was fugly.... other bug fixes too
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 00:26:37 -04:00
tommy tomson
f08844a8a5
diabook-themes: bugfix (sry, necessary)
2012-04-16 19:23:11 +02:00
tommy tomson
15dc8f4b21
diabook-themes: small bug/css-fixes ---> ver. 1.019
2012-04-16 18:51:08 +02:00
tommy tomson
b32a731517
diabook-themes: bug-fixes
2012-04-16 17:12:08 +02:00
tommy tomson
947b6073b1
diabook-themes: minor bugfixes
2012-04-16 16:05:29 +02:00
friendica
93df525f5c
Merge pull request #238 from annando/master
...
API: Support of the statusnet application
2012-04-15 16:00:07 -07:00
tommy tomson
b5c164bf2f
diabook-themes: css-fixes
2012-04-15 19:58:26 +02:00
friendica
c4e8ef330e
where did this "lang" string come from and why?
2012-04-15 06:04:54 -07:00
Simon L'nu
6a2f0eb475
REALLY fix fpostit this time
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 03:18:55 -04:00
Simon L'nu
d836be1dc3
fix fpostJS, add and fix some other stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 02:13:36 -04:00
tommy tomson
dddf3307af
diabook-themes: added js for auto-growing comment-textareas
2012-04-15 04:39:33 +02:00
tommy tomson
170c15ceb9
diabook: theme-settings: add a wide-option
2012-04-15 02:50:16 +02:00
friendica
31b1d353b2
Merge pull request #234 from copyninja/master
...
Executable permisson removal on files which are not elf/script
2012-04-14 14:50:54 -07:00
Simon L'nu
6278b2a923
string fix: typo. slow down scroll to top in dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Vasudev Kamath
41d74c0868
Another bunch of executable permission removal
2012-04-14 20:16:06 +05:30
Vasudev Kamath
626bb57e1d
Removed execution permission: lintian warning in Debian packaging
2012-04-14 20:04:54 +05:30
friendica
6591b292a1
bogus empty list element in dfrn_request page when emailnet not enabled
2012-04-14 05:32:31 -07:00
Michael Vogel
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
Simon L'nu
96cda3136b
lighten wrapper shadow a bit on dispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 20:14:09 -04:00
Simon L'nu
6b46fe3dfe
neat little changes. hopefully the shadow will be well recieved
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 19:30:07 -04:00
friendica
bfb821e918
well that was a silly mistake...
2012-04-13 16:12:06 -07:00
tommy tomson
a300616bcb
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 22:08:13 +02:00
tommy tomson
2c843466a9
diabook: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 21:34:21 +02:00
tommy tomson
615cd53e51
diabook-themes: small fixes
2012-04-13 18:28:11 +02:00
Fabio Comuni
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
Fabio Comuni
469710893d
quattro: language icon in navbar
2012-04-13 11:56:56 +02:00
Fabio Comuni
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
2012-04-13 11:56:21 +02:00
Fabio Comuni
fdf50b8574
display settings: show theme screenshot on page load
2012-04-13 11:55:36 +02:00
Fabio Comuni
7aa3b92f4c
quattro: add admin theme settigs. darker items background with a bottom border.
2012-04-13 11:21:15 +02:00
Fabio Comuni
138a0e06b8
admin: change global theme settings
2012-04-13 11:20:05 +02:00
Fabio Comuni
8be7b5c65b
quattro: work on
...
"like" activitiy items less visible
fixes to widths
popup notification out of navbar
category input in jot
2012-04-13 09:43:38 +02:00
friendica
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
Michael Vogel
572678fef9
Merge commit 'upstream/master'
...
Conflicts:
include/dba.php
2012-04-13 00:10:41 +02:00
tommy tomson
e3af552bbf
diabook-themes: fixed css for settings aside-links
2012-04-12 22:00:18 +02:00
tommy tomson
39009b5ac9
diabook-themes: css-fixes in aside
2012-04-12 20:23:03 +02:00
tommy tomson
3a8e6cbacb
fix css in aside
2012-04-12 17:37:55 +02:00
Fabio Comuni
309f2bfa5f
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
2012-04-12 09:17:35 +02:00
Fabio Comuni
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
2012-04-12 08:40:17 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Simon L'nu
c21244f679
fix the icons a bit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-12 01:08:02 -04:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
tommy tomson
a1d5026abf
diabook-themes: small fix
2012-04-11 18:49:07 +02:00
Simon L'nu
c79d1deb92
major refactor. step 1
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-11 01:59:33 -04:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
Tobias Hößl
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
tommy tomson
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
Simon L'nu
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
friendica
2d23c8a246
Merge pull request #218 from campino/master
...
db errors and update error mail
2012-04-09 16:53:23 -07:00
tommy tomson
0d4fab4ee3
bbcode toolbar attached to the comment text field
...
minor css-fixes
2012-04-10 00:55:39 +02:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
tommy tomson
d25a9df996
diabook-themes: small icon fix
2012-04-09 19:56:53 +02:00
Alexander Kampmann
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 16:56:37 +02:00
tommy tomson
c27c340de1
diabook-nav-icons with gradient
2012-04-09 16:41:23 +02:00
Alexander Kampmann
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
Michael Vogel
894e126c55
API: Tweetdeck is now working
2012-04-09 11:49:33 +02:00
zottel
5183d4f77d
Some new German translations
2012-04-09 02:30:18 +02:00
Alexander Kampmann
0d60dbef31
added exceptions to dba class
...
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines.
added admin email on failed updates
added german translation for admin email
2012-04-09 00:45:10 +02:00
tommy tomson
7d018f651d
fixed z-index of youtube-vids
...
fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
friendica
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00
Michael Vogel
ce0eac44b5
Merge commit 'upstream/master'
2012-04-08 10:07:39 +02:00
Simon L'nu
01961f7caa
minor dispy* fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-07 23:46:47 -04:00
tommy tomson
f931d5c918
diabook-themes: small fix
2012-04-07 19:56:00 +02:00
Michael Vogel
17d097124c
"vier": Some design stuff
2012-04-07 18:35:37 +02:00
Michael Vogel
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
tommy tomson
1c0700f371
changelog 1.014 :
...
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section
css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
2012-04-07 16:39:43 +02:00
Michael Vogel
7308dbae28
"vier": Bookmarks now look better.
2012-04-07 01:19:07 +02:00
tomtom84
adf3ad5fd6
Merge pull request #210 from tomtom84/master
...
fixes in diabook-derivates
2012-04-06 04:29:01 -07:00
eb6370fa41
small fixes for the German strings
2012-04-06 12:43:20 +02:00
tommy tomson
f980b79edc
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
afd2bf031e
update to the German strings
2012-04-06 09:37:50 +02:00
Michael Vogel
34d268544e
Merge commit 'upstream/master'
2012-04-06 00:00:46 +02:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
Simon L'nu
df82affe2f
finish styling category tags and category input
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-05 00:04:23 -04:00
Simon L'nu
9ee424c1e3
style categorytags
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:47:35 -04:00
Simon L'nu
8e5489846d
update the dispy* templates
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:35:07 -04:00
friendica
c4ca21a762
move alert box away from nav links
2012-04-04 19:13:41 -07:00
Simon L'nu
922d690d1e
latest changes are the popup menu for notifs, fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 02:19:39 -04:00
friendica
1e02fd8a72
Merge branch 'pull'
2012-04-03 19:16:59 -07:00
friendica
3db2cf76b9
remove loozah themes which fell too far behind to recover
2012-04-03 16:40:25 -07:00
tommy tomson
f0a8ef64fe
smal fix
2012-04-03 21:45:58 +02:00
tommy tomson
cd309b69e6
german translation for right_aside
2012-04-03 21:06:57 +02:00
tommy tomson
8a71191d6d
make right_aside translatable and provide german translation...
...
and some css-fixes
2012-04-03 20:59:00 +02:00
Michael Vogel
81dfb61f93
API: template for test function added
2012-04-02 22:36:05 +02:00
Michael Vogel
3dc317dcc6
Merge commit 'upstream/master'
2012-04-02 22:00:22 +02:00
tommy tomson
6dfd55668f
diabook-themes: css-fixes
2012-04-02 20:30:27 +02:00
tommy tomson
076b1b374b
diabook-themes: fixes in js
2012-04-02 18:16:58 +02:00
tommy tomson
b5d57d5313
diabook-themes: fixed pageheader
2012-04-02 17:17:14 +02:00
tommy tomson
9faa940f04
diabook-themes: bugfixes / css-fixes
2012-04-02 15:06:55 +02:00
Michael Johnston
581b54c974
allow users to set categories on their posts
2012-04-01 21:28:31 -04:00
tommy tomson
23dc376364
diabook-themes: add link to global dir in "find friends" at right_aside
2012-04-02 01:29:20 +02:00
Michael Vogel
a39d8d3f02
The "vier"-theme is now working again. But there is still work needed
2012-04-02 00:08:49 +02:00
tommy tomson
408de09f72
css-fixes
2012-04-02 00:05:49 +02:00
tommy tomson
f075e977fe
add new messages-layout in diabook
2012-04-01 18:12:20 +02:00
tommy tomson
ff12637ceb
fix the display of community-plugin in diabook-themes
2012-04-01 16:34:31 +02:00
tommy tomson
15ba0ef5d0
various bugfixes and css-fixes
2012-04-01 13:12:15 +02:00
friendica
bc283f7c5d
qcomment overflow
2012-04-01 03:37:41 -07:00
friendica
ae5e5bf1e4
Merge branch 'pull'
2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
Simon L'nu
db7f7e4237
latest fixes for dispys. tweaking/repairing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-01 03:57:05 -04:00
tommy tomson
36545e554b
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 18:42:11 +02:00
tommy tomson
13ded12ffb
move the common tabs to right_aside in diabook-derivates
2012-03-31 16:58:02 +02:00
friendica
d5a31e5791
Merge branch 'pull'
2012-03-31 04:40:35 -07:00
tommy tomson
893ece9066
bug fix in diabook-aerith and -red
2012-03-31 11:50:33 +02:00
tommy tomson
0b41654935
bug-fixes in diabook-derivates
2012-03-31 11:09:57 +02:00
Simon L'nu
f5e3ec9a56
forgot the css changes for last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 04:02:51 -04:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
Simon L'nu
b88a452c6b
theme fixes; fix qcomment (finally)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 03:56:06 -04:00
Fabio Comuni
be2005f146
quattro: move quattro-green inside quattro folder.
...
Add config option to select quattro color scheme.
2012-03-30 21:21:14 +02:00
Fabio Comuni
77f57e1b13
Merge remote-tracking branch 'friendica/master'
2012-03-30 19:37:43 +02:00
tommy tomson
f50fb7d6ca
css-fixes in diabook-derivates
2012-03-30 17:52:29 +02:00
tommy tomson
6d3d882f9b
css-fixes in diabook-derivates
2012-03-30 16:33:34 +02:00
Fabio Comuni
24e7a3413c
quattro-green: remove settings code
...
Use config.php from quattro
2012-03-30 15:46:14 +02:00
Fabio Comuni
db59a45030
quattro: add config.php
2012-03-30 15:45:23 +02:00
Fabio Comuni
054d21a2e8
settings: add "display settings" tab, with UI-related settings.
...
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
tommy tomson
5b4bb347a6
css-fixes in diabook-derivates
2012-03-30 14:38:21 +02:00
8685a91742
quattro-green: added Description to the theme.php
2012-03-30 14:24:45 +02:00
b5e292509e
quattro-green: adopted quattro option for centered display
2012-03-30 14:03:33 +02:00
tommy tomson
5ced7f2bc5
add themes diabook-red & diabook-aerith
2012-03-30 13:48:34 +02:00
e2370b56bf
quattro-greey: apply theming to private mail
2012-03-30 08:10:49 +02:00
Simon L'nu
3b4016168d
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-29 20:19:43 -04:00
friendica
e935b3a225
theme file_as combobox for 2.0
2012-03-29 04:07:16 -07:00
tommy tomson
339c8a4b56
css fixes in diabook-derivates
2012-03-29 11:02:59 +02:00
fabrixxm
3ee529d095
Merge pull request #185 from fabrixxm/master
...
Updated private message pages
2012-03-28 23:47:23 -07:00
friendica
75f3d41da2
Merge pull request #184 from annando/master
...
Enhancing the API - Preparations for a better facebook export
2012-03-28 15:08:15 -07:00
tommy tomson
aa26517cdc
add a searchbox to "find friends" for global search
2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be
bugfix in diabook
2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740
Merge commit 'upstream/master'
2012-03-28 19:52:30 +02:00
Fabio Comuni
011a96d960
quattro: style pm pages
2012-03-28 15:34:02 +02:00
Fabio Comuni
50711040cb
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
Fabio Comuni
f86e909a82
Merge remote-tracking branch 'friendica/master'
2012-03-28 15:21:01 +02:00
friendica
e894775a39
Merge branch 'pull'
2012-03-28 05:16:25 -07:00
Fabio Comuni
0f2a34c23b
quattro: tpl for "file as"
2012-03-28 13:37:04 +02:00
Simon L'nu
4a75ea2f42
really fix it this time...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:47:38 -04:00
Simon L'nu
3d5e711780
WITH is going on?
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:20:13 -04:00
friendica
b58dc43148
Merge branch 'pull'
2012-03-28 03:19:42 -07:00
friendica
b18086097e
title not updated when editing post
2012-03-28 03:18:26 -07:00
Simon
c32ee4d226
Merge pull request #180 from simonlnu/master
...
duh...
2012-03-28 03:03:47 -07:00
Simon L'nu
356e654521
doh fix
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:03:04 -04:00
fabrixxm
768326e484
Merge pull request #179 from fabrixxm/master
...
new field_combobox template and some eyecandy to "file as" function
2012-03-28 03:00:24 -07:00
Simon L'nu
bcf8a571f9
add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 05:52:28 -04:00
Fabio Comuni
0a2675d8b6
filer: replace "file as" prompt with combobox opened in fancybox
2012-03-28 10:49:34 +02:00
Fabio Comuni
82106632f0
template: field_combobox
...
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
2012-03-28 10:43:52 +02:00
friendica
7fc57f486f
support autocomplete @-tags in plaintext mode
2012-03-28 00:44:45 -07:00
friendica
f95fb2667a
vier navbar messed up after default theme template move
2012-03-28 00:16:22 -07:00
friendica
47eaa97af6
Merge branch 'pull'
2012-03-27 15:21:30 -07:00
friendica
aba63f8b78
turn on gecko spellcheck in tinymce
2012-03-27 15:20:36 -07:00
tommy tomson
f30471df4f
small fix in diabook
2012-03-27 23:41:19 +02:00
tommy tomson
211d00a1f5
fixes in diabook
2012-03-27 23:27:43 +02:00
tommy tomson
31fbc3fde3
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 19:02:07 +02:00
tommy tomson
9fd54de691
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 15:29:46 +02:00
Simon L'nu
c3388ad813
more fixes for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 04:40:31 -04:00
Simon L'nu
6cd56e0f33
add dispy-dark snapshot; fix toolbar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 03:57:47 -04:00
tommy tomson
e7bc3f2bd0
add "find friends" to right_aside to diabook, fixes in css in diabook
2012-03-27 08:28:47 +02:00
b9d976e31b
fixed Umlaute in de strings.php
2012-03-27 07:18:20 +02:00
friendica
5275b5d049
qcomment enhancements
2012-03-26 20:13:03 -07:00
Simon L'nu
3b9f0fd801
fix dispy's nav element; fix colours in #search-text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 14:19:59 -04:00
tommy tomson
2d834d0f45
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
2012-03-26 18:54:57 +02:00
f1d15d8884
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-26 14:49:15 +02:00
37f10a6d4f
marking quattro-green as extension of quattro and deleting the tpl files
2012-03-26 14:48:01 +02:00
tommy tomson
aaddee0d94
minor css fixes in diabook
2012-03-26 13:52:44 +02:00
friendica
0164da4fb9
screenshot for darkzero-NS, same as darkzero
2012-03-26 04:25:20 -07:00
8ded404aaa
added quaddro templates to quaddro-green
2012-03-26 11:28:38 +02:00
friendica
63fa5f6c77
Merge pull request #172 from fabrixxm/master
...
Rearrange theme tpls
2012-03-26 02:00:14 -07:00
tommy tomson
876aa0c752
small fix in diabook :: add local friendica to right_aside
2012-03-26 10:33:28 +02:00
friendica
ca31aed490
Merge branch 'pull'
2012-03-26 00:53:32 -07:00
friendica
2820dba1e7
comix screenshot
2012-03-26 00:52:54 -07:00
Fabio Comuni
579c4f3079
diabook: small fix in theme_info array
2012-03-26 09:48:38 +02:00
friendica
109e8d4f05
more theme screenshots
2012-03-26 00:47:52 -07:00
Simon L'nu
0c4aba4b57
[fix] contact_edit.tpl syntax; reduce cols to fit better
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:39:06 -04:00
tommy tomson
c4c69959e2
add screenshots to diabook
2012-03-26 09:37:14 +02:00
Fabio Comuni
51d419e159
themes: use duepuntozero tpls as default
2012-03-26 09:09:14 +02:00
Simon L'nu
7de8e15ca4
fix the search box
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:01:13 -04:00
tommy tomson
37f02424f8
small fix
2012-03-26 07:02:27 +02:00
friendica
ba28362242
position the theme-preview on settings page
2012-03-25 21:12:10 -07:00
friendica
a06185e87c
screenshot gallery
2012-03-25 20:08:28 -07:00
friendica
be52ec6f5a
Merge branch 'pull'
2012-03-25 19:48:17 -07:00
Simon L'nu
3d11c22b01
add in the search box
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 22:45:44 -04:00
Simon L'nu
758e1b7424
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme screenshots
* master:
2012-03-25 22:40:24 -04:00
friendica
c88674aaf2
theme preview for end users
2012-03-25 19:05:14 -07:00
friendica
7ab117fd31
Merge branch 'pull'
2012-03-25 18:19:58 -07:00
friendica
7ef1ed2d70
theme screenshots
2012-03-25 17:55:43 -07:00
Simon L'nu
3d62cb9782
minor fix to dispy theme.php
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:13:24 -04:00
Simon L'nu
aa33815d3c
urgent fix to dispy-dark theme.php
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:06:38 -04:00
tommy tomson
baeb735315
small fixes
2012-03-25 19:43:42 +02:00
Simon L'nu
2c43120129
dispy-dark not experimental. start implementing fpostit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 03:22:16 -04:00
Simon L'nu
84686a2698
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
move community_pages to right_aside, fixes in css
improved the inivitations and added a bit of sales pitch.
* master:
2012-03-25 03:18:21 -04:00
tommy tomson
329a26d62e
move community_pages to right_aside, fixes in css
2012-03-25 08:47:17 +02:00
Simon L'nu
1d56224b08
increase version to 1.0 for dispys \o/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:12:28 -04:00
Simon L'nu
8fe77e5b86
implement filer/file-as
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:01:59 -04:00
tommy tomson
8451b22d42
small fix in css
2012-03-24 08:56:26 +01:00
tommy tomson
ba027f174d
add right_aside to diabook-blue
2012-03-24 08:13:48 +01:00
tommy tomson
378762fed2
add connectable services to right_aside
2012-03-24 06:17:14 +01:00
tommy tomson
d76b052f90
add PostIt to right_aside, fixes in css
2012-03-24 04:05:21 +01:00
Fabio Comuni
1780fff161
diabook: theme.php
...
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
2012-03-23 14:09:06 +01:00
Fabio Comuni
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
tommy tomson
c35b9ec24f
fix in css right_aside
2012-03-23 10:16:11 +01:00
tommy tomson
7706a8f9d8
small fix
2012-03-23 07:28:48 +01:00
tommy tomson
687fa80094
fix 1024resolution
2012-03-23 07:02:21 +01:00
tommy tomson
bf4dd8ad17
add right_aside to theme diabook
2012-03-23 02:36:34 +01:00
07c5b0af5a
quattro(-green) styling the 'filed under: remove' text
2012-03-22 14:09:21 +01:00
1e86e3fb26
it's only item.filer ;-)
2012-03-22 13:46:05 +01:00
5babf5c8b4
Merge branch 'quattrofiler'
2012-03-22 13:42:10 +01:00
6df7fae4b5
non static filer text
2012-03-22 13:41:41 +01:00
54c08b2b0f
adding filer functionality to quattro(-green)
2012-03-22 12:41:51 +01:00
friendica
808180ce5f
missing tooltip for "file as"
2012-03-22 04:07:37 -07:00
tommy tomson
e37c4f69b4
add file_as-option to diabook-derivates
2012-03-22 06:54:18 +01:00
tommy tomson
72d0756fa6
add icons to aside diabook, fixes in css
2012-03-22 04:33:21 +01:00
friendica
89028f2e2f
add comix-plain
2012-03-21 13:55:37 -07:00
friendica
56495e04b2
smooth the comix comment box
2012-03-21 06:48:04 -07:00
friendica
1a98f3c067
ika to ica
2012-03-21 00:35:33 -07:00
friendica
adcf52d02d
facepark is unsupported ATM
2012-03-21 00:08:06 -07:00
friendica
db02eebde1
Merge branch 'pull'
2012-03-20 23:59:02 -07:00
friendica
6c7b619b34
remove stray template variable from old code
2012-03-20 23:57:33 -07:00
friendica
efd7c14c24
Merge pull request #154 from tonybaldwin/master
...
added theme
2012-03-20 23:31:12 -07:00
friendica
0dc4c3f484
add comix theme
2012-03-20 22:54:20 -07:00
friendica
4d39b0658f
use password field for DB input
2012-03-20 22:53:19 -07:00
tony baldwin
e5c29fcc78
Merge remote branch 'upstream/master'
2012-03-21 01:36:23 -04:00
tony baldwin
cf17606d0f
added Vijay's theme from facepark.in
2012-03-21 01:33:48 -04:00
Simon L'nu
de0298e67e
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-20 11:37:51 -04:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
friendica
c286681158
Merge pull request #147 from CatoTH/master
...
CSRF-Protection in the group-related form
2012-03-18 17:54:12 -07:00
Simon L'nu
e84095182f
fix the comment box being too wide and looking off-kilter
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-18 18:33:38 -04:00
Michael Vogel
6f10142b2e
API: Seesmic is now working. Optimizing text export.
2012-03-18 17:52:51 +01:00
Tobias Hößl
453b5b46a3
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
2012-03-18 15:44:33 +00:00
Simon L'nu
87fdae2dd8
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-17 01:55:40 -04:00
Simon L'nu
75883b196e
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:23:24 -04:00
Simon L'nu
368d93625d
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 20:29:02 -04:00
Simon L'nu
91fee866b7
make profiles-menu disappear when clicked outside it
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 16:43:34 -04:00
Simon
1246a40ec2
Merge pull request #141 from CatoTH/master
...
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl
90bb32ab73
Bugfix of old IEs
2012-03-16 17:47:40 +00:00
Tobias Hößl
27054964fe
Forgot to remove a debug line
2012-03-16 17:46:26 +00:00
Tobias Hößl
75823c2353
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
2012-03-16 17:45:07 +00:00
Simon L'nu
7b15f27ba4
weee, dispys get another update
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 13:31:59 -04:00
Simon L'nu
d965f73ef1
missing close double quote in mail_list.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:57:27 -04:00
Simon L'nu
6bdb71f01c
more changes in dispy-dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:55:34 -04:00
friendica
33e03a8df0
Merge branch 'pull'
2012-03-15 19:56:32 -07:00
friendica
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
tommy tomson
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
friendica
5d2c590fa9
Merge pull request #136 from annando/master
...
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
Simon L'nu
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
friendica
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
friendica
4cd3d5cd02
Merge https://github.com/friendica/friendica into pull
2012-03-15 01:48:07 -07:00
tommy tomson
6dbee45d92
add links to wall, photos, events, etc to aside on networkpage, fixes in css
2012-03-15 08:29:39 +01:00
friendica
93a8907f43
force login to ssl on SSL_POLICY_SELFSIGN
2012-03-14 21:29:44 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
531201f2a1
Merge pull request #132 from campino/master
...
Test cases
2012-03-14 15:16:30 -07:00
friendica
959aa13de0
Merge pull request #133 from tonybaldwin/master
...
slack-NS
2012-03-14 15:15:34 -07:00
friendica
2dc527609e
Merge https://github.com/friendica/friendica into pull
2012-03-14 14:34:48 -07:00
Simon
c95deb4839
Merge pull request #134 from simonlnu/master
...
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Alexander Kampmann
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson
f03c57007a
fix in nav
2012-03-14 12:56:59 +01:00
tommy tomson
42462cc1f0
add links to home, profile, photos, events, notes to aside in network-stream
2012-03-14 12:50:11 +01:00
Simon
fb77bfa648
Merge pull request #131 from simonlnu/master
...
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu
975781d3e2
massive work done to both dispys, mostly -dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
friendica
4972d7ef6e
more work on filer, comment level and file tag removal
2012-03-13 20:46:37 -07:00
Tony Baldwin
1ae740535d
added slack-NS, non-scrolly, slackr-based theme.
2012-03-13 23:05:04 -04:00
friendica
be48fff157
file as widget and basic filing implementation for duepuntozero,slackr
...
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica
427362c324
Merge branch 'pull'
2012-03-13 15:41:13 -07:00
friendica
dc84da520d
invite potential connectees to the free social web
2012-03-13 15:40:16 -07:00
friendica
acc4bbeb6e
Merge pull request #129 from CatoTH/master
...
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica
bf7425c591
click anywhere to close notifications -> zeros and bubbles
2012-03-12 20:21:32 -07:00
tommy tomson
8358b9247f
fix css
2012-03-13 00:38:38 +01:00
tomtom84
ecc9f4ba70
Merge pull request #127 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson
27bc8052d0
use fancybox instead of lightbox
2012-03-13 00:04:19 +01:00
tomtom84
8a85914e1d
Merge pull request #126 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson
caffb217c1
fixes
2012-03-12 23:31:54 +01:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
tomtom84
a1305433b8
Merge pull request #125 from tomtom84/master
...
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson
9436175746
add lightbox, fixex in css
2012-03-12 21:09:16 +01:00
Simon L'nu
9f52e3df8d
fix dispy-dark photo album stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Michael Vogel
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
b879a1ddf1
Pages: Show every community page - even from foreign servers (with caching)
2012-03-11 17:45:12 +01:00
Simon L'nu
258a8c0871
screwed up on the font-size for screen last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu
fa0cb8514d
add some '@media handheld' types for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon L'nu
62fe48f064
fix more stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Simon L'nu
57d8370376
fix some stuff right away
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Simon L'nu
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
friendica
1bddd48661
bug #327 - composed private message is lost if no recip specified.
2012-03-10 15:50:51 -08:00
Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
tomtom84
c79cb57e1e
Merge pull request #118 from tomtom84/master
...
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e
fixed login-fields, fixed. notofication.png, changed locations
2012-03-10 13:22:41 +01:00
1e37477fdc
German translation
2012-03-10 10:36:20 +01:00
Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
Michael Vogel
cb1ecf2c5a
diabook: Moving the location between the icons
2012-03-10 00:15:27 +01:00
tomtom84
68ca29719e
Merge pull request #116 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d
add js to hide nav-menus, when clicked outside
2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2
Merge pull request #115 from tomtom84/master
...
fixes in diabook-derivates
2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af
fixes in css
2012-03-09 13:23:38 +01:00
Alexander Kampmann
af34cf019c
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 12:17:19 +01:00
friendica
2ce78253ae
Merge branch 'pull'
2012-03-09 00:48:16 -08:00
friendica
3878b58f0d
bug #324 - tinymce used for mail even if editplain being used.
2012-03-09 00:47:10 -08:00
Simon L'nu
81f5b0e2df
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:26:54 -05:00
Simon L'nu
dc8d060d4d
i consider dispy pretty stable at this point, so i'm removing the experimental file
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:00:56 -05:00
Simon L'nu
20b2090182
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
removed info
add info
fixed star-bug
More improved transparency for smilies
removed dolphin file (wtf?)
.
* master:
2012-03-08 23:59:43 -05:00
tomtom84
e25fb2b2f9
Merge pull request #112 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307
removed info
2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8
Merge pull request #111 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15
add info
2012-03-09 04:14:24 +01:00
tomtom84
05561bd905
Merge pull request #110 from tomtom84/master
...
fixes in diabook-derivates
2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96
fixed star-bug
2012-03-09 02:59:13 +01:00
Simon L'nu
8d19baadff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme info file for testbubble
catalan translation
revup
add theme diabook-blue, fix css
* master:
2012-03-08 20:38:54 -05:00
friendica
b86a08166c
theme info file for testbubble
2012-03-08 16:30:45 -08:00
friendica
af9f7da449
catalan translation
2012-03-08 16:29:22 -08:00
friendica
3b47626c15
Merge https://github.com/friendica/friendica into pull
2012-03-08 14:35:47 -08:00
tommy tomson
b9dda93f0c
add theme diabook-blue, fix css
2012-03-08 23:22:26 +01:00
Simon L'nu
5fe8952c29
make svg from notifications.svg to ease future editing. more dispy tweaks
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-08 13:37:45 -05:00
tomtom84
08b5ede5a1
Merge pull request #107 from tomtom84/master
...
fixes in theme diabook
2012-03-08 05:52:14 -08:00
tommy tomson
1fcbc7aa5a
add links to /profiles, add some icons to diabook/icons, fixes in css
2012-03-08 14:49:07 +01:00
Simon L'nu
15d310e4c3
fix jot.tpl buttons. fix up subsequent styling breakage
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 12:35:04 -05:00
Simon L'nu
66d2c52b5f
push fix for funky menu action. the overflow-x might break again for some people
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-07 10:07:36 -05:00
Alexander Kampmann
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-07 12:06:20 +01:00
Alexander Kampmann
b2df1205ef
merged
2012-03-07 12:06:09 +01:00
tomtom84
dd2ff7c796
Merge pull request #103 from tomtom84/master
...
fixes in theme diabook
2012-03-06 23:44:18 -08:00
tommy tomson
ec3ce05357
fix in navbar
2012-03-07 08:42:19 +01:00
tomtom84
05a52b2660
Merge pull request #101 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:49:32 -08:00
tommy tomson
49b5a1bf20
fix in navbar
2012-03-07 00:47:43 +01:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
Simon L'nu
edd450cf06
dispy, dispy, oh what a little lispy
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 17:55:05 -05:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Simon L'nu
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-06 16:18:26 -05:00
Fabio Comuni
607ee1ff9c
quattro: theme settings (a bit hackish)
2012-03-06 09:50:18 +01:00
tommy tomson
eaaf030c18
Merge remote-tracking branch 'origin/master'
2012-03-06 08:28:21 +01:00
tommy tomson
b64b1d13a4
fixes in diabook
2012-03-06 08:27:20 +01:00
friendica
321b651635
Merge branch 'pull'
2012-03-05 18:52:15 -08:00
friendica
23460302f5
some admin page fixes and cleanup
2012-03-05 18:51:21 -08:00
Michael Johnston
9f44dbbb48
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
2012-03-05 21:10:01 -05:00
friendica
e5de03040e
Merge branch 'pull'
2012-03-05 15:59:28 -08:00
friendica
7b3349f38a
some testbubble stuff
2012-03-05 15:58:26 -08:00
Simon L'nu
190650060a
forgot a small change in .field_help
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 18:16:51 -05:00
Simon L'nu
50824bddd0
implement more of the changes requested
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 17:57:04 -05:00
tommy tomson
a406c16581
fixes
2012-03-05 22:31:03 +01:00
Alexander Kampmann
fbc017cdba
added test blueprints, fixed? encoding issues
2012-03-05 22:22:10 +01:00
Simon L'nu
9d461846e2
multiple fixes; the jot-header works as standalone, not sure what's up.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 15:55:17 -05:00
Simon L'nu
02f825ca3c
tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 13:16:28 -05:00
Simon L'nu
ef1d02e7bd
still working on jot-header. amending <aside> and other elements
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 12:21:57 -05:00
Simon L'nu
65b6ec79ed
hopefully fix the overflow issue everywhere this time
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 10:55:26 -05:00
friendica
965e657c20
$name appearing on testbubble items
2012-03-05 03:10:45 -08:00
friendica
31f192bb57
Merge branch 'pull'
2012-03-05 00:54:25 -08:00
friendica
0d97799324
testbubble notifications
2012-03-05 00:53:42 -08:00
Simon L'nu
7de79a8c49
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
like dislike button
fixes in diabook
* master:
2012-03-05 01:08:54 -05:00
Simon L'nu
fe7a6b070d
yet more ui things, and bug fixing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-05 01:08:45 -05:00
tomtom84
9c541dbd67
Merge pull request #83 from tomtom84/master
...
fixes in diabook theme
2012-03-04 20:15:26 -08:00
tommy tomson
fe614b4e7c
like dislike button
2012-03-05 05:14:08 +01:00
Simon
04527bd0b1
Merge pull request #80 from unary/darkzero
...
improved contrast in acl selector, and preview (darkzero)
2012-03-04 19:19:45 -08:00
Simon
3b95171824
Merge pull request #82 from simonlnu/master
...
say hello to dispy's younger brother
2012-03-04 19:19:08 -08:00
Simon L'nu
58cdf776b6
more ui thingies with dispy - we'll get you well dispy, we promise
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 22:16:10 -05:00
friendica
b57247d6a6
Merge branch 'pull'
2012-03-04 19:15:42 -08:00
friendica
b9bea3a549
wrap title and text for editplain in zero and TB themes
2012-03-04 19:14:03 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
tommy tomson
e52891d8ab
fixes in diabook
2012-03-05 03:08:58 +01:00
tomtom84
d369fcc994
Merge pull request #81 from tomtom84/master
...
fixes in diabook theme
2012-03-04 17:46:48 -08:00
tommy tomson
1653e5a615
fixes in diabook
2012-03-05 02:45:24 +01:00
Michael Johnston
b2035ae0c6
improved contrast in acl selector, and preview (darkzero)
2012-03-04 17:29:00 -05:00
Simon L'nu
2441babbe9
removed extra padding/border on tread-wrapper (heh, tea read :P)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 15:52:50 -05:00
Simon L'nu
25510453bf
fix up toolbar so the notifications line up better together
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 14:55:09 -05:00
Simon L'nu
5f77aff486
more tweakage. stylesheet and jot-header
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 12:21:08 -05:00
tommy tomson
8e49b4332c
style.css fix
2012-03-04 14:19:53 +01:00
Simon L'nu
cb57a0ebfd
soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 05:19:49 -05:00
Simon L'nu
c28ce8a79c
tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-04 05:00:35 -05:00
tomtom84
dfa056bb1b
Merge pull request #74 from tomtom84/master
...
fixes in diabook theme
2012-03-03 20:49:09 -08:00
tommy tomson
e0e0224fa6
some fixes in diabook
2012-03-04 05:48:06 +01:00
Simon
f3c1e2c546
Merge pull request #73 from simonlnu/master
...
dispy! (and minor formatting)
2012-03-03 16:23:07 -08:00
Simon L'nu
09c2f81cb3
these are more finessing on formatting again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:20:23 -05:00
Simon L'nu
64400e8d59
first commit for dispy New Edition
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-03 19:19:35 -05:00
tomtom84
74866a96de
Merge pull request #72 from tomtom84/master
...
fixes in diabook theme
2012-03-03 15:10:54 -08:00
tommy tomson
25d6ca3b73
tag fix
2012-03-04 00:10:03 +01:00
tomtom84
f4b9c405da
Merge pull request #71 from tomtom84/master
...
fixes in diabook theme
2012-03-03 14:45:03 -08:00
tommy tomson
b3eeb22401
fix
2012-03-03 23:43:15 +01:00
tomtom84
77db5becb6
Merge pull request #70 from tomtom84/master
...
fixes in diabook theme
2012-03-03 14:13:14 -08:00
tommy tomson
173fb983c5
navbar fix
2012-03-03 23:12:03 +01:00
Simon L'nu
1bed4010aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Added docblox default configuration file.
fixed apps css
* master:
2012-03-03 16:49:22 -05:00
tomtom84
7230fa5a94
Merge pull request #68 from tomtom84/master
...
fixes in diabook theme
2012-03-03 12:48:34 -08:00
tommy tomson
42b9887693
fixed apps css
2012-03-03 21:45:59 +01:00
Simon L'nu
da78d8594f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fixed star/unstar
fixed admin fixed editor
* master:
2012-03-03 13:39:56 -05:00
