Commit graph

5225 commits

Author SHA1 Message Date
Vasudev Kamath
214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
friendica
4b92e3543c Merge https://github.com/friendica/friendica into pull 2012-04-27 02:31:37 -07:00
friendica
266eaae439 put community back on the lower tab. It belongs with message streams 2012-04-27 02:30:49 -07:00
Simon
d16c93c7cd Merge pull request #271 from simonlnu/master
fix some css errors
2012-04-27 01:43:32 -07:00
Simon L'nu
deae1df3be fix some css errors
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
Simon L'nu
014e832db0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix view contacts

* master:
2012-04-27 04:15:27 -04:00
friendica
153534bc70 Merge https://github.com/friendica/friendica into pull 2012-04-27 01:10:33 -07:00
friendica
f06a554e05 fix view contacts 2012-04-27 01:10:09 -07:00
Simon
8aead9e517 Merge pull request #270 from simonlnu/master
fix 2 issues
2012-04-26 23:36:11 -07:00
Simon L'nu
b936e3a18a fix 2 issues. contacts img in finder; wall filer title
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00
Simon L'nu
bd1b38381d Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  reset qcomment selector after insert.
  put fakelink back in birthday notice
  birthday contact link goes to event page instead of remote profile
  make comment edit icons look more like base theme
  rev update

* master:
2012-04-27 02:28:44 -04:00
friendica
a1f94ac59f reset qcomment selector after insert. 2012-04-26 21:53:40 -07:00
friendica
d3992b78e6 put fakelink back in birthday notice 2012-04-26 20:08:57 -07:00
friendica
dee36c1b04 birthday contact link goes to event page instead of remote profile 2012-04-26 20:02:42 -07:00
friendica
dd33599a1d Merge https://github.com/friendica/friendica into pull 2012-04-26 19:56:25 -07:00
friendica
3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
Simon
6c1ab27626 Merge pull request #269 from simonlnu/master
fix s/color/colour/g issue
2012-04-26 17:15:14 -07:00
Simon L'nu
8834944952 fix s/color/colour/g issue
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 20:13:11 -04:00
Simon L'nu
7b5bab445d Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master:
2012-04-26 20:07:54 -04:00
friendica
2d94d216a3 Merge https://github.com/friendica/friendica into pull 2012-04-26 15:35:25 -07:00
friendica
f8e7f28f40 rev update 2012-04-26 15:35:00 -07:00
friendica
3ee998dbaf Merge pull request #267 from tomtom84/master
add link "remove account" to /mod/settings.php
2012-04-26 15:33:34 -07:00
Simon
552895001c Merge pull request #268 from simonlnu/master
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
2012-04-26 13:23:23 -07:00
Simon L'nu
d6116b6979 announced dipsy change. re-tie your boots, we're in for a wee ride ;)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 16:14:42 -04:00
Simon L'nu
bd14fdec6e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update, fix autoname test "random" failure
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  added BBCODE thing in comments
  add cleanzero theme

* master:
2012-04-26 16:10:17 -04:00
tommy tomson
328568943e diabook-themes: small-fix 2012-04-26 21:07:46 +02:00
tommy tomson
77a0570162 add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
friendica
82abb14bf9 Merge pull request #265 from cvogeley/master
cleanzero theme added
2012-04-26 01:35:50 -07:00
friendica
bf97ad2010 Merge https://github.com/friendica/friendica into pull 2012-04-26 01:34:21 -07:00
friendica
78579627ce rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
Simon
f6f666e38a Merge pull request #266 from simonlnu/master
convert stylesheets to less, and compress output css
2012-04-25 23:45:32 -07:00
Simon L'nu
c1f1974e44 convert stylesheets to less, and compress output css
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 02:38:18 -04:00
Simon L'nu
6b830bfa97 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Diabook-dark more CSS fixes.

* master:
2012-04-26 00:20:00 -04:00
Thomas Willingham
20a9cdfc90 Diabook-dark more CSS fixes.
Slowly getting there.
2012-04-25 23:40:40 +01:00
Christian Vogeley
43a257f2f6 duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design 2012-04-25 21:30:04 +02:00
Christian Vogeley
28370e320f duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design 2012-04-25 21:28:13 +02:00
Christian Vogeley
c0d4e39052 added BBCODE thing in comments 2012-04-25 21:08:31 +02:00
Simon L'nu
78280bdfed Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bug #307, explaining decentralised private photos is impossible.
  this turns out to be harder than I thought
  cleanup - make bb-buttons vanish when comment closed
  Esperanto at 100% again

* master:
2012-04-25 13:47:20 -04:00
Christian Vogeley
4c1398c6b1 add cleanzero theme 2012-04-25 19:09:46 +02:00
friendica
c9e5609cbf bug #307, explaining decentralised private photos is impossible. 2012-04-25 05:41:32 -07:00
friendica
37bc00094e this turns out to be harder than I thought 2012-04-25 01:36:22 -07:00
friendica
38e822320c Merge pull request #264 from mschmitt/master
Esperanto at 100% again
2012-04-25 00:25:05 -07:00
friendica
50f10a4fd7 Merge https://github.com/friendica/friendica into pull 2012-04-25 00:14:20 -07:00
friendica
ba0ade3380 cleanup - make bb-buttons vanish when comment closed 2012-04-25 00:13:36 -07:00
Simon L'nu
1a1efc7e46 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: fix css to login.tpl
  restore qcomment selector
  rev update
  zero-themes: add bbcode-toolbar to commentbox
  diabook-themes: small fix
  Diabook-dark css fix
  Diabook-dark, couple of new icons, and another css fix.
  fix tags test with new url
  quattro: small week calendar view for event/birthday reminders
  remove html from get_birthdays() and get_events()
  events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])

* master:
2012-04-25 03:05:47 -04:00
Martin Schmitt
15f7125df2 Esperanto at 100% again 2012-04-25 08:50:02 +02:00
tomtom84
5187faa595 Merge pull request #263 from tomtom84/master
diabook-themes: fix css to login.tpl
2012-04-24 18:42:32 -07:00
tommy tomson
9fe6333fd4 diabook-themes: fix css to login.tpl 2012-04-25 03:38:21 +02:00
friendica
5af80dbb89 restore qcomment selector 2012-04-24 18:23:48 -07:00
friendica
139c2c1bbd Merge https://github.com/friendica/friendica into pull 2012-04-24 17:55:56 -07:00