]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoNew bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler...
Michael Vogel [Sat, 17 Mar 2012 10:07:49 +0000 (11:07 +0100)]
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

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

12 years agomassive work done to both dispys, mostly -dark
Simon L'nu [Wed, 14 Mar 2012 05:05:08 +0000 (01:05 -0400)]
massive work done to both dispys, mostly -dark

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agomore work on filer, comment level and file tag removal
friendica [Wed, 14 Mar 2012 03:46:37 +0000 (20:46 -0700)]
more work on filer, comment level and file tag removal

12 years agoadded slack-NS, non-scrolly, slackr-based theme.
Tony Baldwin [Wed, 14 Mar 2012 03:05:04 +0000 (23:05 -0400)]
added slack-NS, non-scrolly, slackr-based theme.

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

* remotes/upstream/master:
  sort inbox by recently replied conversations first
  file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
  don't count self in number of contatcs
  invite potential connectees to the free social web
  In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
  Some security against XSRF-attacks
  A 'PHP Fatal error:  Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
  Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
  Avoid notices
  contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
  wasn't actually changed before
  Avoid a notice
  Avoid a Notice
  Avoid a Notice
  Avoid a Notice

* master:

12 years agosort inbox by recently replied conversations first
friendica [Wed, 14 Mar 2012 02:27:52 +0000 (19:27 -0700)]
sort inbox by recently replied conversations first

12 years agofile as widget and basic filing implementation for duepuntozero,slackr
friendica [Wed, 14 Mar 2012 01:13:03 +0000 (18:13 -0700)]
file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently

12 years agoMerge branch 'pull'
friendica [Tue, 13 Mar 2012 23:02:52 +0000 (16:02 -0700)]
Merge branch 'pull'

12 years agodon't count self in number of contatcs
friendica [Tue, 13 Mar 2012 23:02:20 +0000 (16:02 -0700)]
don't count self in number of contatcs

12 years agoMerge pull request #130 from CatoTH/master
friendica [Tue, 13 Mar 2012 22:45:12 +0000 (15:45 -0700)]
Merge pull request #130 from CatoTH/master

HTML2BBCode with [EMBED]: Compute in JS instead of PHP

12 years agoMerge branch 'pull'
friendica [Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)]
Merge branch 'pull'

12 years agoinvite potential connectees to the free social web
friendica [Tue, 13 Mar 2012 22:40:16 +0000 (15:40 -0700)]
invite potential connectees to the free social web

12 years agoIn HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call...
Tobias Hößl [Tue, 13 Mar 2012 21:46:57 +0000 (21:46 +0000)]
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.

12 years agoMerge pull request #129 from CatoTH/master
friendica [Tue, 13 Mar 2012 21:36:52 +0000 (14:36 -0700)]
Merge pull request #129 from CatoTH/master

