-
20b2090182
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-08 23:59:43 -05:00
-
-
-
-
e25fb2b2f9
Merge pull request #112 from tomtom84/master
tomtom84
2012-03-08 19:39:39 -08:00
-
-
-
-
e06b941307
removed info
tommy tomson
2012-03-09 04:38:20 +01:00
-
92ab98f8d8
Merge pull request #111 from tomtom84/master
tomtom84
2012-03-08 19:16:01 -08:00
-
-
722f631d15
add info
tommy tomson
2012-03-09 04:14:24 +01:00
-
ab900eb59e
Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
friendica
2012-03-08 18:20:10 -08:00
-
-
05561bd905
Merge pull request #110 from tomtom84/master
tomtom84
2012-03-08 18:02:25 -08:00
-
-
-
-
feda3cfc96
fixed star-bug
tommy tomson
2012-03-09 02:59:13 +01:00
-
eb84a22da7
Merge remote-tracking branch 'upstream/master'
Thomas
2012-03-09 01:50:51 +00:00
-
-
-
-
-
6ae5962b00
More improved transparency for smilies
Thomas
2012-03-09 01:49:12 +00:00
-
8d19baadff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-08 20:38:54 -05:00
-
-
-
-
b86a08166c
theme info file for testbubble
friendica
2012-03-08 16:30:45 -08:00
-
af9f7da449
catalan translation
friendica
2012-03-08 16:29:22 -08:00
-
bacb3207ad
Merge branch 'pull'
friendica
2012-03-08 14:35:48 -08:00
-
-
3b47626c15
Merge https://github.com/friendica/friendica into pull
friendica
2012-03-08 14:35:47 -08:00
-
-
3cfa83c3db
revup
friendica
2012-03-08 14:34:58 -08:00
-
-
b9dda93f0c
add theme diabook-blue, fix css
tommy tomson
2012-03-08 23:22:26 +01:00
-
b584b26323
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-08 15:30:47 -05:00
-
b52a6ea033
Merge pull request #108 from simonlnu/master
Simon
2012-03-08 10:39:03 -08:00
-
-
5fe8952c29
make svg from notifications.svg to ease future editing. more dispy tweaks
Simon L'nu
2012-03-08 13:37:45 -05:00
-
2e3116a11e
added library and include to .htaccess
Alexander Kampmann
2012-03-08 17:46:40 +01:00
-
fbd7e8f8ba
excludes reports from git
Alexander Kampmann
2012-03-08 17:44:57 +01:00
-
185fcd0701
better tests
Alexander Kampmann
2012-03-08 17:43:12 +01:00
-
bc3051e113
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-08 10:46:40 -05:00
-
-
-
-
08b5ede5a1
Merge pull request #107 from tomtom84/master
tomtom84
2012-03-08 05:52:14 -08:00
-
-
-
-
1fcbc7aa5a
add links to /profiles, add some icons to diabook/icons, fixes in css
tommy tomson
2012-03-08 14:49:07 +01:00
-
b7bfff12b9
Update README
friendica
2012-03-08 16:25:14 +11:00
-
03b5e3aa0c
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
friendica
2012-03-07 21:12:31 -08:00
-
d90c830332
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-07 22:30:46 -05:00
-
-
-
395a9530dc
still getting parent relays on remote systems
friendica
2012-03-07 18:23:55 -08:00
-
6525507a2f
Merge branch 'pull'
friendica
2012-03-07 15:55:20 -08:00
-
-
dd3b3c2454
revup
friendica
2012-03-07 15:54:37 -08:00
-
098c98f62a
Merge pull request #105 from simonlnu/master
Simon
2012-03-07 09:36:28 -08:00
-
-
15d310e4c3
fix jot.tpl buttons. fix up subsequent styling breakage
Simon L'nu
2012-03-07 12:35:04 -05:00
-
4d58357b15
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-07 12:32:28 -05:00
-
-
58c557b3ad
Merge pull request #104 from simonlnu/master
Simon
2012-03-07 07:08:23 -08:00
-
-
66d2c52b5f
push fix for funky menu action. the overflow-x might break again for some people
Simon L'nu
2012-03-07 10:07:36 -05:00
-
62fffdb018
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-07 10:05:32 -05:00
-
-
-
-
4690d00141
Merge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann
2012-03-07 12:06:20 +01:00
-
-
-
-
b2df1205ef
merged
Alexander Kampmann
2012-03-07 12:06:09 +01:00
-
-
dd2ff7c796
Merge pull request #103 from tomtom84/master
tomtom84
2012-03-06 23:44:18 -08:00
-
-
-
-
ec3ce05357
fix in navbar
tommy tomson
2012-03-07 00:47:43 +01:00
-
edfa7dbac2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 21:33:56 -05:00
-
-
-
-
7ad2dd6565
fix photos after permissions_sql change
friendica
2012-03-06 17:52:00 -08:00
-
1224e256b1
Merge branch 'pull'
friendica
2012-03-06 17:22:13 -08:00
-
-
88cd5800cf
[privacy] rework latest fix
friendica
2012-03-06 17:21:14 -08:00
-
39a49d51e3
remove stray debugging
friendica
2012-03-06 16:28:52 -08:00
-
73fc4cfc72
removed dolphin file (wtf?)
Thomas
2012-03-07 00:12:24 +00:00
-
30d6b4c10e
.
Thomas
2012-03-07 00:08:50 +00:00
-
d89cd6569b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 19:06:02 -05:00
-
-
-
-
fdd269228b
Merge pull request #102 from beardy-unixer/master
Simon
2012-03-06 16:05:35 -08:00
-
-
-
-
c4c98a9988
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 18:57:52 -05:00
-
-
-
-
dadf80f644
Merge remote-tracking branch 'upstream/master'
Thomas
2012-03-06 23:56:37 +00:00
-
-
-
-
22624917e0
improved smiley transparency
Thomas
2012-03-06 23:54:31 +00:00
-
05a52b2660
Merge pull request #101 from tomtom84/master
tomtom84
2012-03-06 15:49:32 -08:00
-
-
49b5a1bf20
fix in navbar
tommy tomson
2012-03-07 00:47:43 +01:00
-
-
-
668892b7a3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 18:42:00 -05:00
-
-
-
18213692db
Merge pull request #100 from simonlnu/master
Simon
2012-03-06 15:41:45 -08:00
-
-
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 18:38:44 -05:00
-
-
-
-
496a0ce4d1
Merge branch 'pull'
friendica
2012-03-06 15:29:18 -08:00
-
-
7431bd9509
fix html reshares when editplain in use
friendica
2012-03-06 15:28:27 -08:00
-
a33ca0a731
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 18:26:22 -05:00
-
-
-
-
1fae778421
Merge pull request #94 from beardy-unixer/master
Simon
2012-03-06 15:24:15 -08:00
-
-
-
-
decc9e5798
Merge pull request #99 from tomtom84/master
Simon
2012-03-06 15:22:55 -08:00
-
-
-
-
a464e4d33f
search should be ok, but a little extra security won't hurt
friendica
2012-03-06 15:15:59 -08:00
-
94d4cad701
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 18:15:45 -05:00
-
-
-
009a826a49
Merge branch 'pull'
friendica
2012-03-06 15:10:22 -08:00
-
-
a5e7c73e67
string update
friendica
2012-03-06 15:09:57 -08:00
-
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
tommy tomson
2012-03-07 00:07:27 +01:00
-
886d825869
Merge pull request #98 from simonlnu/master
Simon
2012-03-06 15:04:50 -08:00
-
-
edd450cf06
dispy, dispy, oh what a little lispy
Simon L'nu
2012-03-06 17:55:05 -05:00
-
21887a36fd
[PRIVACY] privacy issue bug #314
friendica
2012-03-06 14:53:14 -08:00
-
0badf3110f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 17:52:12 -05:00
-
-
8fb0ea4048
bugs #312, #313
friendica
2012-03-06 14:27:53 -08:00
-
4e0524e91a
Merge branch 'pull'
friendica
2012-03-06 13:58:26 -08:00
-
-
731b19c025
revup
friendica
2012-03-06 13:57:38 -08:00
-
073241a77a
Merge pull request #95 from simonlnu/master
Simon
2012-03-06 13:20:20 -08:00
-
-
bc8b014906
styling fixes in dispy. fix typos in settings.tpl
Simon L'nu
2012-03-06 16:18:26 -05:00
-
67456bad06
Fixed...merged with mainline THEN added beards.
Thomas
2012-03-06 20:50:38 +00:00
-
a265afe7eb
added beard smileys
Thomas
2012-03-06 20:44:53 +00:00
-
d647dbc6af
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-06 14:51:14 -05:00
-
-
-
-
7e10401ec0
doc/Account-Basics.md
Thomas
2012-03-06 19:15:40 +00:00
-
bab865b14e
doc/Account-Basics.md
Thomas
2012-03-06 19:15:24 +00:00
-
aed5a8e2e5
a
Thomas
2012-03-06 19:11:24 +00:00
-
6720c83a4a
doc/Remove-Account.md
Thomas
2012-03-06 19:07:15 +00:00
-
2772bb7f58
doc/Making-Friends.md
Thomas
2012-03-06 19:04:42 +00:00
-
ec1740cd40
doc/Bugs-and-Issues.md
Thomas
2012-03-06 18:55:45 +00:00
-
1bf9f3823c
doc/Account-Basics.md
Thomas
2012-03-06 18:48:39 +00:00
-
-
-
a9690dfe2d
Merge pull request #93 from fabrixxm/master
fabrixxm
2012-03-06 05:09:03 -08:00
-
-
eec4cff84b
remove "smilie" expansion for Diaspora logo
friendica
2012-03-06 04:28:45 -08:00
-
23718bfc25
prevent duplicate likes
friendica
2012-03-06 02:17:55 -08:00
-
c0e0034f06
Merge branch 'pull'
friendica
2012-03-06 01:04:16 -08:00
-
-
607ee1ff9c
quattro: theme settings (a bit hackish)
Fabio Comuni
2012-03-06 09:50:18 +01:00
-
be9985a3ae
Merge remote-tracking branch 'friendica/master'
Fabio Comuni
2012-03-06 09:48:08 +01:00
-
-
-
-
d04fba7048
Merge pull request #92 from tomtom84/master
tomtom84
2012-03-05 23:34:24 -08:00
-
-
8b0dd349f5
add img
tommy tomson
2012-03-06 08:31:54 +01:00
-
eaaf030c18
Merge remote-tracking branch 'origin/master'
tommy tomson
2012-03-06 08:28:21 +01:00
-
-
-
-
b64b1d13a4
fixes in diabook
tommy tomson
2012-03-06 08:27:20 +01:00
-
3da97e2393
finalise spam storage model, begin driver changes.
friendica
2012-03-05 23:20:42 -08:00
-
-
2a3aaca88d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-03-05 23:36:22 -05:00
-
-