friendica
|
3878b58f0d
|
bug #324 - tinymce used for mail even if editplain being used.
|
2012-03-09 00:47:10 -08: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 |
|
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 |
|
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 |
|