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
tomtom84
1dfd5c4f85
Merge pull request #67 from tomtom84/master
...
fixes in diabook theme
2012-03-03 10:09:28 -08:00
tommy tomson
d4ac1f2a9c
fixed star/unstar
2012-03-03 19:07:55 +01:00
tomtom84
e84e684fdc
Merge pull request #66 from tomtom84/master
...
fixed editor and admin-sec in theme diabook
2012-03-03 07:54:21 -08:00
tommy tomson
83e9f57459
fixed admin
...
fixed editor
2012-03-03 16:49:48 +01:00
Simon L'nu
2b9ea33e8b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix editor
* master:
2012-03-03 09:45:32 -05:00
tomtom84
792031c36e
Merge pull request #65 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 06:03:34 -08:00
tommy tomson
b3ba2eb4d0
fix editor
2012-03-03 15:01:25 +01:00
Simon L'nu
ba28404470
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix text-editor in theme
german strings as of 28th Feb from transilex
small fix in style.css
fix star/unstar
fixes in wall_item.tpl and style.css in theme diabook
fix in wall_item.tpl new icon link.png
add diabook to default themes
fixed broken tags and notifications in theme
* master:
2012-03-03 08:05:53 -05:00
tomtom84
8ffe15fbb1
Merge pull request #64 from tomtom84/master
...
fix editor in theme diabook
2012-03-03 04:30:31 -08:00
tommy tomson
60adef2463
fix text-editor in theme
2012-03-03 13:27:39 +01:00
Tobias Diekershoff
9d885c4801
german strings as of 28th Feb from transilex
2012-03-03 12:17:32 +01:00
tomtom84
b4361e37e0
Merge pull request #63 from tomtom84/master
...
fixes in diabook theme
2012-03-02 21:02:55 -08:00
tommy tomson
83c25b4386
small fix in style.css
2012-03-03 06:00:46 +01:00
tommy tomson
89f667ff76
fix star/unstar
2012-03-03 04:45:34 +01:00
friendica
2ae82ae3c2
Merge pull request #62 from tomtom84/master
...
fixes in diabook theme
2012-03-02 19:32:34 -08:00
tommy tomson
d138d07c05
fixes in wall_item.tpl and style.css in theme diabook
2012-03-03 04:27:06 +01:00
tommy tomson
8f72d95b0e
fix in wall_item.tpl
...
new icon link.png
2012-03-03 01:52:53 +01:00
Simon L'nu
7ef861907e
minor formatting issues
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 19:09:17 -05:00
tommy tomson
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01:00
Simon L'nu
81de5f7802
apply changes to templates to testbubble
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 13:59:28 -05:00
Simon
e2e9050d74
Merge pull request #58 from simonlnu/master
...
fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
2012-03-02 09:28:04 -08:00
Simon
d61ee3760d
Merge pull request #59 from tomtom84/master
...
diabook theme
2012-03-02 09:25:42 -08:00
tommy tomson
64a85b2507
deleted readme.txt from folder diabook
2012-03-02 18:01:21 +01:00
Simon L'nu
9c698b1a60
fix for comment-wwedit-wrapper CSS class in tpl had a stray $
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 12:00:16 -05:00
tommy tomson
ac1d758f6e
github finally working
2012-03-02 17:47:45 +01:00
tommy tomson
d72520f5f1
adjust3
2012-03-02 17:45:21 +01:00
tommy tomson
e2798cee16
adjust
2012-03-02 16:01:20 +01:00
Fabio Comuni
ef34847501
templates: fix tags
2012-03-02 12:41:34 +01:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
tommy tomson
5183e737d0
diabook commit
2012-03-02 02:05:35 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Fabio Comuni
a26ce7c56b
show relation in contact_template
2012-03-01 11:31:16 +01:00
Fabio Comuni
b71a3af457
Merge remote-tracking branch 'friendica/master' into randomerror
2012-02-29 14:58:37 +01:00
Fabio Comuni
42d591d257
revert 01a2791e3a
to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
Simon L'nu
72e78046af
minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-27 01:04:41 -05:00
friendica
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
friendica
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Michael
edc44933a4
"Vier-Theme" Some more design stuff.
2012-02-26 21:16:29 +01:00
Tobias Diekershoff
2081e6d507
some revision to the German strings
2012-02-26 17:12:14 +01:00
Tobias Diekershoff
0877fbb42a
German strings
2012-02-26 15:41:27 +01:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
friendica
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
friendica
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
friendica
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
friendica
d075fd8a40
reverse order of links
2012-02-25 16:47:21 -08:00
friendica
579738aff7
fixed link for toggling plugin from detail page
2012-02-25 13:00:44 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
friendica
00edc89c47
notify positioning, theming
2012-02-25 05:00:48 -08:00
friendica
c90bac5727
sysnotify count in wrong location, and wrong number
2012-02-25 04:37:12 -08:00
friendica
4839c235da
theme seen,unseen notifications
2012-02-25 03:28:07 -08:00
Michael
3c68bf25ac
"vier" popup menu looks nicer now (more like quattro again)
2012-02-25 11:13:04 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
aa67771eaa
photos in notifications
2012-02-25 00:42:25 -08:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
6092567c97
notifications to zeros, bug in notify link
2012-02-24 23:44:55 -08:00
friendica
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
friendica
65ddefe9c5
system notifications to notify module, untranslated string in notifications.tpl
2012-02-23 17:37:03 -08:00
Fabio Comuni
f5b8654818
fix visualization in groupeditor
2012-02-23 16:21:28 +01:00
Fabio Comuni
fd3274ff53
less html in mod/group.php, template for group members editor, quattro theme for group edit.
2012-02-23 16:17:36 +01:00
Fabio Comuni
d45e26d6d9
Merge remote-tracking branch 'friendica/master'
2012-02-23 15:23:52 +01:00
Tobias Diekershoff
1dacb2e570
quattro-green: removed contact_template.tpl
2012-02-23 14:16:20 +01:00
Fabio Comuni
6a0c815c1f
Merge remote-tracking branch 'friendica/master'
2012-02-23 14:10:32 +01:00
Fabio Comuni
edd946bcad
quattro: fix typos
2012-02-23 14:10:23 +01:00
Tobias Diekershoff
c03b5b62c0
green-quattro: applied a color for shiny class and preview
2012-02-23 12:54:14 +01:00
Fabio Comuni
cbc60d525e
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
...
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
friendica
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
Tobias Diekershoff
56f3c00eec
quattro: added styling to pivate message view
2012-02-23 09:02:40 +01:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
Michael
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
friendica
9fe12d1724
some cleanup of tb notifications
2012-02-21 20:22:09 -08:00
Abinoam P. Marques Jr
914169472e
view/admin_remoteupdate.tpl - Friendika -> Friendica
2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr
d89a0449d0
htconfig.tpl - Friendika -> Friendica
2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr
12a8796854
mod/dfrn_request.php and templates - Friendika -> Friendica
2012-02-20 19:38:43 -03:00
Michael
3a7695ded1
Fetched some missing styles from testbubble.
2012-02-20 15:11:27 +01:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
Michael
4713069e68
Many small changes
2012-02-19 20:11:36 +01:00
Michael
cafd400352
Merge remote branch 'upstream/master'
...
Conflicts:
view/theme/vier/style.css
2012-02-19 20:09:42 +01:00
ike
73e0e4d783
New theme "vier" derives from "quattro"
2012-02-19 20:05:51 +01:00
friendica
75acc1ed96
support plaintext on editpost, editorinit called before all buttons laid out
2012-02-17 11:49:27 -08:00
Tobias Diekershoff
652622894f
de strings
2012-02-16 11:55:52 +01:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
73bee08ac2
enable ajax calendar with $a->config['experimentals']['new_calendar']=1
2012-02-15 12:47:50 +01:00
Fabio Comuni
fe3e8ee854
quattro: icons for attachments
2012-02-15 11:10:02 +01:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
Fabio Comuni
549c920e6f
events js: don't modify rendered item if not autor specified
2012-02-14 16:28:10 +01:00
Fabio Comuni
22cfb77173
events: first test for full-javascript events calendar
2012-02-14 16:19:48 +01:00
friendica
060ac4ebf1
delete mail message icon not brightening on hover
2012-02-14 02:34:05 -08:00
friendica
d2a9ce9362
more contacts categorisation, page cleanup
2012-02-13 22:48:35 -08:00
friendica
d75b6a00d4
tabs and total count for contacts page
2012-02-13 20:38:00 -08:00
friendica
bcad629633
more stray quotes
2012-02-13 18:40:56 -08:00
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f
Merge branch 'pull'
2012-02-13 14:17:20 -08:00
friendica
52cb63655a
POST should be lowercase these days
2012-02-13 14:15:39 -08:00
Tobias Diekershoff
22bb285c7f
green variation of the quattro theme
2012-02-13 17:05:48 +01:00
Fabio Comuni
8369c243b3
Fix 'item not found' message
2012-02-13 10:19:10 +01:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
Fabio Comuni
16d3bc9deb
quattro: pause icon
2012-02-13 09:35:11 +01:00
Fabio Comuni
3e664dbdfe
reshare in "display" view
2012-02-13 09:33:20 +01:00
friendica
0c4606682f
fix link/bookmark reshares
2012-02-11 19:21:41 -08:00
friendica
da946bb9b0
bug #278 show only blocked contacts
2012-02-11 03:07:15 -08:00
friendica
75a62db9c5
show tags (pub_keywords) in advanced profile
2012-02-11 01:24:29 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
Fabio Comuni
8480550144
quattro: add "view in context" link in search results
2012-02-10 17:29:37 +01:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
03435853b3
fix apps sub-menu on quattro and vier
2012-02-08 18:12:26 -08:00
Tobias Diekershoff
d8157f73ef
quattro: added delete button to mail list overview
2012-02-08 22:29:38 +01:00
Tobias Diekershoff
ca8a25172e
quattro: added delete buttons to groups and contacts
2012-02-08 22:13:36 +01:00
Tobias Diekershoff
72c30deb64
quattro: group member selection styling
2012-02-08 20:47:52 +01:00
Tobias Diekershoff
1eb32a0bb5
added theme "vier" by Michael Vogel
2012-02-08 19:09:25 +01:00
friendica
e92e3658b2
make individual advanced profile items addressable via script or plugin
2012-02-07 20:34:40 -08:00
friendica
c6cdad946e
more fixes for textmode
2012-02-07 00:13:16 -08:00
friendica
2b77002471
basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).
2012-02-06 20:28:50 -08:00
friendica
76308eca67
add toggle to choose sending "friends with" activity even if contact is not hidden
2012-02-06 16:41:05 -08:00
friendica
57f7083706
style missing on crepair-name
2012-02-05 17:38:32 -08:00
zottel
3149e3cd3e
testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be
2012-01-30 13:33:25 -08:00
Tobias Diekershoff
d658cdaa84
quattro: small adjustments to the profile edit style
2012-01-30 14:25:24 +01:00
Tobias Diekershoff
43df068d2e
quattro: styling of the edit profile page
2012-01-30 13:22:16 +01:00
Tobias Diekershoff
a5974d1981
moving the pager down below the contact/photo list in quattro
2012-01-28 13:13:21 +01:00
friendica
3197a6e8aa
fix some changes lost from another branch
2012-01-26 23:03:27 -08:00
friendica
f1f480c2bf
slackr -> wall-to-wall comment form background different than regular comment
2012-01-26 20:32:05 -08:00
friendica
068cb53a9e
page delegation
2012-01-26 20:08:02 -08:00
friendica
d2a9341128
new event current date off by one, submit button misplaced
2012-01-25 13:42:06 -08:00
friendica
a24a383dab
by default allow pseudonyms
2012-01-25 00:30:36 -08:00
friendica
a76a497d92
implement "moderate" flag on items
2012-01-23 20:56:11 -08:00
friendica
1f074cb44c
shaka, slackr theme
2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2
nav: fix "See all notifications"
2012-01-23 09:23:37 +01:00
Fabio Comuni
30fcda7576
nav: fix intro notification url, fix "See all notifications" url and make it translatable
2012-01-22 19:27:56 +01:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
Tobias Diekershoff
40edcec06f
German translation
2012-01-13 15:14:40 +01:00
friendica
a1dc3185be
typo in greenzero
2012-01-12 23:33:20 -08:00
friendica
28edeefc14
reset width of openid input, settings page
2012-01-12 20:35:05 -08:00
friendica
520ba0960b
put openid logo back on openid input box, duepuntozero settings page
2012-01-12 20:31:14 -08:00
friendica
df14d7abc4
allow crepair to change name - as long as it isn't blank
2012-01-12 18:54:35 -08:00
friendica
bdfe3ba129
missing source file, fix link icon in testbubble
2012-01-12 17:58:55 -08:00
friendica
4d07cfa2d0
and and theme previewing for testbubble
2012-01-12 17:50:02 -08:00
Tobias Diekershoff
9b2669eb5d
profile-match and contact suggestion list styling
2012-01-12 21:21:00 +01:00
Fabio Comuni
ea9f14c27b
quattro: style fakelink
2012-01-12 10:42:59 +01:00
Fabio Comuni
3d7857ecdd
quattro: item acl popup panel, max height to notifications menu, style comment preview and wall-to-wall item photos
2012-01-12 10:38:24 +01:00
Fabio Comuni
302d62f7a3
templates: add class to comment preview div, fix search_item.tpl
2012-01-12 10:37:11 +01:00
Fabio Comuni
1f9e8f90a2
fix jot acl
2012-01-12 10:35:50 +01:00
friendica
b7ccbfc702
Merge branch 'pull'
2012-01-10 17:48:05 -08:00
friendica
cf7008e575
post preview to loozah
2012-01-10 17:47:11 -08:00
zottel
bd3dee43c1
New German translations
2012-01-10 08:13:30 -08:00
friendica
375cb82124
move post preview link
2012-01-09 21:02:02 -08:00
friendica
7011f71e8f
post preview
2012-01-09 20:03:00 -08:00
friendica
805eb35a1a
not ready for post preview
2012-01-09 18:54:05 -08:00
friendica
a13156c0f3
bypass D* markdown bug for now
2012-01-09 18:52:49 -08:00
friendica
9d0664ba48
Merge branch 'pull'
2012-01-08 05:17:59 -08:00
friendica
0828ab353f
fix git horkage
2012-01-08 05:16:55 -08:00
friendica
9f6d38a61a
something weird with git
2012-01-08 04:30:35 -08:00
friendica
a6d0a65321
more recovery of lost contact page formatting
2012-01-08 04:16:23 -08:00
friendica
dd7a10a219
contact page float got lost somewhere
2012-01-08 04:13:53 -08:00
friendica
358b2a46f5
fix photo top view in testbubble, extend network_to_name
2012-01-07 13:00:06 -08:00
friendica
41bb47ca1b
title fixups
2012-01-06 03:59:05 -08:00
Fabio Comuni
f70f2eedaf
duepuntozero: get back jot icons
2012-01-06 10:03:20 +01:00
Fabio Comuni
a5a6719283
fix photo album pager
2012-01-06 09:35:29 +01:00
Fabio Comuni
98a8693e9e
quattro: style network widget
2012-01-06 09:27:05 +01:00
Fabio Comuni
f9b0af6f2f
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac
Use html5 placeholder for title text input
2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d
Merge remote-tracking branch 'friendica/master'
2012-01-06 09:10:21 +01:00
friendica
c3ada095f4
network select widget
2012-01-05 20:40:48 -08:00
friendica
b99cb511ca
comment preview
2012-01-05 16:38:24 -08:00
friendica
53878625f6
backend support for post preview
2012-01-05 15:02:44 -08:00
friendica
2f73be326e
change to hover function
2012-01-04 21:01:24 -08:00
friendica
c5d27c48f5
more title stuff
2012-01-04 20:43:38 -08:00
friendica
dbb5955469
bit more improvement on dynamic title
2012-01-04 20:35:32 -08:00
friendica
f1c7db593c
better title handling (duepuntozero only at this time)
2012-01-04 20:09:14 -08:00
friendica
47edaf9ad7
dynamic title input box - via fabrixxm
2012-01-04 18:03:09 -08:00
friendica
378f86d046
Merge branch 'pull'
2012-01-04 14:31:37 -08:00
friendica
48a5a2484e
new smiley
2012-01-04 00:04:19 -08:00
23n
0077997eb6
Update view/de/strings.php
2012-01-04 07:05:44 +01:00
friendica
8e6c02cda3
remove some old email templates
2012-01-03 18:12:58 -08:00
friendica
969cd145ce
suggestion notifications
2012-01-03 17:29:07 -08:00
friendica
c583d16209
fix reference variable effects on sorting
2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9
Merge remote-tracking branch 'friendica/master'
2012-01-03 21:14:48 +01:00
Fabio Comuni
c7bfd1e1ba
install: fix install procedure
...
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
2012-01-02 20:16:28 +01:00
Fabio Comuni
f35109827b
datetime: new field_timezone() function, new template field_select_raw.tpl
...
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae
Merge branch 'master' of github.com:fabrixxm/friendica
2012-01-02 15:32:37 +01:00
friendica
c735582ead
hide contacts on approval
2011-12-29 00:23:05 -08:00
friendica
aca8c8a13a
Merge branch 'pull'
2011-12-27 14:27:39 -08:00
friendica
356c05c6b3
extending notifications to other types
2011-12-26 14:16:25 -08:00
Tobias Diekershoff
f29507cdba
translation of email templates
2011-12-26 09:16:33 +01:00
Tobias Diekershoff
f1b7ce6ef4
translation of email template
2011-12-26 09:08:32 +01:00
Tobias Diekershoff
02af9cd3b2
translation of the email template
2011-12-26 09:05:02 +01:00
friendica
bb40e54dec
new notification module working for "email message received"
2011-12-25 23:00:19 -08:00
friendica
170b841834
more enotify
2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3
more enotify
2011-12-24 22:36:17 -08:00
friendica
95b4bc55bf
Merge branch 'master' into notify
2011-12-22 15:42:01 -08:00
Fabio Comuni
2ef2d0b79f
quattro: contacts and first photo page
2011-12-22 16:33:14 +01:00
Fabio Comuni
0b4535e6da
quattro: more on editor
2011-12-22 11:24:34 +01:00
Fabio Comuni
bf00e4dded
quattro: more on editor
2011-12-21 17:36:42 +01:00
Fabio Comuni
ba732c97c1
Merge remote-tracking branch 'friendica/master'
2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119
quattro: more on editor
2011-12-20 17:17:17 +01:00
friendica
0bef863015
wrong style for unvisited links
2011-12-19 20:23:11 -08:00
Fabio Comuni
2a3f94e452
Merge remote-tracking branch 'friendica/master'
2011-12-19 18:04:04 +01:00
Fabio Comuni
c3d12bc77e
quattro: fix icons in oauth settings page
2011-12-19 18:03:03 +01:00
Fabio Comuni
16d45e5c13
quattro: first work on jot style
2011-12-19 18:02:43 +01:00
friendica
177af1fc9d
jquery effects missing from zero derivatives
2011-12-19 01:23:12 -08:00
friendica
eb05d00794
connect on suggest/match - added to testbubble
2011-12-18 12:51:45 -08:00
friendica
5d6a098ce0
add connect link to suggestion and matches
2011-12-18 01:44:46 -08:00
friendica
974a52a16d
add connect link to friend suggest
2011-12-18 01:08:32 -08:00
friendica
c4a5fcaf27
fix xml poco for arrays
2011-12-18 00:39:15 -08:00
friendica
978717a247
add webfinger to poco, if present
2011-12-18 00:14:34 -08:00
friendica
ed725df5f1
Merge branch 'master' into notify
2011-12-12 20:13:12 -08:00
friendica
01cae9a50a
remove all plugins from default config
2011-12-12 16:28:33 -08:00
friendica
a38d3b82b9
browser_update settings
2011-12-11 21:03:33 -08:00
friendica
4f254ffb5b
system support for personal configurable ajax update interval
2011-12-11 20:32:43 -08:00
friendica
50c4b9a780
Merge branch 'master' into notify
2011-12-11 20:03:46 -08:00
friendica
3da3cd686c
notifications refactor
2011-12-08 01:28:27 -08:00
zottel
f661bb4250
fixed some glitches in testbubble theme
2011-12-08 00:12:51 -08:00
friendica
961e34f67f
missing template
2011-12-07 15:26:17 -08:00
friendica
7eba8adbf7
pm replies
2011-12-06 19:15:42 -08:00
Tobias Diekershoff
06b904ffcb
copied code styling from duepuntozero to quattro theme
2011-12-06 17:10:27 +01:00
friendica
47f369e052
hide some contacts from others
2011-12-05 18:36:26 -08:00
zottel
ced28a8827
added #pause
2011-12-05 05:17:37 -08:00
zottel
3d0f17570f
added img properties to get good results on all screen sizes
2011-12-05 00:29:29 -08:00
friendica
6fc9eae9de
more d* PM stuff
2011-12-04 17:26:55 -08:00
zottel
5dcce83927
Take out overflow: hidden; from .wall-item-outside-wrapper to fix
...
problem with photo-menu being cut off.
2011-12-02 08:02:10 -08:00
friendica
7faa6c3e93
more theme works
2011-12-01 22:44:27 -08:00
friendica
d703f4bc52
theme works d'zero
2011-12-01 20:57:09 -08:00
friendica
513c1c0d68
dynamic delete icons for saved-search on network page
2011-12-01 18:27:45 -08:00
friendica
ac3df5fece
dynamic group edit buttons
2011-12-01 16:33:53 -08:00
friendica
f1af2c224f
personal notifications
2011-11-30 22:26:02 -08:00
friendica
3bf192ba08
Merge branch 'pull'
2011-11-29 01:19:43 -08:00
friendica
669f40c342
private notes in testbubble
2011-11-29 01:18:18 -08:00
Fabio Comuni
68dee0fa71
quattro: "manage" menu item in site menu
2011-11-29 09:30:21 +01:00
Fabio Comuni
938b2bf438
quattro: default user image in item
2011-11-29 09:29:56 +01:00
friendica
034038849c
mysql error report fix (no mysqli), suggested friends for new members settings
2011-11-28 19:28:33 -08:00
friendica
6b93324c11
"show more" -> move closer to text
2011-11-24 18:51:14 -08:00
friendica
9e8053e3bd
fixing conversation updates
2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7
little stuff - name change, live updates, new network types
2011-11-23 23:17:26 -08:00
friendica
7a259d4acb
ensure comment counts update after refactor of collapsed comments
2011-11-23 14:03:53 -08:00
friendica
deb182b92e
string update es,fr
2011-11-22 16:13:23 -08:00
friendica
1443a0c8cd
Merge branch 'pull'
2011-11-22 16:02:12 -08:00
friendica
53590d2166
rework show/hide comments
2011-11-22 16:00:05 -08:00
Tobias Diekershoff
4f555212a1
German strings
2011-11-22 16:48:53 +01:00
friendica
c568493f57
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
2011-11-21 19:01:05 -08:00
Fabio Comuni
a86fd26bd8
more work on quattro. remove html from php for groups and saved searches widgets.
2011-11-21 12:34:22 +01:00
Fabio Comuni
79603e3146
expire settings for items, notes and photos.
...
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
Fabio Comuni
281f9edce7
Update IT strings
2011-11-15 19:40:38 +01:00
Fabio Comuni
f5bfe5a1a3
quattro: tags style
2011-11-15 17:42:30 +01:00
Fabio Comuni
962467ee68
item tags as array to templates
2011-11-15 17:41:38 +01:00
Fabio Comuni
5c7fb2b0fe
quattro: fix delete selected items
2011-11-15 16:17:36 +01:00
Fabio Comuni
8e588b530f
duepuntozero: fix input width in aside
2011-11-15 15:59:53 +01:00
friendica
bbf857ba39
add revision date to main profile photo to overcome cache when updated, other photos (e.g. conversations) must wait for cache update
2011-11-12 17:50:14 -08:00
friendica
02b11c5d59
several little nits in the hcard template output which could affect parsers
2011-11-12 12:28:21 -08:00
Fabio Comuni
e853549bc8
duepuntozero: add notice and info popups css style
2011-11-11 17:34:15 +01:00
Friendika
f4f8f7623b
theme birthday/event notifications under testbubble
2011-11-11 01:19:16 -08:00
Friendika
02f21fb74c
some testbubble fixes
2011-11-10 19:53:13 -08:00
Friendika
199da623ff
testbubble showing post jot-tools on edit page - these are not changed so should not be visible
2011-11-10 18:20:25 -08:00
Friendika
c66b886d7e
shared tags for testbubble, prevent tag hijacking of shared tag activities
2011-11-10 17:11:55 -08:00
Friendika
15f2ce5459
contact edit updates
2011-11-09 19:30:14 -08:00
Friendika
e35f3f1ada
Merge branch 'master' into contacts
2011-11-09 18:29:30 -08:00
Friendika
a2018e2d14
vcard position - dpzero
2011-11-09 18:29:05 -08:00
Friendika
2b1e011851
fix to overlapping tabs on testbubble when width too small
2011-11-09 17:55:36 -08:00
Friendika
2825c49573
more work on new contact edit page - plus first port to testbubble
2011-11-09 03:46:36 -08:00
Friendika
d6d4d3ed3a
various testbubble fixes
2011-11-09 00:29:14 -08:00
Friendika
02d4a742ab
more contact edit page stuff
2011-11-08 21:22:45 -08:00
Friendika
05cabf24a9
first checkin - updated contact_edit, more work remains
2011-11-08 18:30:20 -08:00
fabrixxm
eeec29c6be
Merge pull request #2 from fabrixxm/master
...
Oauth1 support in API
2011-11-08 00:18:37 -08:00
Friendika
99a548d4ac
fix friend suggest link in testbubble
2011-11-07 17:25:40 -08:00
Fabio Comuni
00c342e13d
Merge branch 'oauthapi'
2011-11-07 17:41:23 +01:00
Fabio Comuni
4407fc2c5d
oauth apps/authorization management in settings page
2011-11-07 17:38:30 +01:00
Fabio Comuni
b464b819a1
minimal page layout for oauth authorize
2011-11-07 17:37:49 +01:00
Fabio Comuni
955326acca
add hidden fields in login template
2011-11-07 17:37:25 +01:00
Fabio Comuni
10e5754e24
oauth: authorize
2011-11-07 17:36:41 +01:00
Friendika
c991a1a606
darkzero pager links washed out
2011-11-06 01:20:46 -08:00
Friendika
7d8acd038e
button text not closed
2011-11-06 00:49:30 -07:00
Friendika
57beadc86b
add diaspora signed_retraction template
2011-11-05 14:25:06 -07:00
Friendika
e19b597180
tinymce tag complete stuff
2011-11-03 20:40:56 -07:00
Friendika
5f531aa537
add js events to ignore button
2011-11-03 16:18:50 -07:00
Friendika
1ff59fd6e8
move ignore link
2011-11-03 16:06:32 -07:00
Friendika
014c91431e
ignore suggestions
2011-11-03 16:00:52 -07:00
Friendika
4f4b03367a
plugin check returning 0 vs false
2011-11-03 15:14:33 -07:00
Fabio Comuni
69e41f7703
oauth: authorize view, wrong verifier.
2011-11-02 09:54:07 +01:00
Friendika
e38aa67263
link suggestions into the main code
2011-11-01 21:27:11 -07:00
Friendika
3d9a9614e2
common friends
2011-11-01 19:16:33 -07:00
Friendika
d5ce13ee12
bug #186 - $type macro not replaced in diaspora 'like' message
2011-10-31 14:30:27 -07:00
Friendika
056fe0a3aa
poco discovery
2011-10-27 14:52:35 -07:00
Friendika
ea0ab6fbac
poco should now be spec compliant
2011-10-27 04:38:33 -07:00
Friendika
abe96155b4
hmmm - why won't poco xml work
2011-10-27 01:54:52 -07:00
Friendika
31502207bd
more poco spec compliance
2011-10-27 00:57:19 -07:00
Friendika
2f3e39ba15
edit profile quick link
2011-10-26 16:57:25 -07:00
Fabio Comuni
951c73d825
style autocomplete popup in themes
2011-10-26 14:02:17 +02:00
Fabio Comuni
dc212de960
Merge remote-tracking branch 'friendika/master'
2011-10-26 12:15:38 +02:00
Friendika
52038c6b88
event notification stuff
2011-10-25 15:36:49 -07:00
Fabio Comuni
bcb672e7ff
autocomplete contacts nickname while writting in a comment box.
2011-10-25 15:01:58 +02:00
Fabio Comuni
afce790e56
oembed: wrap in iframe only html from remote service
2011-10-25 14:59:31 +02:00
Friendika
efe3365431
tag privacy settings
2011-10-24 21:11:05 -07:00
Friendika
3b33c0d075
allow tag input to contain leading '#'
2011-10-24 17:00:22 -07:00
Friendika
4218e3f494
Merge branch 'pull'
2011-10-24 15:51:14 -07:00
Friendika
3b6b0eaa8b
social tag - add UI
2011-10-24 15:47:17 -07:00
Fabio Comuni
75d4f33233
move html for oembeded videos in template. fix oembed discovery
2011-10-24 17:28:28 +02:00
Fabio Comuni
d80c0da3c0
add custom style to object tag in tinymce
2011-10-21 16:26:57 +02:00
Friendika
01164c8c2f
fix various html parse errors
2011-10-20 16:48:07 -07:00
Friendika
19129e06c3
diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order
2011-10-19 15:08:16 -07:00
Friendika
b14914ee2e
fix tb tabs
2011-10-18 13:07:27 -07:00
fabrixxm
a19b33651e
Merge pull request #33 from fabrixxm/master
...
missing template field_openid
2011-10-17 23:56:02 -07:00
Fabio Comuni
3e5a2cb07b
template field_openid
2011-10-18 08:53:01 +02:00
Tobias Diekershoff
307b707983
fix for the button height
2011-10-18 08:17:52 +02:00
Fabio Comuni
b22ab4e308
fix buttons in quattro
2011-10-17 17:11:49 +02:00
Fabio Comuni
de44072172
works on login form
2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964
Merge remote-tracking branch 'friendika/master'
2011-10-17 16:37:37 +02:00
Tobias Diekershoff
2650ba49c1
video button only for dispy and quattro
2011-10-17 07:48:33 +02:00
Friendika
af6ab38100
diaspora birthday notifications
2011-10-14 00:20:37 -07:00
Friendika
2911bf9434
sql issue item_store
2011-10-13 01:00:06 -07:00
Tobias Diekershoff
98e50a0559
better do all the buttons (quattro)
2011-10-12 09:28:19 +02:00
Tobias Diekershoff
714319457c
little bit more for quattro
2011-10-12 08:06:41 +02:00
Tobias Diekershoff
0fb119496e
some work on quattro theme
2011-10-12 07:47:41 +02:00
Friendika
df7702709b
common tabs to notifications and mail
2011-10-11 21:30:23 -07:00
Friendika
3ef7dcac4b
solve intro/notify naming issue by providing both or either, theme decides what to do
2011-10-11 20:38:09 -07:00
Friendika
2206d894b3
add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
...
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Fabio Comuni
906addf865
common_tabs in notifications.php
2011-10-10 17:01:14 +02:00
Fabio Comuni
e9eb15373f
Remove full profile html from php and add new template 'profile_advanced.tpl'
2011-10-10 16:48:38 +02:00
Fabio Comuni
f64e2d63b9
New common tab template. Update css
2011-10-10 15:28:34 +02:00
Friendika
1cfeb61ddc
more notification cleanup duepuntozero
2011-10-09 21:34:07 -07:00
Friendika
26f2c868da
some notification text cleanup and notification page layout fixes for duepuntozero
2011-10-09 20:26:17 -07:00
Friendika
9f4d3bf567
add first,last to D* vcard
2011-10-09 15:49:51 -07:00
Devlon Duthie
8eedbf30f1
added posts to network section of the notifications page
2011-10-08 22:45:48 -05:00
Devlon Duthie
dfc65f1502
fix for z-index on wall-to-wall avatars in testbubble theme
2011-10-08 19:32:40 -05:00
Friendika
2474531451
bug #175 - hide_help config option not working
2011-10-08 02:05:33 -07:00
Devlon Duthie
f5fc8dabe5
Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme
2011-10-07 01:25:08 -05:00
Friendika
ecd714ae54
provide ability to repair contact photo
2011-10-05 20:01:42 -07:00
Friendika
b1e5dfad3c
clean up w3c validation and layout for priv mail and lang selector
2011-10-05 15:35:53 -07:00
Devlon Duthie
2d89f3b421
wrapped notification line item with the anchros tag instead of the inner, makes the whole line item a link (better)
2011-10-05 12:24:12 -05:00
Devlon Duthie
7d5e839664
- added drop-down notification support in testbubble theme
2011-10-05 11:29:25 -05:00
duthied
24595c55d7
Merge pull request #16 from duthied/master
...
Minor ui tweaks
2011-10-04 09:13:49 -07:00
Devlon Duthie
f7d055687e
- moved the header for profile permissions out of the scrolling div
...
- tweaks to the testbubble theme's nav
2011-10-04 11:10:57 -05:00
Olivier Migeot
c0cda02963
Updated french locale.
2011-10-04 12:06:01 +02:00
Olivier Migeot
273594af62
Merge remote branch 'upstream/master'
2011-10-04 11:45:57 +02:00
Friendika
e4b4c1e9f8
Merge pull request #15 from fabrixxm/master
...
some work on quattro theme and a little fix to JS
2011-10-03 05:17:00 -07:00
Fabio Comuni
4d5580ab77
fix typo
2011-10-03 09:38:58 +02:00
Fabio Comuni
b476575a98
quattro: add comment box
2011-10-03 09:38:17 +02:00
Devlon Duthie
f84c208ac5
broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags
2011-10-03 01:45:27 -05:00
Devlon Duthie
da53ebf4b3
added activetab var to message.php for templates
...
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
2011-10-02 20:37:47 -05:00
Devlon Duthie
8e38fe6f47
Merge branch 'master' of http://github.com/friendika/Free-Friendika
2011-10-02 18:39:53 -05:00
Devlon Duthie
f6f5e5b993
aspect ratio fixes for photos in testbubble theme
...
some other testbubble styling tweaks
2011-10-02 18:38:08 -05:00
Friendika
8c9a6b0512
fix notifications duepuntozero
2011-10-02 02:46:54 -07:00
Friendika
7059b8378c
Merge pull request #11 from duthied/master
...
Aspect ratio improvement for photos in album, implemented only in testbubble theme
2011-10-01 23:36:23 -07:00
Friendika
0ad9e7b5f4
option to not post photos to status stream
2011-10-01 06:20:41 -07:00
Friendika
8f47540e9b
darkbubble - event legibility
2011-10-01 04:37:28 -07:00
Friendika
78c00c287d
legibility improvements to darkbubble, mark as a derived theme
2011-10-01 04:25:40 -07:00
Devlon Duthie
c15690563d
class and wrapper div added to photo for aspect ratio display
...
testbubble theme styling for aspect ratio on photos
2011-10-01 01:52:06 -05:00
Devlon Duthie
6f610eb614
1. added button class to tpl files
...
2. messages - moved delete X into message div and new message form div
3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript)
4. changed font-size and font-variation on vcard for better readability.
5. streamlining continued with the CSS file
2011-09-30 01:01:15 -05:00
Friendika
097c1f8da7
do not poll for abandoned accounts
2011-09-29 21:20:19 -07:00
Friendika
bc98930537
Merge branch 'pull'
2011-09-29 15:33:12 -07:00
Friendika
c68569040e
added back for photos page until we can get rid of it cleanly
2011-09-29 15:32:16 -07:00
tobiasd
dd316ef6f6
Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e
...
German strings
2011-09-29 00:06:23 -07:00
Tobias Diekershoff
6cf5da1e4b
update to the German strings
2011-09-29 09:03:06 +02:00
Friendika
6d36fab90f
reverting wall_item.tpl
2011-09-28 23:54:22 -07:00
Devlon Duthie
0881c04cea
classes added to core + testbubble theme
...
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Friendika
ffa3b67365
fix nav-selected duepuntozero
2011-09-28 23:10:23 -07:00
Friendika
5279f99278
missing uploads on testbubble
2011-09-28 22:13:33 -07:00
Friendika
50c4077c5b
basic darkbubble - improve as needed
2011-09-28 16:22:08 -07:00
Friendika
bedb4eb715
just hostname not url in hm:host - host xrd document
2011-09-28 15:07:01 -07:00
Friendika
d0f45bf281
apps broken in all themes, apps link misplaced in testbubble
2011-09-28 04:19:42 -07:00
Friendika
360a46178b
create zot batch keys
2011-09-28 03:45:48 -07:00
fabrixxm
207f739f90
Merge pull request #6 from fabrixxm/master
...
more work on ui
2011-09-28 01:35:32 -07:00
Fabio Comuni
41617ee987
fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme
2011-09-28 10:30:32 +02:00
Friendika
4343a73076
move connect button down a smidgin
2011-09-28 00:53:55 -07:00
Fabio Comuni
68a6bfdee5
Items lock icon
2011-09-28 09:43:31 +02:00
Fabio Comuni
c120cc8ea9
added missing "delete selected items" link
2011-09-28 09:32:53 +02:00
Fabio Comuni
dccd2da356
Merge remote-tracking branch 'friendika/master'
2011-09-28 09:27:59 +02:00
Friendika
44d7c6aac3
connect button overlapping profile details
2011-09-27 22:03:07 -07:00
Fabio Comuni
e986fc3e30
quattro: actions in wall_item
...
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Friendika
75af366122
zot/salmon new key format for batch keys
2011-09-27 06:50:18 -07:00
Friendika
59525e1e32
restore privacy icons after theme upgrade
2011-09-27 05:24:26 -07:00
Fabio Comuni
30df9abeac
fix loozah themes navbar
2011-09-27 13:45:25 +02:00
Friendika
1e288dc8a3
loozah theme vcard float not cleared
2011-09-27 01:32:54 -07:00
Friendika
8c6e7a24cd
Merge branch 'pull'
2011-09-27 01:29:08 -07:00
Friendika
2118dd3160
vcard elements float not cleared
2011-09-27 01:28:22 -07:00
Fabio Comuni
3dca29b3d5
port old themes
2011-09-27 10:19:32 +02:00
Fabio Comuni
e9638b6980
Adds theme info file to define 'parent' theme from where load tpl files
2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a
Merge remote-tracking branch 'fabrix/newui'
2011-09-27 08:57:16 +02:00
Devlon Duthie
78c3210f6a
fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly
...
+ some opera-friendly style changes
2011-09-27 00:29:34 -05:00
Fabio Comuni
ec4061e6fe
quattro: fix star
2011-09-26 11:50:48 +02:00
Fabio Comuni
968e7bb3b1
Fixes for testbubble
2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358
Merge branch 'master' into newui
2011-09-26 11:42:48 +02:00
Friendika
428e676641
fix minor placement issues on old themes from testbubble theme changes
2011-09-25 22:29:30 -07:00
Devlon Duthie
c05178c105
notification theming + other misc. styling
2011-09-25 22:09:41 -05:00
Devlon Duthie
7285bb2db9
added templates to testbubble theme to clarify the delete buttons vsxt on the edit group/drop group
...
misc. changes to notifications.png for style-specific icons
2011-09-25 19:23:26 -05:00
Devlon Duthie
1a3cc02b41
moved 'view in contextabove the 'end' line of a wall item so it's clear that the link belongs to that item
...
some various other css tweaks
2011-09-25 18:33:19 -05:00
Devlon Duthie
25dbedd971
fixed jot perms button to be less lame
2011-09-25 18:05:57 -05:00
Devlon Duthie
7dbf112092
added widget class to saved arch block on search page
...
added header to search results where there are results
2011-09-25 16:01:05 -05:00
Devlon Duthie
a1fc1be9da
added contact_edit.tpl to testbubble theme, moved drop iconinto contact-edit-links divs
2011-09-25 15:49:33 -05:00
Devlon Duthie
19963884c2
moved invite friends into 'find people' block
...
misc. styling tweaks
2011-09-25 15:45:03 -05:00
Devlon Duthie
45043b77f1
fixed styling of register link to handle case where registration is closed
...
moved lost plink into div with login submit button
2011-09-25 15:08:31 -05:00
Devlon Duthie
f96d8fba3a
changed class of visible test under profle, was picking up styling for buttons
2011-09-25 14:20:25 -05:00
Devlon Duthie
bbaec4cb78
moved contact group header out of scrolling div so it doens't vanish whenlot
...
more css tweaks
2011-09-25 14:08:08 -05:00
Devlon Duthie
cb1c6dd1e3
really commiting files this time, still getting the hang of git.
...
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
2011-09-25 13:20:19 -05:00
Devlon Duthie
634e52a671
added testbubble mai, and modified some core fle to add classes
2011-09-24 23:54:23 -05:00
Friendika
3a2bf8ab7c
w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator
2011-09-23 03:12:31 -07:00
Friendika
c63adcfae0
bug #159 multiple definition of string_plural_form function when changing languages
2011-09-21 07:09:37 -07:00
Friendika
deeae7bdb5
diaspora markdown changes, parse_url format change
2011-09-20 15:23:36 -07:00
Friendika
8a11cec61a
allow setting all the bookmarked URL fields via script/API
2011-09-19 22:21:55 -07:00
Friendika
d6d24f3b6a
personal notes going to wall instead of PN in dispy
2011-09-19 16:51:52 -07:00
fabrixxm
ad3d2bd6ae
Merge pull request #173 from fabrixxm/master
...
a pair of missing IT email templates
2011-09-19 05:45:43 -07:00
Fabio Comuni
ca71808515
IT: missing email templates
2011-09-19 14:43:17 +02:00
Fabio Comuni
991656a3ef
Show "404.tpl" instead of using 'notice()' in case of 404
2011-09-19 11:52:32 +02:00
Friendika
0a30a91b14
basic zot discovery framework
2011-09-19 02:13:59 -07:00
Friendika
672ecc7f7d
more tag infrastructure
2011-09-18 22:42:47 -07:00
Fabio Comuni
6b6f45f9f1
quattro: initial style of conversations
2011-09-16 12:51:14 +02:00
Fabio Comuni
80af4f3fe6
new icons
2011-09-16 12:50:15 +02:00
Fabio Comuni
9d2afc2d3c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-16 09:39:29 +02:00
Fabio Comuni
019b735ec7
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
2011-09-15 10:39:41 +02:00
Fabio Comuni
7e806429cc
quattro
2011-09-15 10:38:37 +02:00
Friendika
d7a2ab9c1f
send profile visits to 'redir' window
2011-09-09 16:22:32 -07:00
Friendika
3f59f63224
saved searches on search page, templates: Invalid argument supplied for foreach() on line 167
2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-08 20:15:27 +02:00
Fabio Comuni
2f93a4d70d
style vcard infos
2011-09-08 10:11:57 +02:00
Friendika
18315a1377
Russian translation (80% complete)
2011-09-06 01:52:45 -07:00
Friendika
eeecb412aa
view bookmarks
2011-09-06 00:55:24 -07:00
Friendika
e921b97a7f
bug #127 , add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
2011-09-05 18:34:30 -07:00
Fabio Comuni
08e54234e3
profiles popup menu in sidebar
2011-09-05 16:55:40 +02:00
Fabio Comuni
abd65e00ab
Load infos and notices via ping and show them with js popup
2011-09-05 14:01:21 +02:00
Fabio Comuni
14125ce67b
Add tipTip js tooltips
2011-09-05 11:32:40 +02:00
Fabio Comuni
2c1aca7ffe
fix aside contact block, add edit profiles icon
2011-09-05 11:16:08 +02:00
Fabio Comuni
20ca451200
move js to js folder
2011-09-05 11:15:30 +02:00
Fabio Comuni
ab5bda526e
move icons style in new file
2011-09-05 11:14:43 +02:00
Fabio Comuni
0283cbfcd3
Merge remote-tracking branch 'friendika/master' into newui
2011-09-05 09:09:34 +02:00
Friendika
7e8100d2cd
custom attags
2011-09-04 22:40:36 -07:00
Friendika
82f7f33cf5
bookmarks + bug #140
2011-09-04 19:58:03 -07:00
Friendika
481853d2cc
saved searches on network page
2011-09-04 17:35:06 -07:00
Friendika
f6a43afb8d
set max height of acl names to avoid wrap
2011-09-04 06:18:26 -07:00
Friendika
e440353013
truncate overflow text on acl selector items (3 themes)
2011-09-04 05:41:11 -07:00
Friendika
d49895a8a1
Merge pull request #169 from michal-s/master
...
minor changes of czech translations
2011-09-02 22:20:47 -07:00
Michal Supler
7813f1798f
minor changes of czech translations
2011-09-03 02:01:15 -03:00
Erkan Yilmaz
463a136c15
typo in German admin log page
2011-09-02 10:17:17 +02:00
Fabio Comuni
058e329dfb
Fix profile vcard and style
2011-09-01 12:37:30 +02:00
Fabio Comuni
18f6d4e639
small fix to IT strings
2011-09-01 12:39:42 +02:00
Fabio Comuni
8b615133d5
remove html from profile vcard code
2011-08-31 17:31:44 +02:00
Fabio Comuni
54f0685a03
quattro: more colors
2011-08-31 17:30:48 +02:00
Fabio Comuni
62295af1f2
quattro: cleanup and split of less files
2011-08-31 16:19:17 +02:00
Fabio Comuni
5ce6f893a6
Apps popup menu in navbar
2011-08-31 16:18:03 +02:00
Fabio Comuni
71d44d78ec
Installed apps as array instead of string
2011-08-31 16:17:32 +02:00
Fabio Comuni
d0926240a8
Merge remote-tracking branch 'friendika/master' into newui
2011-08-30 11:00:23 +02:00
Friendika
22d9d97d71
remove "online reputation" section on contact editing - nobody ever uses it, and there is no interface to query it.
2011-08-29 19:18:59 -07:00
fabrixxm
8438da7d70
Small fix to IT strings
2011-08-26 16:36:02 +02:00
Friendika
99ea045723
some minor work on contact edit page
2011-08-25 18:12:42 -07:00
Friendika
83605cf3dc
theme settings for contact photo menu
2011-08-25 05:15:05 -07:00
Friendika
71fc694c67
contact photo menu
2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b
contact menu beginnings
2011-08-24 22:40:26 -07:00
Olivier Migeot
1548449586
Small fix
2011-08-24 18:04:16 +02:00
Olivier Migeot
1f5a67c81f
French translation up to date.
2011-08-24 17:47:21 +02:00
Tobias Diekershoff
56c29a527d
Merge github.com:tobiasd/friendika
2011-08-24 07:38:05 +02:00
Friendika
56d64316f4
diaspora photos ?
2011-08-23 18:17:35 -07:00
Tobias Diekershoff
9cd28af4e8
fixed a missing string in DE
2011-08-23 06:32:21 +02:00
Friendika
eb2ef6dec4
diaspora admin toggle, update install guide
2011-08-22 18:52:02 -07:00
fabrixxm
d5567eb297
compatiblity for old themes
2011-08-22 14:06:55 +02:00
fabrixxm
d8bd4fbb3e
Merge branch 'master' into newui
2011-08-22 13:56:08 +02:00
Michal Supler
f3c5154f0c
added Czech translation of mail messages
2011-08-21 23:45:43 -03:00
fabrixxm
b465d1f30b
Merge pull request #158 from fabrixxm/master
...
Some works on API
2011-08-19 08:03:20 -07:00
fabrixxm
fc9c73da49
API: missing template and small fix for hotot
2011-08-19 15:09:10 +02:00
Friendika
609741573c
darkzero - friend request - identity address invisible
2011-08-18 17:11:57 -07:00
tobiasd
bdd71b10be
Merge pull request #155 from tobiasd/master
...
update DE strings
2011-08-18 01:07:33 -07:00
Tobias Diekershoff
bea02876eb
update DE strings
2011-08-18 10:05:33 +02:00
Friendika
9634287839
fix several probe related issues
2011-08-17 23:01:44 -07:00
fabrixxm
8cc368966d
Update IT strings
2011-08-17 19:52:10 +02:00
fabrixxm
07b6c868b3
remove javascript to set selectect nav item. enanche img template prefetch ignoring
2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0
Merge remote-tracking branch 'friendika/master' into newui
2011-08-17 17:35:37 +02:00
Friendika
b28b468b21
cleanup
2011-08-16 20:05:02 -07:00
Friendika
e15e18e0d1
hopefully fix statusnet bug by altering our feed format slightly
2011-08-12 21:01:51 -07:00
Friendika
e3841ce15c
pt-br strings.php update from messages.po change
2011-08-09 19:05:43 -07:00
Abinoam P. Marques Jr.
4cfe75c6bc
small typo - pt-br localization
2011-08-09 22:34:44 -03:00
Tobias Diekershoff
e2873e542b
fixed some typos
2011-08-09 16:19:39 +02:00
Tobias Diekershoff
97b2c56c98
update of the German localization
2011-08-09 15:57:08 +02:00
Friendika
7eb7f77413
use separate hcard from profile url
2011-08-07 19:26:44 -07:00
Friendika
8ae0a8a94c
fix statusnet_html timelines on api
2011-08-05 07:26:54 -07:00
Friendika
1d659bd854
move public profile warning to top of page
2011-08-05 06:42:27 -07:00
Friendika
112fc59e31
more api tweaks
2011-08-05 05:17:18 -07:00
Friendika
2abcf76ec1
salmon protocol changes magicsig draft-experimental, fixes to hostxrd
2011-08-04 22:37:45 -07:00
Friendika
639204c2ec
diaspora structures
2011-08-03 22:05:20 -07:00
Friendika
1aaded10b4
api compatibility fixes
2011-08-02 20:02:07 -07:00
Friendika
2637831d90
some more zot changes migrating back to f9a mainline
2011-08-01 21:02:25 -07:00
Friendika
326a873082
merge diaspora/friendika vcard formats - not yet complete
2011-08-01 05:13:59 -07:00
Friendika
0c9f033505
some api enhancements
2011-07-31 16:35:53 -07:00
Fabio Comuni
6c423feed2
add missing link to navbar
2011-07-29 16:32:01 +02:00
Fabio Comuni
97eea6ecd6
style update
2011-07-29 16:24:18 +02:00
Fabio Comuni
d12e2cbfe9
Fix nav template and add missing strings
2011-07-29 16:23:47 +02:00
Friendika
f47d582736
api/statusnet/config.xml
2011-07-28 21:56:56 -07:00
Friendika
41c7d71e3b
make profile-jot-desc track lock state changes
2011-07-28 20:44:35 -07:00
Friendika
04675e3ec3
revup
2011-07-28 16:49:43 -07:00
Friendika
06802dd8fe
auto focus jot editor
2011-07-25 20:10:21 -07:00
Fabio Comuni
23d6339a41
change to some nav ids, notice in empty notifications popup
2011-07-25 17:12:42 +02:00
Fabio Comuni
ba4ea589d0
update style
2011-07-25 16:55:43 +02:00
Fabio Comuni
5fb2b522f4
move <header> and <nav> tag into nav.tpl. add notification popup items template
2011-07-25 16:53:27 +02:00
Fabio Comuni
dfba0f13c8
Merge branch 'newacl' into newui
2011-07-25 08:59:28 +02:00
Fabio Comuni
363c4c5798
Remove "share" greyed text in jot editor when user reshare an item
2011-07-25 08:56:51 +02:00
Tobias Diekershoff
a09bdf5ad6
added link to community page to dispy theme menu
2011-07-24 11:07:39 +02:00
Tobias Diekershoff
a4f7e8e8fe
dispy theme hide editor if without focus
2011-07-24 09:32:20 +02:00
Tobias Diekershoff
abc01cad20
Merge branch 'master' of git://github.com/friendika/friendika
2011-07-23 07:43:25 +02:00
Tobias Diekershoff
a213a9babf
dispy ACL into the fancybox
2011-07-23 07:41:20 +02:00
Fabio Comuni
93eda9d9c1
Initial work on new UI
2011-07-22 17:37:51 +02:00
Fabio Comuni
5c9eb19767
fix "resend" function when editor is disabled
2011-07-22 08:46:29 +02:00
Fabio Comuni
096ecba883
Use new ACL selector in photo edit
2011-07-20 14:19:20 +02:00
Fabio Comuni
19c93adf84
Use popup ACL selector in photo upload. js_upload use new acl selector.
2011-07-20 11:40:24 +02:00
Fabio Comuni
7a069c1438
Load tinyMCE on post editor only if needed.
2011-07-20 11:08:42 +02:00
Fabio Comuni
020deefba6
Merge remote-tracking branch 'friendika/master' into newacl
2011-07-20 10:01:12 +02:00
Fabio Comuni
1c9ed08620
show acl selector in a popup with fancybox
2011-07-20 10:00:33 +02:00
Friendika
9048ecd85c
diaspora encryption xml template
2011-07-19 22:58:38 -07:00
Friendika
1d35d1e5a1
Merge pull request #141 from fabrixxm/newacl
...
New jot ACL selector
2011-07-19 17:24:09 -07:00
Fabio Comuni
0a3ae96093
add icons to acl selector
2011-07-19 17:15:34 +02:00
Fabio Comuni
89eefbe46c
Fix style and scrollbar
2011-07-19 16:34:27 +02:00
Fabio Comuni
9fa0956966
New jot acl selector
2011-07-19 16:17:58 +02:00
Friendika
07a77a4d27
resize editor
2011-07-18 21:25:49 -07:00
Friendika
7008bec045
improved code blocks
2011-07-18 19:17:16 -07:00
Friendika
c0b8e63a3f
basic diaspora discovery
2011-07-18 18:13:46 -07:00
Friendika
25b4aacf3b
green icons for greenzero
2011-07-18 16:42:39 -07:00
Friendika
1fa2231c20
invite system
2011-07-17 21:12:31 -07:00
Friendika
f35a61761a
Merge pull request #139 from fabrixxm/update
...
Experiment with on-line update
2011-07-15 01:29:46 -07:00
Friendika
ed94028894
template for statusnet api config.xml
2011-07-14 03:38:25 -07:00
Friendika
7534b8873b
link tips on nav bar
2011-07-14 03:05:54 -07:00
Fabio Comuni
34ab2aa959
move update link in admin aside
2011-07-13 08:58:47 +02:00
Friendika
74a608e1c7
openid settings appearing when disabled, don't tag numbers, install admin not getting set
2011-07-12 23:14:38 -07:00
Friendika
706b6e8c84
email notifications not working - unable to change notification settings
2011-07-12 05:09:07 -07:00
Fabio Comuni
4fdc5ff30c
First test for friendika "live" update
2011-07-08 17:12:08 +02:00
Friendika
2d2b500639
input the admin email address during install/setup.
2011-07-07 19:12:35 -07:00
Friendika
d99dfbe4ef
friendika-z configuration details in admin page
2011-07-07 18:25:56 -07:00
Friendika
8cc6e69705
Merge pull request #138 from fabrixxm/master
...
some minor tweaks
2011-07-07 15:33:32 -07:00
Fabio Comuni
bf19b219ef
duepuntozero: style blockquote
2011-07-07 14:27:39 +02:00
Fabio Comuni
4116beb276
duepuntozero: style "connect" link in profile page
2011-07-07 14:03:47 +02:00
Friendika
d7b5a606fb
don't show mailbox settings at all if disabled
2011-07-06 20:27:18 -07:00
Fabio Comuni
2c2df90dc0
Add missing files from previus checkin
2011-07-06 14:19:03 +02:00
Fabio Comuni
e7834e60f8
Update settings page to use field templates.
...
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
92831c9416
Merge pull request #135 from fabrixxm/dispy
...
More Dispy css
2011-07-04 22:17:35 -07:00
fabrixxm
4e7a5dc56e
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
2011-07-05 07:11:57 +02:00
Friendika
20d3aa2e77
community page
2011-07-04 20:57:07 -07:00
Fabio Comuni
2359783b9f
dispy: style private mails
2011-07-04 11:30:53 +02:00
Friendika
9871cc8c0e
profile match layout issues
2011-07-03 22:53:11 -07:00
Friendika
5ceeb6752d
starred items
2011-07-03 19:41:04 -07:00
Friendika
ab7f209fe3
add starred, unstarred icons to duepuntozero, loozah
2011-07-02 20:51:27 -07:00
Friendika
24836f2966
improvied group highlighting, move new group link down
2011-07-02 02:47:01 -07:00
Friendika
2d4f2f86cb
improved group-selected highlighting
2011-07-02 02:34:19 -07:00
Friendika
b1aa77584f
indicate currently selected group in group picker
2011-07-01 06:14:15 -07:00
Friendika
53653f6a4d
consolidate perrmisions sql, minor duepuntozero validation fixes
2011-06-30 17:35:35 -07:00
Fabio Comuni
762bb8de79
update oembed and widgets plugins settings form
2011-06-30 17:00:26 +02:00
Fabio Comuni
779292077c
style template field outside admin pages
2011-06-30 16:43:04 +02:00
Fabio Comuni
81e7535914
Add javascript var "baseurl"
...
Add field_richtext template
2011-06-30 16:42:27 +02:00
Fabio Comuni
f4a1820110
re-added last item date in admin user page. relative_date return 'never' if null is passed
2011-06-29 16:06:32 +02:00
Fabio Comuni
1e307e9869
Fix bug #98 , add "never" to relative_date(), fix batch operations
2011-06-29 12:05:09 +02:00
Friendika
5023eed605
change simplepie path in dispy
2011-06-28 21:30:46 -07:00
Friendika
0b221e8945
bug #96 move libraries to library - better alignment of like rotator
2011-06-28 21:11:52 -07:00
Friendika
60caa03494
darkzero textareas hard to read
2011-06-28 19:08:13 -07:00
Tobias Diekershoff
399c5aed1e
added deleteCheckedItems to jot-header.tpl
2011-06-28 13:03:19 +02:00
Friendika
1947b74e5b
some basic margins for friend suggestion screen
2011-06-27 16:18:06 -07:00
fabrixxm
cfd59f6ac8
dispy: photos display don't overflow onto sidebar
2011-06-27 18:23:03 +02:00
Friendika
c410c9013c
friend suggestions
2011-06-26 22:57:08 -07:00
Friendika
23f00aaab4
recipient ui, friend suggestions
2011-06-26 21:55:24 -07:00
Friendika
3fe1e19725
pass notify endpoint with friend suggestions
2011-06-26 19:30:57 -07:00
Friendika
59d9070d13
suggestion template
2011-06-25 19:10:38 -07:00
Fabio Comuni
e7737d2ea4
dispy: style profile tab
2011-06-23 12:36:36 +02:00
Fabio Comuni
95a933c9a2
dispy: update icons, style events
2011-06-23 12:13:04 +02:00
Fabio Comuni
5de7d0f12f
add profile tabs to "photos", "events" and "notes". in dispy, show active tab.
2011-06-23 11:30:17 +02:00
Fabio Comuni
655f5c7b9f
use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>".
...
This seem to make StatusNet Desktop client work better.
2011-06-21 12:00:52 +02:00
Fabio Comuni
7cd7a79807
remove duplicate tag in atom response
2011-06-21 11:44:26 +02:00
Fabio Comuni
296f1b0123
add users infos to rss and atom api responses
2011-06-21 11:41:16 +02:00
Friendika
55112cfdd0
item source
2011-06-20 19:08:40 -07:00
Friendika
db336929cd
add rate limit call so spaz will work
2011-06-20 17:16:13 -07:00
Friendika
f256e31e4f
Merge pull request #122 from tobiasd/master
...
German language stuff
2011-06-20 04:17:37 -07:00
Friendika
b86ae9de7f
use atom_time on atom entries
2011-06-20 01:38:26 -07:00
Tobias Diekershoff
f0c5a1b21b
typo and wording for the German language files
2011-06-20 09:47:42 +02:00
Friendika
b56e00c7c5
api post sort of working - output status,user need to be swapped
2011-06-19 20:13:24 -07:00
Friendika
c2dcff0d02
move profile privacy settings to the Privacy section of the Settings page
2011-06-19 16:47:03 -07:00
fabrixxm
33bafa62aa
dispy code tag style
2011-06-19 12:17:13 +02:00
fabrixxm
4bc8ab6e7d
Update dispy. Add admin link and styles, add help link, other fixes
2011-06-19 11:21:30 +02:00
fabrixxm
c10e913a4b
update admin style in loozah
2011-06-19 11:20:35 +02:00
fabrixxm
3b759585d2
fix banner in duepuntozero
2011-06-19 11:20:13 +02:00
bufalo1973
ccffd583d1
Added backslash to $name so it doesn't throws an error.
...
Añadida una barra a $name para que no dé error.
2011-06-18 14:01:49 -07:00
Friendika
cf9f23fb74
Merge pull request #118 from fabrixxm/admin
...
Admin work
2011-06-18 00:17:36 -07:00
fabrixxm
4b633d54bb
admin: fix last item date in users list, fix plugins details template
2011-06-18 08:52:51 +02:00
fabrixxm
23931ab719
Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example.
2011-06-18 08:29:59 +02:00
Friendika
9e2db5d5a6
tooltip for selecting items
2011-06-17 23:06:42 -07:00
Friendika
787f079d13
improved UI for checked items to be deleted
2011-06-17 22:58:15 -07:00
Friendika
fb0b22fb13
fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div)
2011-06-16 22:20:12 -07:00
Friendika
bb73c0b9f3
Merge branch 'pull'
2011-06-16 15:29:04 -07:00
Friendika
6709beb2ac
Merge pull request #117 from tobiasd/master
...
german strings and green background for the greenzero theme
2011-06-16 15:27:45 -07:00
Friendika
b61a7158da
Merge pull request #116 from fabrixxm/admin
...
Admin pages
2011-06-16 15:27:12 -07:00
Friendika
0f3292fefb
revup
2011-06-16 15:26:39 -07:00
Tobias Diekershoff
6802911522
put the green back in the panel background
2011-06-16 17:22:03 +02:00
Tobias Diekershoff
bca1dcf2d6
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-16 15:30:51 +02:00
Fabio Comuni
a652cd5095
admin styles to loozah. missing user admin template
2011-06-16 15:08:50 +02:00
Fabio Comuni
ede011cc32
Admin users page. some fix to template processor.
2011-06-16 14:56:43 +02:00
Fabio Comuni
5f583fb8d6
Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations.
2011-06-16 12:05:35 +02:00
Friendika
c92e6ed929
avoid race condition on delete checked items
2011-06-16 00:38:41 -07:00
Friendika
e5b54e74ba
delete selected items
2011-06-15 20:43:39 -07:00
Tobias Diekershoff
dbf6ee6a05
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-15 07:02:38 +02:00
Friendika
fcdebc2324
event theming
2011-06-14 20:07:40 -07:00
Friendika
5105b3febc
event calendar links, editing
2011-06-14 19:48:37 -07:00
Fabio Comuni
b7dc9f8867
Update info comments in all plugins
2011-06-14 15:08:03 +02:00
Fabio Comuni
00e142e4f7
Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page
2011-06-14 14:21:43 +02:00
Fabio Comuni
283160901f
update styles
2011-06-14 14:21:00 +02:00
Fabio Comuni
25d1637ec4
simple plugin details and log view in admin
2011-06-14 11:54:14 +02:00
Fabio Comuni
b1184f3fde
Merge remote-tracking branch 'friendika-master/master' into admin
2011-06-14 10:37:54 +02:00
Fabio Comuni
5882d8d022
Initial plugins admin page
2011-06-14 10:35:56 +02:00
Tobias Diekershoff
d08b068031
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-14 08:10:38 +02:00
Friendika
fb92dbf5d6
link events + personal notes to profile tabs
2011-06-13 20:32:30 -07:00
Fabio Comuni
ab27f1393e
Admin site page
2011-06-13 18:03:06 +02:00
Fabio Comuni
a1c59d6011
Fix it strings
2011-06-13 12:53:03 +02:00
Fabio Comuni
494288ab9f
Add admin page in nav
2011-06-13 12:52:52 +02:00
Fabio Comuni
3364c2a2d8
Initial admin page
2011-06-13 12:52:29 +02:00
Tobias Diekershoff
4d3c6941ca
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-11 08:33:02 +02:00
Friendika
d66056af9d
reduce visibility of lang-select flag (duepuntozero)
2011-06-10 20:39:46 -07:00
Tobias Diekershoff
8390e8b19b
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-10 07:02:53 +02:00
Friendika
b857a49bfe
event publish
2011-06-09 21:23:45 -07:00
Tobias Diekershoff
7ffd0ee41a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-09 10:20:47 +02:00
Friendika
d371241e66
events
2011-06-09 00:58:45 -07:00
Friendika
df8ac668b8
more calendar work, undo strict_privacy flag to use different approach
2011-06-08 21:06:02 -07:00
Tobias Diekershoff
9ef5cb1c38
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-08 07:21:19 +02:00
Friendika
33fe26ecb0
more progress on events
2011-06-07 20:10:43 -07:00
Tobias Diekershoff
e036434b8a
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-07 20:03:58 +02:00
fabrixxm
16446ab0d0
update it strings
2011-06-07 11:44:20 +02:00
Friendika
9f51233451
event listings
2011-06-06 20:17:36 -07:00
Fabio Comuni
89fc56723d
Add 'attach' and 'language' icons and enable file upload in dispy template
2011-06-06 15:38:21 +02:00
Friendika
edbad772ba
add flag for experimental themes
2011-06-05 18:05:25 -07:00
Friendika
c4cec593ba
position language selector in dispy
2011-06-05 17:51:39 -07:00
Friendika
4284c6f9ee
use icon for language selector instead of hotkey
2011-06-05 17:32:56 -07:00
Tobias Diekershoff
bda839635c
Update to the German language files
2011-06-01 18:34:49 +02:00
Tobias Diekershoff
2413a6b422
Merge branch 'master' of git://github.com/friendika/friendika
2011-06-01 07:56:27 +02:00
Friendika
fc34641d4a
improve colour balance and banner on html email notifications
2011-05-31 22:41:09 -07:00
Friendika
fa986849c9
Brazilian (portugese) translation
2011-05-31 21:40:57 -07:00
Friendika
b8c4d73377
show group affiliations in contact editor
2011-05-31 19:24:26 -07:00
Tobias Diekershoff
745d075397
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-31 07:36:25 +02:00
Friendika
7fb9aa24fb
bug #87 alert if email settings don't open mailbox, also display last email connect time
2011-05-29 21:20:50 -07:00
Tobias Diekershoff
087f79236e
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-30 06:19:59 +02:00
Friendika
bddcc41518
Czech (cs) language
2011-05-29 20:36:21 -07:00
Tobias Diekershoff
770d1bb7a3
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-28 10:37:33 +02:00
Friendika
341f853b04
search from network page
2011-05-26 17:47:33 -07:00
Tobias Diekershoff
5e01432c6f
Merge branch 'master' of git://github.com/friendika/friendika
2011-05-26 08:20:27 +02:00
Friendika
61b730d567
cleanup content type icons
2011-05-25 20:01:53 -07:00
Friendika
8e8054bc80
position the attach icon in loozah
2011-05-25 15:54:02 -07:00
Friendika
c0f529cf38
Merge pull request #111 from fabrixxm/dispy
...
fix profile images and contact selector in group editor in dispy theme
2011-05-25 15:48:02 -07:00
Tobias Diekershoff
e9df9d22c0
typo
2011-05-25 19:51:36 +02:00
Tobias Diekershoff
697e3464ab
German translations
2011-05-25 13:36:12 +02:00
Tobias Diekershoff
4a95b6361b
new german strings
2011-05-25 13:34:57 +02:00
Friendika
2a679b1164
file attachments
2011-05-25 02:08:15 -07:00
Friendika
de482058b8
fix attach icon
2011-05-24 23:01:24 -07:00
Friendika
73b4faca5c
basic file upload/attach
2011-05-24 22:40:52 -07:00
Friendika
eb152fdc24
more position tweaks on attach icons
2011-05-24 21:04:59 -07:00
Friendika
3239381447
better margins
2011-05-24 20:56:49 -07:00
Friendika
703ab6f5ee
remove padding
2011-05-24 20:52:23 -07:00
Friendika
87de839974
attachment display
2011-05-24 20:41:29 -07:00
Friendika
4447739702
attachment icons
2011-05-24 20:03:30 -07:00
Friendika
e3d1ef8ef7
ability to hide profile and wall from unknown people
2011-05-24 16:30:52 -07:00
Fabio Comuni
73040891f1
fix profile images and contact selector in group editor in dispy theme
2011-05-24 11:33:34 +02:00
Friendika
19ccd658eb
Merge branch 'pull'
2011-05-23 18:18:01 -07:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
fabrixxm
866940ab5d
fix IT string.php
2011-05-23 09:13:35 +02:00
Friendika
42acd9462a
set photo height,width as !important if changing defaults
2011-05-22 19:52:54 -07:00
Friendika
ae317296d7
missed two refs
2011-05-22 19:45:29 -07:00
Friendika
36966c72c8
wall item photos use style instead of height, width
2011-05-22 19:40:36 -07:00
Chris Case
991885f1d4
improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds
2011-05-22 19:18:58 -07:00
Chris Case
4cff911939
merged multipart email changes
2011-05-21 21:40:16 -07:00
Chris Case
dfc05af73b
email updates
2011-05-21 19:26:51 -07:00
Chris Case
11dd0c8571
html email updates
2011-05-21 19:23:56 -07:00
Friendika
681885a120
"notes" app
2011-05-20 01:15:02 -07:00
Friendika
9ab6055b24
textlen defined outside function
2011-05-19 20:41:40 -07:00
Friendika
20807ab8b4
dispy jot-header.tpl missing some code updates
2011-05-19 20:11:09 -07:00
Friendika
a27b7fb28d
more indicators of public visibility
2011-05-19 19:55:34 -07:00
Friendika
f151565029
bug #73 - move 'view in context' and wall-item-outside-wrapper-end inside wall-item-outside-wrapper so all item content is updated with ajax.
2011-05-18 21:49:41 -07:00
Friendika
990d5e82a0
doc updates - connecting to services
2011-05-18 17:29:12 -07:00
Tobias Diekershoff
c533370873
spelling fix
2011-05-17 16:13:50 +02:00
Friendika
f9444c8be5
admin directory view
2011-05-16 18:52:27 -07:00
Friendika
8674d01432
provide textmode "micropro" (small profile display but without the photo) for better scalability of group selection tools when confronted with huge numbers of contacts
2011-05-12 18:55:28 -07:00
Friendika
0c51305c72
Merge pull request #99 from tobiasd/master
...
updats to the DE strings
2011-05-11 19:25:04 -07:00
Friendika
1ca9263c87
bug #66 , identity address string malformed if line wraps
2011-05-11 05:23:45 -07:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Tobias Diekershoff
7689d81d9a
small changes to the new translations
2011-05-11 10:56:39 +02:00
Tobias Diekershoff
5609353fc3
updated the German translation
2011-05-11 10:49:07 +02:00
Friendika
5eea0d5ecb
photo lockview not working, temp fix for po2php
2011-05-10 20:10:13 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Fabio Comuni
70fdba924e
Update IT strings
2011-05-10 14:20:18 +02:00
Friendika
944f1a7f4c
extra slashes in header
2011-05-10 02:18:39 -07:00
Friendika
26d748f6d8
Merge pull request #96 from fabrixxm/api
...
Status.net Api
2011-05-05 04:29:45 -07:00
Friendika
b3fa03d3b4
Merge pull request #95 from fabrixxm/dispy
...
Dispy
2011-05-05 04:29:14 -07:00
Fabio Comuni
b70a2dad33
Dispy theme works
2011-05-05 10:53:25 +02:00
Fabio Comuni
b3a5fccc9d
template for photo display
2011-05-05 10:53:03 +02:00
Friendika
6348e4e47b
contact edit tool buttons a bit crowded
2011-05-04 22:18:36 -07:00
Friendika
59fd70e568
issues with private photos - hitting internal size limits
2011-05-04 02:20:44 -07:00
Friendika
07d4cf53ad
Merge pull request #94 from fabrixxm/dispy.
...
Dispy theme
2011-05-02 15:43:27 -07:00
fabrixxm
c003dbc4a4
remove unneeded file
2011-05-02 22:04:11 +02:00
fabrixxm
d359b5088f
Merge remote-tracking branch 'origin/dispy' into dispy
2011-05-02 22:00:17 +02:00
fabrixxm
1b01eebc1e
Dispy theme works
2011-05-02 21:57:21 +02:00
Friendika
6c47f262cc
warn if msg is visible to all
2011-05-01 19:50:00 -07:00
Fabio Comuni
2f83e134f9
Dispy: fix user menu order, alignment issues, new items counters not showing up, jot acl, contact edit, location display
2011-04-29 12:37:35 +02:00
Fabio Comuni
dd053ebe22
fix icons in item toolbar and edit contact
2011-04-29 10:40:58 +02:00
fabrixxm
f6984f9929
works on dispy theme
2011-04-28 19:32:35 +02:00
fabrixxm
9393e3321d
Dispy theme
2011-04-28 19:01:46 +02:00
fabrixxm
daa7dc983b
Icons as CSS classes, hide net/home/mail/notify-update divs with no value
2011-04-28 19:01:35 +02:00
fabrixxm
976d1eaf43
API work
2011-04-27 17:46:23 +02:00
Fabio Comuni
41f6ccc039
More works on api
2011-04-21 17:03:31 +02:00
Friendika
b93b04e4a1
macro typo
2011-04-20 06:06:29 -07:00
Friendika
3787e1e500
provide disclosure warning on private network page
2011-04-19 21:09:25 -07:00
Friendika
a0179235d2
provide a way to disable mailbox integration
2011-04-18 20:20:04 -07:00
Friendika
b84f49df10
Merge branch 'translateitems' of https://github.com/fabrixxm/friendika into fabrixxm-translateitems
2011-04-18 15:51:03 -07:00
Friendika
42613902ed
sv update
2011-04-18 15:35:04 -07:00
Fabio Comuni
ee16413935
Merge remote-tracking branch 'friendika-master/master'
2011-04-18 16:58:20 +02:00
Friendika
b81eefbffb
sv language had unquoted quotes in strings
2011-04-17 23:38:12 -07:00
Friendika
229eb9c681
Merge branch 'imap'
2011-04-17 23:28:39 -07:00