]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years ago"vier" popup menu looks nicer now (more like quattro again)
Michael [Sat, 25 Feb 2012 10:13:04 +0000 (11:13 +0100)]
"vier" popup menu looks nicer now (more like quattro again)

12 years ago"vier": The contacts are now working again. Line break before closing bbcodes removed.
Michael [Sat, 25 Feb 2012 10:00:35 +0000 (11:00 +0100)]
"vier": The contacts are now working again. Line break before closing bbcodes removed.

12 years agoBug fixed where mails where nearly empty. HTML mails can now be received.
Michael [Sat, 25 Feb 2012 01:37:39 +0000 (02:37 +0100)]
Bug fixed where mails where nearly empty. HTML mails can now be received.

12 years agomultipart messages complete, message-id conversion done.
Michael [Sat, 25 Feb 2012 00:10:45 +0000 (01:10 +0100)]
multipart messages complete, message-id conversion done.

12 years agoSending mail as multipart/alternative (html and plain text) (very basic by now)
Michael [Fri, 24 Feb 2012 07:50:42 +0000 (08:50 +0100)]
Sending mail as multipart/alternative (html and plain text) (very basic by now)

12 years agoEncoding for incoming mails. Fixed invalid message id (with side effect at the moment...
Michael [Fri, 24 Feb 2012 06:11:26 +0000 (07:11 +0100)]
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.

12 years agoGIT problems ...
Michael [Thu, 23 Feb 2012 19:59:34 +0000 (20:59 +0100)]
GIT problems ...

12 years agoMerge remote branch 'upstream/master'
Michael [Thu, 23 Feb 2012 19:53:22 +0000 (20:53 +0100)]
Merge remote branch 'upstream/master'

Conflicts:
include/bbcode.php

12 years agobbcode.php: A list or quote at the beginning wasn't detected
Michael [Thu, 23 Feb 2012 19:51:44 +0000 (20:51 +0100)]
bbcode.php: A list or quote at the beginning wasn't detected

12 years agoMerge pull request #47 from fabrixxm/master
Simon [Thu, 23 Feb 2012 14:44:06 +0000 (06:44 -0800)]
Merge pull request #47 from fabrixxm/master

quattro: fix typos

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Thu, 23 Feb 2012 14:23:52 +0000 (15:23 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoquattro-green: removed contact_template.tpl
Tobias Diekershoff [Thu, 23 Feb 2012 13:16:20 +0000 (14:16 +0100)]
quattro-green: removed contact_template.tpl

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Thu, 23 Feb 2012 13:10:32 +0000 (14:10 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoquattro: fix typos
Fabio Comuni [Thu, 23 Feb 2012 13:10:23 +0000 (14:10 +0100)]
quattro: fix typos

12 years agogreen-quattro: applied a color for shiny class and preview
Tobias Diekershoff [Thu, 23 Feb 2012 11:54:14 +0000 (12:54 +0100)]
green-quattro: applied a color for shiny class and preview

12 years agoMerge pull request #46 from fabrixxm/master
fabrixxm [Thu, 23 Feb 2012 10:52:04 +0000 (02:52 -0800)]
Merge pull request #46 from fabrixxm/master

more work on quattro theme and less html in php

12 years agoquattro post preview, style contacts pages, style for "shiny" class, fix contacts...
Fabio Comuni [Thu, 23 Feb 2012 10:22:32 +0000 (11:22 +0100)]
quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts

12 years agofix img tag with size attribute
Tobias Diekershoff [Thu, 23 Feb 2012 10:12:36 +0000 (11:12 +0100)]
fix img tag with size attribute

12 years agoMerge branch 'master' into notify
friendica [Thu, 23 Feb 2012 08:30:17 +0000 (00:30 -0800)]
Merge branch 'master' into notify

12 years agomore theme notify fixes
friendica [Thu, 23 Feb 2012 08:28:26 +0000 (00:28 -0800)]
more theme notify fixes

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 23 Feb 2012 08:04:00 +0000 (09:04 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoquattro: added styling to pivate message view
Tobias Diekershoff [Thu, 23 Feb 2012 08:02:40 +0000 (09:02 +0100)]
quattro: added styling to pivate message view

12 years agonew notify sort of working in testbubble
friendica [Thu, 23 Feb 2012 07:34:30 +0000 (23:34 -0800)]
new notify sort of working in testbubble

12 years agoREADME file shortened because this was for my branch only.
Michael Vogel [Thu, 23 Feb 2012 06:55:56 +0000 (07:55 +0100)]
README file shortened because this was for my branch only.

12 years agoRemoved the export of markdown articles. That was for testing purposes only.
Michael Vogel [Thu, 23 Feb 2012 06:53:45 +0000 (07:53 +0100)]
Removed the export of markdown articles. That was for testing purposes only.

12 years agoMerge branch 'master' into notify
friendica [Thu, 23 Feb 2012 06:36:07 +0000 (22:36 -0800)]
Merge branch 'master' into notify

12 years agonested quote check fails to account for strpos returning position 0
friendica [Thu, 23 Feb 2012 04:58:04 +0000 (20:58 -0800)]
nested quote check fails to account for strpos returning position 0

12 years agorestore poller normal operation
friendica [Thu, 23 Feb 2012 04:31:33 +0000 (20:31 -0800)]
restore poller normal operation

12 years agoMerge pull request #45 from annando/master
friendica [Thu, 23 Feb 2012 04:21:05 +0000 (20:21 -0800)]
Merge pull request #45 from annando/master

New HTML to BBCode converter, changes to BBCode, nginx support, ...

12 years agoMerge branch 'pull'
friendica [Thu, 23 Feb 2012 03:58:01 +0000 (19:58 -0800)]
Merge branch 'pull'

12 years agoallow forum posts by followers on Diaspora
friendica [Thu, 23 Feb 2012 03:56:28 +0000 (19:56 -0800)]
allow forum posts by followers on Diaspora

12 years agoGerman translation more gender friendly. Some more logging in poller.php
Michael [Wed, 22 Feb 2012 14:20:49 +0000 (15:20 +0100)]
German translation more gender friendly. Some more logging in poller.php

12 years agoMerge pull request #44 from simonlnu/master
friendica [Wed, 22 Feb 2012 11:59:37 +0000 (03:59 -0800)]
Merge pull request #44 from simonlnu/master

minor doc fix. there will be more ;)

12 years agoclean up Groups help file. there was a stray 'Freindika' in it
Simon L'nu [Wed, 22 Feb 2012 11:05:48 +0000 (06:05 -0500)]
clean up Groups help file. there was a stray 'Freindika' in it

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agonever enough documentation
friendica [Wed, 22 Feb 2012 09:50:06 +0000 (01:50 -0800)]
never enough documentation

12 years agowaitman gobble media upload via api patch
friendica [Wed, 22 Feb 2012 07:35:50 +0000 (23:35 -0800)]
waitman gobble media upload via api patch

12 years agoescape smiley conversion in code and pre blocks
friendica [Wed, 22 Feb 2012 07:13:03 +0000 (23:13 -0800)]
escape smiley conversion in code and pre blocks

12 years agosome cleanup of tb notifications
friendica [Wed, 22 Feb 2012 04:22:09 +0000 (20:22 -0800)]
some cleanup of tb notifications

12 years agonew notifications
friendica [Wed, 22 Feb 2012 03:03:55 +0000 (19:03 -0800)]
new notifications

12 years agoadd full email link to notification
friendica [Wed, 22 Feb 2012 02:10:15 +0000 (18:10 -0800)]
add full email link to notification

12 years agomark all notifications read
friendica [Wed, 22 Feb 2012 00:59:57 +0000 (16:59 -0800)]
mark all notifications read

12 years agoMerge branch 'pull'
friendica [Tue, 21 Feb 2012 22:32:17 +0000 (14:32 -0800)]
Merge branch 'pull'

12 years agologger_debug was used as string instead of constant
friendica [Tue, 21 Feb 2012 22:15:10 +0000 (14:15 -0800)]
logger_debug was used as string instead of constant

12 years agoMerge pull request #43 from fabrixxm/master
fabrixxm [Tue, 21 Feb 2012 10:38:52 +0000 (02:38 -0800)]
Merge pull request #43 from fabrixxm/master

Add support for variable filters in template

12 years agotemplate: add support for variable filters
Fabio Comuni [Tue, 21 Feb 2012 10:25:22 +0000 (11:25 +0100)]
template: add support for variable filters

12 years agofill in notify msg with redirect link after we get the id
friendica [Tue, 21 Feb 2012 08:02:42 +0000 (00:02 -0800)]
fill in notify msg with redirect link after we get the id

12 years agomore cleanup of community followup detection. Remote worked well but local didn't.
friendica [Tue, 21 Feb 2012 05:07:40 +0000 (21:07 -0800)]
more cleanup of community followup detection. Remote worked well but local didn't.

12 years agoemail notify now redirected through mod_notify, weirdness in local deliver caused...
friendica [Tue, 21 Feb 2012 03:50:05 +0000 (19:50 -0800)]
email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes

12 years agoMerge branch 'pull'
friendica [Tue, 21 Feb 2012 02:07:16 +0000 (18:07 -0800)]
Merge branch 'pull'

12 years agofix twitter title showing up occasionally
friendica [Tue, 21 Feb 2012 02:06:43 +0000 (18:06 -0800)]
fix twitter title showing up occasionally

12 years agoMerge pull request #42 from friendica/ka2ca-rebased
friendica [Tue, 21 Feb 2012 02:02:53 +0000 (18:02 -0800)]
Merge pull request #42 from friendica/ka2ca-rebased

Replaced some ocurrences of Friendika --> Friendica

12 years agoview/admin_remoteupdate.tpl - Friendika -> Friendica
Abinoam P. Marques Jr [Mon, 20 Feb 2012 15:37:01 +0000 (12:37 -0300)]
view/admin_remoteupdate.tpl - Friendika -> Friendica

12 years agoutil/README - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 19:12:49 +0000 (16:12 -0300)]
util/README - Friendika -> Friendica

12 years agohtconfig.tpl - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 19:11:18 +0000 (16:11 -0300)]
htconfig.tpl - Friendika -> Friendica

12 years agomod/match.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 19:10:48 +0000 (16:10 -0300)]
mod/match.php - Friendika -> Friendica

