Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
Simon L'nu
686fe47b88
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add js to hide nav-menus, when clicked outside
fixes in css
recover contacts total count which got lost
bug #324 - tinymce used for mail even if editplain being used.
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
keep tony from talking to himself
* master:
2012-03-09 19:02:29 -05:00
friendica
a02ffbcc86
Merge branch 'pull'
2012-03-09 14:44:29 -08:00
friendica
92a93642e1
revup
2012-03-09 14:43:48 -08: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
friendica
42d622d6bf
recover contacts total count which got lost
2012-03-09 02:50:57 -08: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
friendica
312c175045
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
2012-03-09 00:31:17 -08:00
Simon
d050762e4d
Merge pull request #114 from simonlnu/master
...
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size.
2012-03-08 21:28:35 -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
friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
Simon
0188e2b3ee
Merge pull request #113 from simonlnu/master
...
dispy stable enough to be considered stable IMO
2012-03-08 21:03:16 -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
friendica
ab900eb59e
Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
...
More improved transparency smileys
2012-03-08 18:20:10 -08: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
Thomas
6ae5962b00
More improved transparency for smilies
2012-03-09 01:49:12 +00: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
bacb3207ad
Merge branch 'pull'
2012-03-08 14:35:48 -08:00
friendica
3b47626c15
Merge https://github.com/friendica/friendica into pull
2012-03-08 14:35:47 -08:00
friendica
3cfa83c3db
revup
2012-03-08 14:34:58 -08:00
tommy tomson
b9dda93f0c
add theme diabook-blue, fix css
2012-03-08 23:22:26 +01:00
Simon L'nu
b584b26323
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-08 15:30:47 -05:00
Simon
b52a6ea033
Merge pull request #108 from simonlnu/master
...
make svg from notifications.svg to ease future editing. more dispy tweaks
2012-03-08 10:39:03 -08: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
Simon L'nu
bc3051e113
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
add links to /profiles, add some icons to diabook/icons, fixes in css
Update README
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
* master:
2012-03-08 10:46:40 -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
friendica
b7bfff12b9
Update README
2012-03-08 16:25:14 +11:00
friendica
03b5e3aa0c
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
2012-03-07 21:12:31 -08:00
Simon L'nu
d90c830332
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
still getting parent relays on remote systems
revup
* master:
2012-03-07 22:30:46 -05:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
6525507a2f
Merge branch 'pull'
2012-03-07 15:55:20 -08:00
friendica
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
Simon
098c98f62a
Merge pull request #105 from simonlnu/master
...
fix dispy breakage in jot.tpl
2012-03-07 09:36:28 -08: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
4d58357b15
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-07 12:32:28 -05:00
Simon
58c557b3ad
Merge pull request #104 from simonlnu/master
...
push fix for funky menu action. the overflow-x might break again for some people
2012-03-07 07:08:23 -08: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
