]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agosmall fix in style.css
tommy tomson [Sat, 3 Mar 2012 05:00:46 +0000 (06:00 +0100)]
small fix in style.css

12 years agofix star/unstar
tommy tomson [Sat, 3 Mar 2012 03:45:34 +0000 (04:45 +0100)]
fix star/unstar

12 years agofixes in wall_item.tpl and style.css in theme diabook
tommy tomson [Sat, 3 Mar 2012 03:27:06 +0000 (04:27 +0100)]
fixes in wall_item.tpl and style.css in theme diabook

12 years agofix in wall_item.tpl
tommy tomson [Sat, 3 Mar 2012 00:52:53 +0000 (01:52 +0100)]
fix in wall_item.tpl
new icon link.png

12 years agofixed broken tags and notifications in theme
tommy tomson [Fri, 2 Mar 2012 23:41:02 +0000 (00:41 +0100)]
fixed broken tags and notifications in theme

12 years agodeleted readme.txt from folder diabook
tommy tomson [Fri, 2 Mar 2012 17:01:21 +0000 (18:01 +0100)]
deleted readme.txt from folder diabook

12 years agogithub finally working
tommy tomson [Fri, 2 Mar 2012 16:47:45 +0000 (17:47 +0100)]
github finally working

12 years agoadjust3
tommy tomson [Fri, 2 Mar 2012 16:45:21 +0000 (17:45 +0100)]
adjust3

12 years agoMerge remote-tracking branch 'tomtom84_friendica/master' into master-2
tommy tomson [Fri, 2 Mar 2012 16:21:06 +0000 (17:21 +0100)]
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2

12 years agoadjust2
tommy tomson [Fri, 2 Mar 2012 14:57:32 +0000 (15:57 +0100)]
adjust2

12 years agoadjust
tommy tomson [Fri, 2 Mar 2012 14:57:32 +0000 (15:57 +0100)]
adjust

