]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge pull request #149 from CatoTH/master
Simon [Mon, 19 Mar 2012 07:40:51 +0000 (00:40 -0700)]
Merge pull request #149 from CatoTH/master

Add a missing security token [Using photos as profile photos]

12 years agoExisting photos could not be used as profile photos anymore - should be fixed now...
Tobias Hößl [Mon, 19 Mar 2012 07:37:09 +0000 (07:37 +0000)]
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier

12 years agocommunity discovery cont., cleanup of DB debugging
friendica [Mon, 19 Mar 2012 05:12:36 +0000 (22:12 -0700)]
community discovery cont., cleanup of DB debugging

12 years agoMerge branch 'pull'
friendica [Mon, 19 Mar 2012 00:57:54 +0000 (17:57 -0700)]
Merge branch 'pull'

12 years agorevup
friendica [Mon, 19 Mar 2012 00:57:29 +0000 (17:57 -0700)]
revup

12 years agoMerge pull request #147 from CatoTH/master
friendica [Mon, 19 Mar 2012 00:54:12 +0000 (17:54 -0700)]
Merge pull request #147 from CatoTH/master

CSRF-Protection in the group-related form

12 years agoMerge pull request #148 from simonlnu/master
Simon [Sun, 18 Mar 2012 22:47:25 +0000 (15:47 -0700)]
Merge pull request #148 from simonlnu/master

fix the comment box being too wide and looking off-kilter

