Thomas
|
1bf9f3823c
|
doc/Account-Basics.md
|
2012-03-06 18:48:39 +00:00 |
|
fabrixxm
|
a9690dfe2d
|
Merge pull request #93 from fabrixxm/master
quattro: theme settings
|
2012-03-06 05:09:03 -08:00 |
|
friendica
|
eec4cff84b
|
remove "smilie" expansion for Diaspora logo
|
2012-03-06 04:28:45 -08:00 |
|
friendica
|
23718bfc25
|
prevent duplicate likes
|
2012-03-06 02:17:55 -08:00 |
|
friendica
|
c0e0034f06
|
Merge branch 'pull'
|
2012-03-06 01:04:16 -08:00 |
|
Fabio Comuni
|
607ee1ff9c
|
quattro: theme settings (a bit hackish)
|
2012-03-06 09:50:18 +01:00 |
|
Fabio Comuni
|
be9985a3ae
|
Merge remote-tracking branch 'friendica/master'
|
2012-03-06 09:48:08 +01:00 |
|
tomtom84
|
d04fba7048
|
Merge pull request #92 from tomtom84/master
fixes in theme diabbook
|
2012-03-05 23:34:24 -08:00 |
|
tommy tomson
|
8b0dd349f5
|
add img
|
2012-03-06 08:31:54 +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
|
3da97e2393
|
finalise spam storage model, begin driver changes.
|
2012-03-05 23:20:42 -08: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 |
|
Simon
|
d49dc1434f
|
Merge pull request #91 from unary/darkzero
changed bg color around comment box from white to match page background,...
|
2012-03-05 18:21:15 -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
|
8473444242
|
string update
|
2012-03-05 16:43:44 -08: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
|
b6765ad742
|
Merge pull request #90 from simonlnu/master
field_help tweak
|
2012-03-05 15:19:02 -08:00 |
|
Simon L'nu
|
1aa2367469
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
|
2012-03-05 18:18:04 -05: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 |
|
friendica
|
c47bae7a5f
|
Merge branch 'pull'
|
2012-03-05 15:05:09 -08:00 |
|
friendica
|
c37ffd2999
|
can_write_wall documentation
|
2012-03-05 15:04:43 -08:00 |
|
Simon
|
4b456e2273
|
Merge pull request #89 from simonlnu/master
implement more changes
|
2012-03-05 14:57:51 -08: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 |
|
Simon L'nu
|
6a0729d5a4
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
revup
* master:
|
2012-03-05 17:56:38 -05:00 |
|
friendica
|
0d9c2ca06f
|
Merge branch 'pull'
|
2012-03-05 13:38:06 -08:00 |
|
friendica
|
c6dce8dd6b
|
revup
|
2012-03-05 13:37:32 -08:00 |
|
tommy tomson
|
a406c16581
|
fixes
|
2012-03-05 22:31:03 +01:00 |
|
Simon
|
092115ca44
|
Merge pull request #88 from simonlnu/master
multiple ui fixes
|
2012-03-05 12:57:30 -08: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
|
7f894794e4
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
|
2012-03-05 13:17:40 -05:00 |
|
Simon
|
1772037c98
|
Merge pull request #87 from simonlnu/master
contact_block.tpl link fix and dispy page parts
|
2012-03-05 10:17:26 -08: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
|
e05313f88f
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
|
2012-03-05 12:23:16 -05:00 |
|
Simon
|
fd240687b9
|
Merge pull request #86 from simonlnu/master
more dispy
|
2012-03-05 09:23:01 -08: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
|
8cce12f28a
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
|
2012-03-05 10:56:58 -05:00 |
|
Simon
|
e786e4253d
|
Merge pull request #85 from simonlnu/master
hopefully fix overflow issue now
|
2012-03-05 07:56:43 -08: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 |
|
Simon L'nu
|
3ab7132b64
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
$name appearing on testbubble items
testbubble notifications
* master:
|
2012-03-05 10:17:34 -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
|
49d9dd374c
|
Merge pull request #84 from simonlnu/master
more ui bugs fixed \o/
|
2012-03-04 22:09:56 -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 |
|