12 years agomod/dirfind.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:45:08 +0000 (15:45 -0300)]
mod/dirfind.php - Friendika -> Friendica

12 years agomod/dfrn_request.php and templates - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:44:30 +0000 (15:44 -0300)]
mod/dfrn_request.php and templates - Friendika -> Friendica

12 years agolibrary/OAuth1 - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:37:53 +0000 (15:37 -0300)]
library/OAuth1 - Friendika -> Friendica

12 years agojs/fk.autocomplete.js - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:37:13 +0000 (15:37 -0300)]
js/fk.autocomplete.js - Friendika -> Friendica

12 years agoINSTALL.txt - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:36:44 +0000 (15:36 -0300)]
INSTALL.txt - Friendika -> Friendica

12 years agoinclude/nav.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:35:34 +0000 (15:35 -0300)]
include/nav.php - Friendika -> Friendica

12 years agoinclude/api.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:34:48 +0000 (15:34 -0300)]
include/api.php - Friendika -> Friendica

12 years agopoller.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:32:22 +0000 (15:32 -0300)]
poller.php - Friendika -> Friendica

12 years agoacl_selectors.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:31:34 +0000 (15:31 -0300)]
acl_selectors.php - Friendika -> Friendica

12 years agotext.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png...
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:30:32 +0000 (15:30 -0300)]
text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)