12 years agoMerge remote-tracking branch 'upstream/master'
tommy tomson [Fri, 2 Mar 2012 03:58:37 +0000 (04:58 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoMerge branch 'pull'
friendica [Fri, 2 Mar 2012 02:54:50 +0000 (18:54 -0800)]
Merge branch 'pull'

12 years agoprobe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
friendica [Fri, 2 Mar 2012 02:49:23 +0000 (18:49 -0800)]
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type

12 years agoMerge pull request #54 from campino/master
friendica [Fri, 2 Mar 2012 01:54:41 +0000 (17:54 -0800)]
Merge pull request #54 from campino/master

Build documentation

This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.

12 years agodiabook commit
tommy tomson [Fri, 2 Mar 2012 01:05:35 +0000 (02:05 +0100)]
diabook commit

12 years agoMerge remote-tracking branch 'upstream/master'
Alexander Kampmann [Thu, 1 Mar 2012 10:49:22 +0000 (11:49 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoEnabled automated doc building. Changes:
Alexander Kampmann [Thu, 1 Mar 2012 10:44:33 +0000 (11:44 +0100)]
Enabled automated doc building. Changes:
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them

12 years agoyet more work on notifications
friendica [Thu, 1 Mar 2012 03:23:01 +0000 (19:23 -0800)]
yet more work on notifications

12 years agonotification enhancements
friendica [Thu, 1 Mar 2012 02:19:08 +0000 (18:19 -0800)]
notification enhancements

12 years agobetter handling of multiple notifications for same item, and old notifications
friendica [Thu, 1 Mar 2012 00:26:07 +0000 (16:26 -0800)]
better handling of multiple notifications for same item, and old notifications

12 years agoUpdate LICENSE
friendica [Wed, 29 Feb 2012 10:09:20 +0000 (21:09 +1100)]
Update LICENSE

12 years agoUpdate README
friendica [Wed, 29 Feb 2012 10:07:33 +0000 (21:07 +1100)]
Update README

12 years agocleaned up mess created when both people request friendship and one approves as duplex
friendica [Wed, 29 Feb 2012 01:32:44 +0000 (17:32 -0800)]
cleaned up mess created when both people request friendship and one approves as duplex

12 years agocall time pass by reference deprecated
friendica [Tue, 28 Feb 2012 22:54:17 +0000 (14:54 -0800)]
call time pass by reference deprecated

12 years agoMerge branch 'pull'
friendica [Tue, 28 Feb 2012 22:53:41 +0000 (14:53 -0800)]
Merge branch 'pull'

12 years agoFrom Tobias H - catch some irregularities caused by cut/paste code
friendica [Tue, 28 Feb 2012 22:52:23 +0000 (14:52 -0800)]
From Tobias H - catch some irregularities caused by cut/paste code

12 years agofix url and network display
fabrixxm [Tue, 28 Feb 2012 18:10:27 +0000 (19:10 +0100)]
fix url and network display

12 years agoupdate globaldir when page-type changes, add spam date field
friendica [Tue, 28 Feb 2012 07:27:16 +0000 (23:27 -0800)]
update globaldir when page-type changes, add spam date field

12 years agoclicking contact on contacts page broken link
friendica [Tue, 28 Feb 2012 02:46:11 +0000 (18:46 -0800)]
clicking contact on contacts page broken link

12 years agoMerge branch 'pull'
friendica [Tue, 28 Feb 2012 01:18:53 +0000 (17:18 -0800)]
Merge branch 'pull'

12 years agocleanup notify subject lines
friendica [Tue, 28 Feb 2012 01:18:19 +0000 (17:18 -0800)]
cleanup notify subject lines

12 years agoMerge pull request #53 from fabrixxm/master
fabrixxm [Mon, 27 Feb 2012 18:05:27 +0000 (10:05 -0800)]
Merge pull request #53 from fabrixxm/master

remove template filters support

12 years agorevert 01a2791e3a to avoid random preg internal errors. fix contact_template
Fabio Comuni [Mon, 27 Feb 2012 17:48:59 +0000 (18:48 +0100)]
revert 01a2791e3a to avoid random preg internal errors. fix contact_template

12 years agoMerge pull request #52 from campino/master
Simon [Mon, 27 Feb 2012 14:07:46 +0000 (06:07 -0800)]
Merge pull request #52 from campino/master

Corrected syntax error

12 years agofixed syntax errors
Alexander Kampmann [Mon, 27 Feb 2012 13:12:44 +0000 (14:12 +0100)]
fixed syntax errors

12 years agoadd plugin hooks to enotify
friendica [Mon, 27 Feb 2012 07:54:04 +0000 (23:54 -0800)]
add plugin hooks to enotify

12 years agoMerge pull request #51 from simonlnu/master
Simon [Mon, 27 Feb 2012 06:20:46 +0000 (22:20 -0800)]
Merge pull request #51 from simonlnu/master

RFC, request for comments: about the https for html5shiv

12 years agominor typographical fixes. need to do something about the http on https sites for...
Simon L'nu [Mon, 27 Feb 2012 06:04:41 +0000 (01:04 -0500)]
minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine

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, 27 Feb 2012 05:56:41 +0000 (00:56 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (29 commits)
  spam db
  fix tag icon size
  typo in css
  tagging missing from wallwall and a couple of themes, star missing from dispy
  Mail: New options for actions after importing mails.
  relative link redirects
  Avoid some notices
  Bugfix
  is not always defined; but if defined, then always of type integer
  1 Bugfix (missing $ character) and avoid some notices
  necessare fields not loaded from DB
  should probably be a->user['hidewall'] instead of profile['hidewall']
  "Vier-Theme" Some more design stuff.
  some revision to the German strings
  German strings
  Wrong variable name
  show experimental and unsupported theme status on theme admin page\18
  jumping divs with no scrolling
  imrpove contrast on darkzero blockquotes
  darkzero-NS theme
  ...

* master:

12 years agospam db
friendica [Mon, 27 Feb 2012 02:53:48 +0000 (18:53 -0800)]
spam db

12 years agofix tag icon size
friendica [Mon, 27 Feb 2012 00:40:21 +0000 (16:40 -0800)]
fix tag icon size

12 years agotypo in css
friendica [Mon, 27 Feb 2012 00:31:51 +0000 (16:31 -0800)]
typo in css

12 years agotagging missing from wallwall and a couple of themes, star missing from dispy
friendica [Mon, 27 Feb 2012 00:29:06 +0000 (16:29 -0800)]
tagging missing from wallwall and a couple of themes, star missing from dispy

12 years agoMerge pull request #50 from annando/master
friendica [Sun, 26 Feb 2012 23:07:34 +0000 (15:07 -0800)]
Merge pull request #50 from annando/master

massive changes in mail and design updates in "vier"

12 years agoMerge pull request #49 from CatoTH/master
friendica [Sun, 26 Feb 2012 22:49:56 +0000 (14:49 -0800)]
Merge pull request #49 from CatoTH/master

Bugfix for del_config

12 years agoMail: New options for actions after importing mails.
Michael [Sun, 26 Feb 2012 22:39:29 +0000 (23:39 +0100)]
Mail: New options for actions after importing mails.

12 years agoMerge branch 'pull'
friendica [Sun, 26 Feb 2012 22:34:58 +0000 (14:34 -0800)]
Merge branch 'pull'

12 years agorelative link redirects
friendica [Sun, 26 Feb 2012 22:34:01 +0000 (14:34 -0800)]
relative link redirects

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

12 years agoAvoid some notices
Tobias Hößl [Sun, 26 Feb 2012 20:43:51 +0000 (20:43 +0000)]
Avoid some notices

12 years agoBugfix
Tobias Hößl [Sun, 26 Feb 2012 20:43:35 +0000 (20:43 +0000)]
Bugfix

12 years agois not always defined; but if defined, then always of type integer
Tobias Hößl [Sun, 26 Feb 2012 20:43:23 +0000 (20:43 +0000)]
is not always defined; but if defined, then always of type integer

12 years ago1 Bugfix (missing $ character) and avoid some notices
Tobias Hößl [Sun, 26 Feb 2012 20:41:41 +0000 (20:41 +0000)]
1 Bugfix (missing $ character) and avoid some notices

12 years agonecessare fields not loaded from DB
Tobias Hößl [Sun, 26 Feb 2012 20:40:41 +0000 (20:40 +0000)]
necessare fields not loaded from DB

12 years agoshould probably be a->user['hidewall'] instead of profile['hidewall']
Tobias Hößl [Sun, 26 Feb 2012 20:39:37 +0000 (20:39 +0000)]
should probably be a->user['hidewall'] instead of profile['hidewall']

12 years ago"Vier-Theme" Some more design stuff.
Michael [Sun, 26 Feb 2012 20:16:29 +0000 (21:16 +0100)]
"Vier-Theme" Some more design stuff.

12 years agosome revision to the German strings
Tobias Diekershoff [Sun, 26 Feb 2012 16:12:14 +0000 (17:12 +0100)]
some revision to the German strings

12 years agoGerman strings
Tobias Diekershoff [Sun, 26 Feb 2012 14:41:27 +0000 (15:41 +0100)]
German strings

12 years agoWrong variable name
root [Sun, 26 Feb 2012 14:29:17 +0000 (14:29 +0000)]
Wrong variable name

12 years agoshow experimental and unsupported theme status on theme admin page\18
friendica [Sun, 26 Feb 2012 12:17:02 +0000 (04:17 -0800)]
show experimental and unsupported theme status on theme admin page\18

12 years agojumping divs with no scrolling
friendica [Sun, 26 Feb 2012 09:20:43 +0000 (01:20 -0800)]
jumping divs with no scrolling

12 years agoimrpove contrast on darkzero blockquotes
friendica [Sun, 26 Feb 2012 08:53:31 +0000 (00:53 -0800)]
imrpove contrast on darkzero blockquotes

12 years agodarkzero-NS theme
friendica [Sun, 26 Feb 2012 08:48:11 +0000 (00:48 -0800)]
darkzero-NS theme

12 years agoMerge pull request #48 from abinoam/thmail-5
Simon [Sun, 26 Feb 2012 02:01:09 +0000 (18:01 -0800)]
Merge pull request #48 from abinoam/thmail-5

Comment Notifications by Email - Threading Them

12 years agoone more attempt
friendica [Sun, 26 Feb 2012 01:07:38 +0000 (17:07 -0800)]
one more attempt

12 years agomissed a spot
friendica [Sun, 26 Feb 2012 01:04:31 +0000 (17:04 -0800)]
missed a spot

12 years agoComment notifications by e-mail now are threaded
Abinoam P. Marques Jr [Sun, 26 Feb 2012 00:56:14 +0000 (16:56 -0800)]
Comment notifications by e-mail now are threaded

12 years agoinclude/items.php pass 'parent' to notification
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:23:00 +0000 (13:23 -0800)]
include/items.php pass 'parent' to notification

12 years agomod/item.php pass 'parent' to notification
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:10:33 +0000 (13:10 -0800)]
mod/item.php pass 'parent' to notification

12 years agoDB_UPDATE_VERSION incremented
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:06:50 +0000 (13:06 -0800)]
DB_UPDATE_VERSION incremented

12 years agoAdded notify-threads to update.php
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:06:06 +0000 (13:06 -0800)]
Added notify-threads to update.php

12 years agoAdded notify-threads to database.sql.
Abinoam P. Marques Jr [Sat, 25 Feb 2012 20:33:08 +0000 (12:33 -0800)]
Added notify-threads to database.sql.

12 years agoreverse order of links
friendica [Sun, 26 Feb 2012 00:47:21 +0000 (16:47 -0800)]
reverse order of links

12 years agodo not set notify popup empty anymore (though another solution is needed for firehose...
friendica [Sun, 26 Feb 2012 00:16:52 +0000 (16:16 -0800)]
do not set notify popup empty anymore (though another solution is needed for firehose mode)

12 years agoscale external images
friendica [Sat, 25 Feb 2012 22:22:51 +0000 (14:22 -0800)]
scale external images

12 years agofixed link for toggling plugin from detail page
friendica [Sat, 25 Feb 2012 21:00:44 +0000 (13:00 -0800)]
fixed link for toggling plugin from detail page

12 years agopoller.php: Test for moving to archive, vier-style: notifications fixed
Michael [Sat, 25 Feb 2012 18:40:05 +0000 (19:40 +0100)]
poller.php: Test for moving to archive, vier-style: notifications fixed

12 years agonotify positioning, theming
friendica [Sat, 25 Feb 2012 13:00:48 +0000 (05:00 -0800)]
notify positioning, theming

12 years agosysnotify count in wrong location, and wrong number
friendica [Sat, 25 Feb 2012 12:37:12 +0000 (04:37 -0800)]
sysnotify count in wrong location, and wrong number

12 years agotheme seen,unseen notifications
friendica [Sat, 25 Feb 2012 11:28:07 +0000 (03:28 -0800)]
theme seen,unseen notifications

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 agophotos in notifications
friendica [Sat, 25 Feb 2012 08:42:25 +0000 (00:42 -0800)]
photos in notifications

12 years agotheme info (like plugin info)
friendica [Sat, 25 Feb 2012 08:30:14 +0000 (00:30 -0800)]
theme info (like plugin info)

12 years agonotifications to zeros, bug in notify link
friendica [Sat, 25 Feb 2012 07:44:55 +0000 (23:44 -0800)]
notifications to zeros, bug in notify link

12 years agostring update for 2.38
friendica [Sat, 25 Feb 2012 06:47:43 +0000 (22:47 -0800)]
string update for 2.38

12 years agoupdate author name across items if changed.
friendica [Sat, 25 Feb 2012 04:40:09 +0000 (20:40 -0800)]
update author name across items if changed.

12 years agowaitman gobble fix for escaping code blocks in tinymce
friendica [Sat, 25 Feb 2012 04:07:57 +0000 (20:07 -0800)]
waitman gobble fix for escaping code blocks in tinymce

12 years agoattribution issue - don't take author name from contact if available from item.
friendica [Sat, 25 Feb 2012 04:03:13 +0000 (20:03 -0800)]
attribution issue - don't take author name from contact if available from item.

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 agomore privacy docs
friendica [Fri, 24 Feb 2012 20:52:50 +0000 (12:52 -0800)]
more privacy docs

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 agotheme shakeup commences - themes are now administered in admin panel.
friendica [Fri, 24 Feb 2012 04:29:09 +0000 (20:29 -0800)]
theme shakeup commences - themes are now administered in admin panel.

12 years agosystem notifications to notify module, untranslated string in notifications.tpl
friendica [Fri, 24 Feb 2012 01:37:03 +0000 (17:37 -0800)]
system notifications to notify module, untranslated string in notifications.tpl

12 years agoimplement firehose notify in ping, strip links so notify popup displays correctly...
friendica [Fri, 24 Feb 2012 00:50:29 +0000 (16:50 -0800)]
implement firehose notify in ping, strip links so notify popup displays correctly in all themes

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