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
