This website requires JavaScript.
48306e1fae
Merge pull request #121 from simonlnu/master
2012-03-11 07:15:35 -07:00
62fe48f064
fix more stuff
2012-03-11 10:14:31 -04:00
eb3b211461
New plugin that shows community pages in the sidebar
2012-03-11 14:22:19 +01:00
076393c9e7
Merge pull request #120 from simonlnu/master
2012-03-11 06:13:10 -07:00
57d8370376
fix some stuff right away
2012-03-11 09:12:31 -04:00
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 11:27:47 +00:00
6cbd765e1f
Revert "OpenID: display error msg if ID URL used to register an account does not exist"
2012-03-11 12:03:47 +01:00
3c16850383
OpenID: display error msg if ID URL used to register an account does not exist
2012-03-11 12:00:32 +01:00
50863a19eb
Merge pull request #119 from simonlnu/master
2012-03-10 22:33:40 -08:00
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
2012-03-11 01:32:11 -05:00
dfdf0f1335
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-11 01:24:59 -05:00
5915325367
bug #328
2012-03-10 18:52:50 -08:00
d9c5d9d2eb
default the text template var on conversations
2012-03-10 15:53:36 -08:00
1bddd48661
bug #327 - composed private message is lost if no recip specified.
2012-03-10 15:50:51 -08:00
4f606ff633
Merge branch 'pull'
2012-03-10 14:45:23 -08:00
20d1a16dbb
revup
2012-03-10 14:44:43 -08:00
670b571c8a
Caching improved.
2012-03-10 18:19:00 +01:00
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
c79cb57e1e
Merge pull request #118 from tomtom84/master
2012-03-10 04:24:49 -08:00
0f3255467e
fixed login-fields, fixed. notofication.png, changed locations
2012-03-10 13:22:41 +01:00
e098147c24
New config options if ostatus polling should use the priority in the contacts
2012-03-10 11:29:40 +01:00
1e37477fdc
German translation
2012-03-10 10:36:20 +01:00
15916a2cb7
Mail: Removing signatures, gpg, unnecessary line breaks
2012-03-10 09:52:20 +01:00
665ad7e660
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-10 00:15:29 -05:00
d50a839c04
Merge branch 'pull'
2012-03-09 19:50:45 -08:00
0e3b9097f6
spec directory
2012-03-09 19:50:31 -08:00
a374bbcf81
Merge pull request #117 from unary/issue299
2012-03-09 19:42:52 -08:00
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
686fe47b88
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-09 19:02:29 -05:00
cb1ecf2c5a
diabook: Moving the location between the icons
2012-03-10 00:15:27 +01:00
a02ffbcc86
Merge branch 'pull'
2012-03-09 14:44:29 -08:00
92a93642e1
revup
2012-03-09 14:43:48 -08:00
68ca29719e
Merge pull request #116 from tomtom84/master
2012-03-09 09:17:01 -08:00
8fe4645a5d
add js to hide nav-menus, when clicked outside
2012-03-09 18:15:27 +01:00
68541b5dd2
Merge pull request #115 from tomtom84/master
2012-03-09 04:24:59 -08:00
9f441731af
fixes in css
2012-03-09 13:23:38 +01:00
f8042d0445
splitted test cases.
2012-03-09 12:57:11 +01:00
21589c5ece
changed a test string
2012-03-09 12:18:37 +01:00
af34cf019c
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 12:17:19 +01:00
f84c191f8d
added some tests
2012-03-09 12:16:58 +01:00
42d622d6bf
recover contacts total count which got lost
2012-03-09 02:50:57 -08:00
11c29e0cba
Merge commit 'upstream/master'
2012-03-09 11:41:23 +01:00
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
2ce78253ae
Merge branch 'pull'
2012-03-09 00:48:16 -08:00
3878b58f0d
bug #324 - tinymce used for mail even if editplain being used.
2012-03-09 00:47:10 -08:00
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
d050762e4d
Merge pull request #114 from simonlnu/master
2012-03-08 21:28:35 -08:00
81f5b0e2df
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
2012-03-09 00:26:54 -05:00
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
0188e2b3ee
Merge pull request #113 from simonlnu/master
2012-03-08 21:03:16 -08:00
dc8d060d4d
i consider dispy pretty stable at this point, so i'm removing the experimental file
2012-03-09 00:00:56 -05:00
20b2090182
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-08 23:59:43 -05:00
e25fb2b2f9
Merge pull request #112 from tomtom84/master
2012-03-08 19:39:39 -08:00
e06b941307
removed info
2012-03-09 04:38:20 +01:00
92ab98f8d8
Merge pull request #111 from tomtom84/master
2012-03-08 19:16:01 -08:00
722f631d15
add info
2012-03-09 04:14:24 +01:00
ab900eb59e
Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
2012-03-08 18:20:10 -08:00
05561bd905
Merge pull request #110 from tomtom84/master
2012-03-08 18:02:25 -08:00
feda3cfc96
fixed star-bug
2012-03-09 02:59:13 +01:00
eb84a22da7
Merge remote-tracking branch 'upstream/master'
2012-03-09 01:50:51 +00:00
6ae5962b00
More improved transparency for smilies
2012-03-09 01:49:12 +00:00
8d19baadff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-08 20:38:54 -05:00
b86a08166c
theme info file for testbubble
2012-03-08 16:30:45 -08:00
af9f7da449
catalan translation
2012-03-08 16:29:22 -08:00
bacb3207ad
Merge branch 'pull'
2012-03-08 14:35:48 -08:00
3b47626c15
Merge https://github.com/friendica/friendica into pull
2012-03-08 14:35:47 -08:00
3cfa83c3db
revup
2012-03-08 14:34:58 -08:00
b9dda93f0c
add theme diabook-blue, fix css
2012-03-08 23:22:26 +01:00
b584b26323
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-08 15:30:47 -05:00
b52a6ea033
Merge pull request #108 from simonlnu/master
2012-03-08 10:39:03 -08:00
5fe8952c29
make svg from notifications.svg to ease future editing. more dispy tweaks
2012-03-08 13:37:45 -05:00
2e3116a11e
added library and include to .htaccess
2012-03-08 17:46:40 +01:00
fbd7e8f8ba
excludes reports from git
2012-03-08 17:44:57 +01:00
185fcd0701
better tests
2012-03-08 17:43:12 +01:00
bc3051e113
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-08 10:46:40 -05:00
08b5ede5a1
Merge pull request #107 from tomtom84/master
2012-03-08 05:52:14 -08:00
1fcbc7aa5a
add links to /profiles, add some icons to diabook/icons, fixes in css
2012-03-08 14:49:07 +01:00
b7bfff12b9
Update README
2012-03-08 16:25:14 +11:00
03b5e3aa0c
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
2012-03-07 21:12:31 -08:00
d90c830332
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-07 22:30:46 -05:00
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
6525507a2f
Merge branch 'pull'
2012-03-07 15:55:20 -08:00
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
098c98f62a
Merge pull request #105 from simonlnu/master
2012-03-07 09:36:28 -08:00
15d310e4c3
fix jot.tpl buttons. fix up subsequent styling breakage
2012-03-07 12:35:04 -05:00
4d58357b15
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-07 12:32:28 -05:00
58c557b3ad
Merge pull request #104 from simonlnu/master
2012-03-07 07:08:23 -08:00
66d2c52b5f
push fix for funky menu action. the overflow-x might break again for some people
2012-03-07 10:07:36 -05:00
62fffdb018
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-07 10:05:32 -05:00
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-07 12:06:20 +01:00
b2df1205ef
merged
2012-03-07 12:06:09 +01:00
dd2ff7c796
Merge pull request #103 from tomtom84/master
2012-03-06 23:44:18 -08:00
ec3ce05357
fix in navbar
2012-03-07 00:47:43 +01:00
edfa7dbac2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-06 21:33:56 -05:00
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
39a49d51e3
remove stray debugging
2012-03-06 16:28:52 -08:00
73fc4cfc72
removed dolphin file (wtf?)
2012-03-07 00:12:24 +00:00
30d6b4c10e
.
2012-03-07 00:08:50 +00:00
Simon
Simon L'nu
Michael Vogel
Tobias Hößl
Tobias Diekershoff
friendica
tomtom84
tommy tomson
Michael Johnston
Alexander Kampmann
Thomas