12 years agofix the comment box being too wide and looking off-kilter
Simon L'nu [Sun, 18 Mar 2012 22:33:38 +0000 (18:33 -0400)]
fix the comment box being too wide and looking off-kilter

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 18 Mar 2012 16:02:33 +0000 (12:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  replace split() by explode(); split is deprecated
  lost changes to tinymce/bbcode
  remove admin view of local directory
  bug #337, call template_unescape() only at the end of template processing
  queue optimisation - back off delivery attempts to once per hour after the first 12 hours.

* master:

12 years agoCSRF-Protection in the group-related form (creating, renaming and dropping a group...
Tobias Hößl [Sun, 18 Mar 2012 15:44:33 +0000 (15:44 +0000)]
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)

12 years agoMerge pull request #146 from CatoTH/master
friendica [Sun, 18 Mar 2012 10:59:49 +0000 (03:59 -0700)]
Merge pull request #146 from CatoTH/master

replace split() by explode(); split is deprecated

12 years agoreplace split() by explode(); split is deprecated
Tobias Hößl [Sun, 18 Mar 2012 10:36:49 +0000 (10:36 +0000)]
replace split() by explode(); split is deprecated

12 years agolost changes to tinymce/bbcode
friendica [Sun, 18 Mar 2012 05:18:21 +0000 (22:18 -0700)]
lost changes to tinymce/bbcode

12 years agoremove admin view of local directory
friendica [Sun, 18 Mar 2012 05:14:17 +0000 (22:14 -0700)]
remove admin view of local directory

12 years agobug #337, call template_unescape() only at the end of template processing
friendica [Sun, 18 Mar 2012 01:15:36 +0000 (18:15 -0700)]
bug #337, call template_unescape() only at the end of template processing

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 18 Mar 2012 00:03:34 +0000 (20:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  compare ssl_policy precisely in case somebody was bitten by template processor bug
  template processor broken with foreach k=>v and k is integer 0

* master:

12 years agoqueue optimisation - back off delivery attempts to once per hour after the first...
friendica [Sat, 17 Mar 2012 10:43:02 +0000 (03:43 -0700)]
queue optimisation - back off delivery attempts to once per hour after the first 12 hours.

12 years agocompare ssl_policy precisely in case somebody was bitten by template processor bug
friendica [Sat, 17 Mar 2012 09:36:59 +0000 (02:36 -0700)]
compare ssl_policy precisely in case somebody was bitten by template processor bug

12 years agotemplate processor broken with foreach k=>v and k is integer 0
friendica [Sat, 17 Mar 2012 09:26:52 +0000 (02:26 -0700)]
template processor broken with foreach k=>v and k is integer 0

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 17 Mar 2012 07:23:46 +0000 (03:23 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  cut/paste error
  scheme checking for webservers without $_SERVER['HTTPS']

* master:

12 years agocut/paste error
friendica [Sat, 17 Mar 2012 07:08:52 +0000 (00:08 -0700)]
cut/paste error

12 years agoscheme checking for webservers without $_SERVER['HTTPS']
friendica [Sat, 17 Mar 2012 06:51:49 +0000 (23:51 -0700)]
scheme checking for webservers without $_SERVER['HTTPS']

12 years agoMerge pull request #145 from simonlnu/master
Simon [Sat, 17 Mar 2012 06:05:37 +0000 (23:05 -0700)]
Merge pull request #145 from simonlnu/master

[fix] whitespace in photo_view and like_noshare. dispy-dark clean up

12 years ago[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
Simon L'nu [Sat, 17 Mar 2012 05:55:40 +0000 (01:55 -0400)]
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 17 Mar 2012 05:47:53 +0000 (01:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #144 from simonlnu/master
Simon [Sat, 17 Mar 2012 01:24:26 +0000 (18:24 -0700)]
Merge pull request #144 from simonlnu/master

remove auto-complete from some themes since the comment one is now global

12 years agoremove auto-complete from darkzero-NS, dispys, since the comment one is now global
Simon L'nu [Sat, 17 Mar 2012 01:23:24 +0000 (21:23 -0400)]
remove auto-complete from darkzero-NS, dispys, since the comment one is now global

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agomake auto-complete work in more places
Simon L'nu [Sat, 17 Mar 2012 01:20:23 +0000 (21:20 -0400)]
make auto-complete work in more places

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 17 Mar 2012 01:19:17 +0000 (21:19 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #143 from simonlnu/master
Simon [Sat, 17 Mar 2012 00:31:24 +0000 (17:31 -0700)]
Merge pull request #143 from simonlnu/master

make auto-complete in darkzero-NS.

12 years agomake auto-complete in darkzero-NS. other themes can use this easily. might need to...
Simon L'nu [Sat, 17 Mar 2012 00:29:02 +0000 (20:29 -0400)]
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 17 Mar 2012 00:26:38 +0000 (20:26 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  convert boolean or int settings to strings to work around issues with template processing
  add "send pm" link to photo dropdown for Diaspora contacts

* master:

12 years agoconvert boolean or int settings to strings to work around issues with template processing
friendica [Fri, 16 Mar 2012 23:05:16 +0000 (16:05 -0700)]
convert boolean or int settings to strings to work around issues with template processing

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 16 Mar 2012 22:35:50 +0000 (18:35 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  wrong link in d* comment notifications

* master:

12 years agoadd "send pm" link to photo dropdown for Diaspora contacts
friendica [Fri, 16 Mar 2012 22:19:38 +0000 (15:19 -0700)]
add "send pm" link to photo dropdown for Diaspora contacts

12 years agoMerge branch 'pull'
friendica [Fri, 16 Mar 2012 22:08:32 +0000 (15:08 -0700)]
Merge branch 'pull'

12 years agowrong link in d* comment notifications
friendica [Fri, 16 Mar 2012 22:07:45 +0000 (15:07 -0700)]
wrong link in d* comment notifications

12 years agoMerge pull request #142 from simonlnu/master
Simon [Fri, 16 Mar 2012 20:44:39 +0000 (13:44 -0700)]
Merge pull request #142 from simonlnu/master

make profiles-menu disappear when clicked outside of it

12 years agomake profiles-menu disappear when clicked outside it
Simon L'nu [Fri, 16 Mar 2012 20:43:34 +0000 (16:43 -0400)]
make profiles-menu disappear when clicked outside it

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 16 Mar 2012 20:41:19 +0000 (16:41 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Bugfix of old IEs
  Forgot to remove a debug line
  Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button

* master:

12 years agoMerge pull request #141 from CatoTH/master
Simon [Fri, 16 Mar 2012 17:54:20 +0000 (10:54 -0700)]
Merge pull request #141 from CatoTH/master

Private messages - tabindex

12 years agoBugfix of old IEs
Tobias Hößl [Fri, 16 Mar 2012 17:47:40 +0000 (17:47 +0000)]
Bugfix of old IEs

12 years agoForgot to remove a debug line
Tobias Hößl [Fri, 16 Mar 2012 17:46:26 +0000 (17:46 +0000)]
Forgot to remove a debug line

12 years agoUse tabindex to enable easy navigation in the dialog to write private mails; Recipien...
Tobias Hößl [Fri, 16 Mar 2012 17:45:07 +0000 (17:45 +0000)]
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button

12 years agoMerge pull request #140 from simonlnu/master
Simon [Fri, 16 Mar 2012 17:35:19 +0000 (10:35 -0700)]
Merge pull request #140 from simonlnu/master

weee, dispys get another update

12 years agoweee, dispys get another update
Simon L'nu [Fri, 16 Mar 2012 17:31:59 +0000 (13:31 -0400)]
weee, dispys get another update

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 16 Mar 2012 17:28:22 +0000 (13:28 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  syntax error from pasted text, remove ^M's
  bug #335 network search broken after new ssl policy settings
  whitespace
  notification for disapora comments

* master:

12 years agosyntax error from pasted text, remove ^M's
friendica [Fri, 16 Mar 2012 13:02:26 +0000 (06:02 -0700)]
syntax error from pasted text, remove ^M's

12 years agobug #335 network search broken after new ssl policy settings
friendica [Fri, 16 Mar 2012 12:51:04 +0000 (05:51 -0700)]
bug #335 network search broken after new ssl policy settings

12 years agowhitespace
friendica [Fri, 16 Mar 2012 12:41:29 +0000 (05:41 -0700)]
whitespace

12 years agonotification for disapora comments
friendica [Fri, 16 Mar 2012 12:19:29 +0000 (05:19 -0700)]
notification for disapora comments

12 years agoMerge pull request #139 from simonlnu/master
Simon [Fri, 16 Mar 2012 05:58:54 +0000 (22:58 -0700)]
Merge pull request #139 from simonlnu/master

missing close double quote in mail_list.tpl

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 16 Mar 2012 05:57:59 +0000 (01:57 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agomissing close double quote in mail_list.tpl
Simon L'nu [Fri, 16 Mar 2012 05:57:27 +0000 (01:57 -0400)]
missing close double quote in mail_list.tpl

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #138 from simonlnu/master
Simon [Fri, 16 Mar 2012 05:56:46 +0000 (22:56 -0700)]
Merge pull request #138 from simonlnu/master

more changes in dispy-dark

12 years agomore changes in dispy-dark
Simon L'nu [Fri, 16 Mar 2012 05:55:34 +0000 (01:55 -0400)]
more changes in dispy-dark

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 16 Mar 2012 05:51:25 +0000 (01:51 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (21 commits)
  turn indexes back off (this is from an errant checkin a year or more ago)
  undo git stuffup
  added icons to profile_side, fixes in css
  track whether contact is a community page or not
  html2bbcode: Disabled size conversion
  Mail: Subject are now with working "Re:"
  Removing test exports
  Missing field in database.sql
  Removed changes
  Added config options for the item cache and the ostatus priority
  Item cache now is one day.
  Corrected some git problems
  Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
  Pages: Show every community page - even from foreign servers (with caching)
  New plugin that shows community pages in the sidebar
  Caching improved.
  Enabled Caching for items. Changed color of tags in diabook.
  New config options if ostatus polling should use the priority in the contacts
  Mail: Removing signatures, gpg, unnecessary line breaks
  diabook: Moving the location between the icons
  ...

* master:

12 years agoturn indexes back off (this is from an errant checkin a year or more ago)
friendica [Fri, 16 Mar 2012 03:07:30 +0000 (20:07 -0700)]
turn indexes back off (this is from an errant checkin a year or more ago)

12 years agoMerge branch 'pull'
friendica [Fri, 16 Mar 2012 02:56:32 +0000 (19:56 -0700)]
Merge branch 'pull'

12 years agoundo git stuffup
friendica [Fri, 16 Mar 2012 02:55:58 +0000 (19:55 -0700)]
undo git stuffup

12 years agoMerge pull request #137 from tomtom84/master
tomtom84 [Fri, 16 Mar 2012 02:55:10 +0000 (19:55 -0700)]
Merge pull request #137 from tomtom84/master

fixes in diabook-derivates

12 years agoadded icons to profile_side, fixes in css
tommy tomson [Fri, 16 Mar 2012 02:49:43 +0000 (03:49 +0100)]
added icons to profile_side, fixes in css

12 years agoMerge branch 'pull'
friendica [Thu, 15 Mar 2012 23:39:21 +0000 (16:39 -0700)]
Merge branch 'pull'

12 years agotrack whether contact is a community page or not
friendica [Thu, 15 Mar 2012 23:38:26 +0000 (16:38 -0700)]
track whether contact is a community page or not

12 years agoMerge pull request #136 from annando/master
friendica [Thu, 15 Mar 2012 22:30:52 +0000 (15:30 -0700)]
Merge pull request #136 from annando/master

Mail improvements, item caching and so on

12 years agofixed the sidebar edit thingy. haven't synced dispy yet.
Simon L'nu [Thu, 15 Mar 2012 21:27:06 +0000 (17:27 -0400)]
fixed the sidebar edit thingy. haven't synced dispy yet.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 15 Mar 2012 21:25:22 +0000 (17:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agohtml2bbcode: Disabled size conversion
Michael Vogel [Thu, 15 Mar 2012 20:17:51 +0000 (21:17 +0100)]
html2bbcode: Disabled size conversion

12 years agoMerge commit 'upstream/master'
Michael Vogel [Thu, 15 Mar 2012 20:11:58 +0000 (21:11 +0100)]
Merge commit 'upstream/master'

12 years agoMerge pull request #135 from simonlnu/master
Simon [Thu, 15 Mar 2012 19:08:59 +0000 (12:08 -0700)]
Merge pull request #135 from simonlnu/master

commit latest to dispy-dark. fixes in html css and js

12 years agocommit latest to dispy-dark. fixes in html css and js
Simon L'nu [Thu, 15 Mar 2012 19:07:17 +0000 (15:07 -0400)]
commit latest to dispy-dark. fixes in html css and js

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 15 Mar 2012 19:03:31 +0000 (15:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more recycle fixes for plaintext
  fix recycle symbol when using plaintext editor
  add links to wall, photos, events, etc to aside on networkpage, fixes in css

* master:

12 years agomore recycle fixes for plaintext
friendica [Thu, 15 Mar 2012 10:47:02 +0000 (03:47 -0700)]
more recycle fixes for plaintext

12 years agofix recycle symbol when using plaintext editor
friendica [Thu, 15 Mar 2012 10:44:41 +0000 (03:44 -0700)]
fix recycle symbol when using plaintext editor

12 years agoMerge branch 'pull'
friendica [Thu, 15 Mar 2012 08:48:10 +0000 (01:48 -0700)]
Merge branch 'pull'

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 15 Mar 2012 08:48:07 +0000 (01:48 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoadd links to wall, photos, events, etc to aside on networkpage, fixes in css
tommy tomson [Thu, 15 Mar 2012 07:29:39 +0000 (08:29 +0100)]
add links to wall, photos, events, etc to aside on networkpage, fixes in css

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 15 Mar 2012 05:02:44 +0000 (01:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
  roll protocol version due to ssl_policy settings
  force login to ssl on SSL_POLICY_SELFSIGN
  basic ssl_policy for important modules
  ssl_policy stuff
  revup
  splitted tests into several files
  removed done TODO
  get_tags tests corrected. They test for the right things now.
  addon settings form error
  more work on filer, comment level and file tag removal
  added slack-NS, non-scrolly, slackr-based theme.
  get tags test improved
  splitted test cases.
  changed a test string
  added some tests
  added library and include to .htaccess
  excludes reports from git
  better tests
  added test blueprints, fixed? encoding issues

* master:

12 years agodon't allow multiple friends with http/https same person, don't show mail2 coming...
friendica [Thu, 15 Mar 2012 04:58:54 +0000 (21:58 -0700)]
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts

12 years agoroll protocol version due to ssl_policy settings
friendica [Thu, 15 Mar 2012 04:40:36 +0000 (21:40 -0700)]
roll protocol version due to ssl_policy settings

12 years agoforce login to ssl on SSL_POLICY_SELFSIGN
friendica [Thu, 15 Mar 2012 04:29:44 +0000 (21:29 -0700)]
force login to ssl on SSL_POLICY_SELFSIGN

12 years agobasic ssl_policy for important modules
friendica [Thu, 15 Mar 2012 04:20:20 +0000 (21:20 -0700)]
basic ssl_policy for important modules

12 years agossl_policy stuff
friendica [Thu, 15 Mar 2012 03:36:23 +0000 (20:36 -0700)]
ssl_policy stuff

12 years agorevup
friendica [Wed, 14 Mar 2012 23:09:13 +0000 (16:09 -0700)]
revup

12 years agoMerge pull request #132 from campino/master
friendica [Wed, 14 Mar 2012 22:16:30 +0000 (15:16 -0700)]
Merge pull request #132 from campino/master

Test cases

12 years agoMerge pull request #133 from tonybaldwin/master
friendica [Wed, 14 Mar 2012 22:15:34 +0000 (15:15 -0700)]
Merge pull request #133 from tonybaldwin/master

slack-NS

12 years agoMerge branch 'pull'
friendica [Wed, 14 Mar 2012 21:34:52 +0000 (14:34 -0700)]
Merge branch 'pull'

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 14 Mar 2012 21:34:48 +0000 (14:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 14 Mar 2012 15:02:14 +0000 (11:02 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix in nav
  add links to home, profile, photos, events, notes to aside in network-stream

* master:

12 years agoMerge pull request #134 from simonlnu/master
Simon [Wed, 14 Mar 2012 15:02:04 +0000 (08:02 -0700)]
Merge pull request #134 from simonlnu/master

PHP Fatal error:  Call-time pass-by-reference has been removed in mod/item.php on line 630

12 years agoPHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on...
Simon L'nu [Wed, 14 Mar 2012 15:00:20 +0000 (11:00 -0400)]
PHP Fatal error:  Call-time pass-by-reference has been removed in mod/item.php on line 630

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann [Wed, 14 Mar 2012 11:57:35 +0000 (12:57 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
view/de/strings.php

12 years agofix in nav
tommy tomson [Wed, 14 Mar 2012 11:56:59 +0000 (12:56 +0100)]
fix in nav

12 years agosplitted tests into several files
Alexander Kampmann [Wed, 14 Mar 2012 11:54:49 +0000 (12:54 +0100)]
splitted tests into several files

12 years agoadd links to home, profile, photos, events, notes to aside in network-stream
tommy tomson [Wed, 14 Mar 2012 11:50:11 +0000 (12:50 +0100)]
add links to home, profile, photos, events, notes to aside in network-stream

12 years agoremoved done TODO
Alexander Kampmann [Wed, 14 Mar 2012 11:31:25 +0000 (12:31 +0100)]
removed done TODO

12 years agoget_tags tests corrected. They test for the right things now.
Alexander Kampmann [Wed, 14 Mar 2012 11:30:52 +0000 (12:30 +0100)]
get_tags tests corrected. They test for the right things now.

12 years agoMerge branch 'pull'
friendica [Wed, 14 Mar 2012 06:53:33 +0000 (23:53 -0700)]
Merge branch 'pull'

12 years agoaddon settings form error
friendica [Wed, 14 Mar 2012 06:52:13 +0000 (23:52 -0700)]
addon settings form error

12 years agoMerge pull request #131 from simonlnu/master
Simon [Wed, 14 Mar 2012 05:10:02 +0000 (22:10 -0700)]
Merge pull request #131 from simonlnu/master

massive work done to both dispys, mostly -dark