CSRF-Protection and minor changes

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 13 Mar 2012 18:41:46 +0000 (14:41 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.

* master:

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Tue, 13 Mar 2012 18:34:15 +0000 (18:34 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoinitial tag display for categories and save-to-file - suitable for testing but needs...
friendica [Tue, 13 Mar 2012 11:04:26 +0000 (04:04 -0700)]
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 13 Mar 2012 04:25:20 +0000 (00:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  click anywhere to close notifications -> zeros and bubbles
  revup
  fix css
  use fancybox instead of lightbox
  fixes

* master:

12 years agoclick anywhere to close notifications -> zeros and bubbles
friendica [Tue, 13 Mar 2012 03:21:32 +0000 (20:21 -0700)]
click anywhere to close notifications -> zeros and bubbles

12 years agoMerge branch 'pull'
friendica [Tue, 13 Mar 2012 02:12:39 +0000 (19:12 -0700)]
Merge branch 'pull'

12 years agorevup
friendica [Tue, 13 Mar 2012 02:12:00 +0000 (19:12 -0700)]
revup

12 years agoMerge pull request #128 from tomtom84/master
tomtom84 [Mon, 12 Mar 2012 23:40:10 +0000 (16:40 -0700)]
Merge pull request #128 from tomtom84/master

fixes in diabook-derivates

12 years agofix css
tommy tomson [Mon, 12 Mar 2012 23:38:38 +0000 (00:38 +0100)]
fix css

12 years agoMerge pull request #127 from tomtom84/master
tomtom84 [Mon, 12 Mar 2012 23:06:15 +0000 (16:06 -0700)]
Merge pull request #127 from tomtom84/master

fixes in diabook-derivates

12 years agouse fancybox instead of lightbox
tommy tomson [Mon, 12 Mar 2012 23:04:19 +0000 (00:04 +0100)]
use fancybox instead of lightbox

12 years agoMerge pull request #126 from tomtom84/master
tomtom84 [Mon, 12 Mar 2012 22:33:29 +0000 (15:33 -0700)]
Merge pull request #126 from tomtom84/master

fixes in diabook-derivates

12 years agofixes
tommy tomson [Mon, 12 Mar 2012 22:31:54 +0000 (23:31 +0100)]
fixes

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 12 Mar 2012 21:12:01 +0000 (17:12 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add lightbox, fixex in css
  more save to file backend
  backend for "save to file" feature

* master:

12 years agoSome security against XSRF-attacks
Tobias Hößl [Mon, 12 Mar 2012 20:17:37 +0000 (20:17 +0000)]
Some security against XSRF-attacks

12 years agoMerge pull request #125 from tomtom84/master
tomtom84 [Mon, 12 Mar 2012 20:11:19 +0000 (13:11 -0700)]
Merge pull request #125 from tomtom84/master

fixes in diabook-derivates

12 years agoadd lightbox, fixex in css
tommy tomson [Mon, 12 Mar 2012 20:09:16 +0000 (21:09 +0100)]
add lightbox, fixex in css

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoget tags test improved
Alexander Kampmann [Mon, 12 Mar 2012 12:59:00 +0000 (13:59 +0100)]
get tags test improved

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

12 years agomore save to file backend
friendica [Mon, 12 Mar 2012 04:32:11 +0000 (21:32 -0700)]
more save to file backend

12 years agobackend for "save to file" feature
friendica [Mon, 12 Mar 2012 03:19:56 +0000 (20:19 -0700)]
backend for "save to file" feature

12 years agofix dispy-dark photo album stuff
Simon L'nu [Mon, 12 Mar 2012 01:34:51 +0000 (21:34 -0400)]
fix dispy-dark photo album stuff

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

* remotes/upstream/master:

* master:

12 years agoMerge pull request #124 from simonlnu/master
Simon [Mon, 12 Mar 2012 00:37:29 +0000 (17:37 -0700)]
Merge pull request #124 from simonlnu/master

fix dispys' css and layout

12 years agofix dispys' css and layout
Simon L'nu [Mon, 12 Mar 2012 00:36:16 +0000 (20:36 -0400)]
fix dispys' css and layout

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

* remotes/upstream/master:
  community meta tag renamed from "ika"

* master:

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

12 years agoMail: Subject are now with working "Re:"
Michael Vogel [Sun, 11 Mar 2012 23:22:12 +0000 (00:22 +0100)]
Mail: Subject are now with working "Re:"

12 years agocommunity meta tag renamed from "ika"
friendica [Sun, 11 Mar 2012 22:50:23 +0000 (15:50 -0700)]
community meta tag renamed from "ika"

12 years agoRemoving test exports
Michael Vogel [Sun, 11 Mar 2012 22:29:59 +0000 (23:29 +0100)]
Removing test exports

12 years agoMissing field in database.sql
Michael Vogel [Sun, 11 Mar 2012 21:39:40 +0000 (22:39 +0100)]
Missing field in database.sql

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 11 Mar 2012 21:05:08 +0000 (17:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoRemoved changes
Michael Vogel [Sun, 11 Mar 2012 19:24:55 +0000 (20:24 +0100)]
Removed changes

12 years agoMerge commit 'upstream/master'
Michael Vogel [Sun, 11 Mar 2012 19:22:28 +0000 (20:22 +0100)]
Merge commit 'upstream/master'

Conflicts:

view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl

12 years agoAdded config options for the item cache and the ostatus priority
Michael Vogel [Sun, 11 Mar 2012 18:50:51 +0000 (19:50 +0100)]
Added config options for the item cache and the ostatus priority

12 years agoItem cache now is one day.
Michael Vogel [Sun, 11 Mar 2012 18:45:28 +0000 (19:45 +0100)]
Item cache now is one day.

12 years agoCorrected some git problems
Michael Vogel [Sun, 11 Mar 2012 18:41:29 +0000 (19:41 +0100)]
Corrected some git problems

12 years agoCache: item cache now has an autodelete of old files. The pages plugin now sets a...
Michael Vogel [Sun, 11 Mar 2012 18:11:25 +0000 (19:11 +0100)]
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.

12 years agoPages: Show every community page - even from foreign servers (with caching)
Michael Vogel [Sun, 11 Mar 2012 16:45:12 +0000 (17:45 +0100)]
Pages: Show every community page - even from foreign servers (with caching)

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Sun, 11 Mar 2012 14:43:16 +0000 (14:43 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoMerge pull request #123 from simonlnu/master
Simon [Sun, 11 Mar 2012 14:29:45 +0000 (07:29 -0700)]
Merge pull request #123 from simonlnu/master

screwed up on the font-size for screen last push

12 years agoscrewed up on the font-size for screen last push
Simon L'nu [Sun, 11 Mar 2012 14:29:12 +0000 (10:29 -0400)]
screwed up on the font-size for screen last push

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, 11 Mar 2012 14:25:39 +0000 (10:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #122 from simonlnu/master
Simon [Sun, 11 Mar 2012 14:25:27 +0000 (07:25 -0700)]
Merge pull request #122 from simonlnu/master

add some '@media handheld' types for dispys

12 years agoadd some '@media handheld' types for dispys
Simon L'nu [Sun, 11 Mar 2012 14:24:49 +0000 (10:24 -0400)]
add some '@media handheld' types for dispys

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #121 from simonlnu/master
Simon [Sun, 11 Mar 2012 14:15:35 +0000 (07:15 -0700)]
Merge pull request #121 from simonlnu/master

fix more stuff

12 years agofix more stuff
Simon L'nu [Sun, 11 Mar 2012 14:14:31 +0000 (10:14 -0400)]
fix more stuff

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoNew plugin that shows community pages in the sidebar
Michael Vogel [Sun, 11 Mar 2012 13:22:19 +0000 (14:22 +0100)]
New plugin that shows community pages in the sidebar

12 years agoMerge pull request #120 from simonlnu/master
Simon [Sun, 11 Mar 2012 13:13:10 +0000 (06:13 -0700)]
Merge pull request #120 from simonlnu/master

fix some stuff right away

12 years agofix some stuff right away
Simon L'nu [Sun, 11 Mar 2012 13:12:31 +0000 (09:12 -0400)]
fix some stuff right away

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Sun, 11 Mar 2012 11:27:47 +0000 (11:27 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoMerge pull request #119 from simonlnu/master
Simon [Sun, 11 Mar 2012 06:33:40 +0000 (22:33 -0800)]
Merge pull request #119 from simonlnu/master

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!