12 years agoScrape.php - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:27:54 +0000 (15:27 -0300)]
Scrape.php - Friendika -> Friendica

12 years agofriendica.svg - Friendika -> Friendica
Abinoam P. Marques Jr [Sun, 19 Feb 2012 18:27:12 +0000 (15:27 -0300)]
friendica.svg - Friendika -> Friendica

12 years agorevup
friendica [Mon, 20 Feb 2012 21:29:46 +0000 (13:29 -0800)]
revup

12 years agoMerge pull request #41 from fabrixxm/master
fabrixxm [Mon, 20 Feb 2012 19:44:58 +0000 (11:44 -0800)]
Merge pull request #41 from fabrixxm/master

fix connection request in mod/ping

12 years agouse info() for successfull dfrn confirmation instead of notice()
Fabio Comuni [Mon, 20 Feb 2012 19:39:19 +0000 (20:39 +0100)]
use info() for successfull dfrn confirmation instead of notice()

12 years agoping: return all introductions detail when there are more than one
Fabio Comuni [Mon, 20 Feb 2012 19:21:34 +0000 (20:21 +0100)]
ping: return all introductions detail when there are more than one

12 years agoFetched some missing styles from testbubble.
Michael [Mon, 20 Feb 2012 14:11:27 +0000 (15:11 +0100)]
Fetched some missing styles from testbubble.

12 years agoSome testing stuff
Michael [Mon, 20 Feb 2012 10:15:22 +0000 (11:15 +0100)]
Some testing stuff

12 years agoinclude item links in web notification messages
friendica [Mon, 20 Feb 2012 04:27:32 +0000 (20:27 -0800)]
include item links in web notification messages

12 years agoAPI is now working on my nginx server.
Michael [Mon, 20 Feb 2012 00:53:22 +0000 (01:53 +0100)]
API is now working on my nginx server.

12 years agorevup
friendica [Sun, 19 Feb 2012 22:37:01 +0000 (14:37 -0800)]
revup

12 years agoNew version of markdown. Playing with stylesheet. Testing line breaks.
root [Sun, 19 Feb 2012 21:47:32 +0000 (22:47 +0100)]
New version of markdown. Playing with stylesheet. Testing line breaks.

12 years agoHandling nested bbcodes. Some small design changes in html2bbcode. Change in poller...
Michael [Sun, 19 Feb 2012 20:07:45 +0000 (21:07 +0100)]
Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes.

12 years agoREADME added
Michael [Sun, 19 Feb 2012 19:41:55 +0000 (20:41 +0100)]
README added

12 years agoBrand new html2bbcode. Some other changes in diaspora to bbcode handling
Michael [Sun, 19 Feb 2012 19:36:59 +0000 (20:36 +0100)]
Brand new html2bbcode. Some other changes in diaspora to bbcode handling

12 years agoMany small changes
Michael [Sun, 19 Feb 2012 19:11:36 +0000 (20:11 +0100)]
Many small changes

12 years agoMerge remote branch 'upstream/master'
Michael [Sun, 19 Feb 2012 19:09:42 +0000 (20:09 +0100)]
Merge remote branch 'upstream/master'

Conflicts:
view/theme/vier/style.css

12 years agoNew theme "vier" derives from "quattro"
ike [Sun, 19 Feb 2012 19:05:51 +0000 (20:05 +0100)]
New theme "vier" derives from "quattro"

12 years agoMerge pull request #40 from simonlnu/newsmilies
Abinoam P. Marques Jr. [Sun, 19 Feb 2012 17:58:41 +0000 (09:58 -0800)]
Merge pull request #40 from simonlnu/newsmilies

add :headdesk and fix doc/Pages.md to remove the absolute URL to /

12 years agoMerge pull request #39 from abinoam/logfile
Abinoam P. Marques Jr. [Sun, 19 Feb 2012 17:56:14 +0000 (09:56 -0800)]
Merge pull request #39 from abinoam/logfile

Logfile

12 years agoadd :headdesk and fix doc/Pages.md to remove the absolute URL to /
Simon L'nu [Sun, 19 Feb 2012 10:17:26 +0000 (05:17 -0500)]
add :headdesk and fix doc/Pages.md to remove the absolute URL to /

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoFixed log file issues on a freshly installed Friendica.
Abinoam P. Marques Jr [Sat, 18 Feb 2012 22:19:35 +0000 (14:19 -0800)]
Fixed log file issues on a freshly installed Friendica.

* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)

12 years agochange notify messages for web
friendica [Sat, 18 Feb 2012 11:18:20 +0000 (03:18 -0800)]
change notify messages for web

12 years agonew notifications - implement storage
friendica [Sat, 18 Feb 2012 10:57:42 +0000 (02:57 -0800)]
new notifications - implement storage

12 years agodeprecating two-char smilies
friendica [Sat, 18 Feb 2012 07:44:25 +0000 (23:44 -0800)]
deprecating two-char smilies

12 years agosupport plaintext on editpost, editorinit called before all buttons laid out
friendica [Fri, 17 Feb 2012 19:49:27 +0000 (11:49 -0800)]
support plaintext on editpost, editorinit called before all buttons laid out

12 years agoMerge branch 'pull'
friendica [Fri, 17 Feb 2012 18:13:34 +0000 (10:13 -0800)]
Merge branch 'pull'

12 years agorevup
friendica [Fri, 17 Feb 2012 18:13:06 +0000 (10:13 -0800)]
revup

12 years agoMerge pull request #38 from fabrixxm/master
fabrixxm [Fri, 17 Feb 2012 14:36:38 +0000 (06:36 -0800)]
Merge pull request #38 from fabrixxm/master

Revert changes to oembed

12 years agooembed: revert changes from 48f5bd492d
Fabio Comuni [Fri, 17 Feb 2012 14:34:05 +0000 (15:34 +0100)]
oembed: revert changes from 48f5bd492d

12 years agoa couple more items to make sure forum delegates can't access if the forum login...
friendica [Fri, 17 Feb 2012 07:58:07 +0000 (23:58 -0800)]
a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account

12 years agodo not under any circumstances allow a delegated forum admin to access the site admin...
friendica [Fri, 17 Feb 2012 07:50:57 +0000 (23:50 -0800)]
do not under any circumstances allow a delegated forum admin to access the site admin page.

12 years agonaked link with no protocol being passed from Diaspora
friendica [Fri, 17 Feb 2012 07:14:36 +0000 (23:14 -0800)]
naked link with no protocol being passed from Diaspora

12 years agoa few fixes for offsite community members
friendica [Fri, 17 Feb 2012 02:29:09 +0000 (18:29 -0800)]
a few fixes for offsite community members

12 years agoMerge branch 'pull'
friendica [Thu, 16 Feb 2012 23:16:04 +0000 (15:16 -0800)]
Merge branch 'pull'