]>
git.mxchange.org Git - friendica.git/log
friendica [Mon, 27 Feb 2012 07:54:04 +0000 (23:54 -0800)]
add plugin hooks to enotify
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
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>
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:
friendica [Mon, 27 Feb 2012 02:53:48 +0000 (18:53 -0800)]
spam db
friendica [Mon, 27 Feb 2012 00:40:21 +0000 (16:40 -0800)]
fix tag icon size
friendica [Mon, 27 Feb 2012 00:31:51 +0000 (16:31 -0800)]
typo in css
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
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"
friendica [Sun, 26 Feb 2012 22:49:56 +0000 (14:49 -0800)]
Merge pull request #49 from CatoTH/master
Bugfix for del_config
Michael [Sun, 26 Feb 2012 22:39:29 +0000 (23:39 +0100)]
Mail: New options for actions after importing mails.
friendica [Sun, 26 Feb 2012 22:34:58 +0000 (14:34 -0800)]
Merge branch 'pull'
friendica [Sun, 26 Feb 2012 22:34:01 +0000 (14:34 -0800)]
relative link redirects
Michael [Sun, 26 Feb 2012 20:47:47 +0000 (21:47 +0100)]
Merge remote branch 'upstream/master'
Tobias Hößl [Sun, 26 Feb 2012 20:43:51 +0000 (20:43 +0000)]
Avoid some notices
Tobias Hößl [Sun, 26 Feb 2012 20:43:35 +0000 (20:43 +0000)]
Bugfix
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
Tobias Hößl [Sun, 26 Feb 2012 20:41:41 +0000 (20:41 +0000)]
1 Bugfix (missing $ character) and avoid some notices
Tobias Hößl [Sun, 26 Feb 2012 20:40:41 +0000 (20:40 +0000)]
necessare fields not loaded from DB
Tobias Hößl [Sun, 26 Feb 2012 20:39:37 +0000 (20:39 +0000)]
should probably be a->user['hidewall'] instead of profile['hidewall']
Michael [Sun, 26 Feb 2012 20:16:29 +0000 (21:16 +0100)]
"Vier-Theme" Some more design stuff.
Tobias Diekershoff [Sun, 26 Feb 2012 16:12:14 +0000 (17:12 +0100)]
some revision to the German strings
Tobias Diekershoff [Sun, 26 Feb 2012 14:41:27 +0000 (15:41 +0100)]
German strings
root [Sun, 26 Feb 2012 14:29:17 +0000 (14:29 +0000)]
Wrong variable name
friendica [Sun, 26 Feb 2012 12:17:02 +0000 (04:17 -0800)]
show experimental and unsupported theme status on theme admin page\18
friendica [Sun, 26 Feb 2012 09:20:43 +0000 (01:20 -0800)]
jumping divs with no scrolling
friendica [Sun, 26 Feb 2012 08:53:31 +0000 (00:53 -0800)]
imrpove contrast on darkzero blockquotes
friendica [Sun, 26 Feb 2012 08:48:11 +0000 (00:48 -0800)]
darkzero-NS theme
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
friendica [Sun, 26 Feb 2012 01:07:38 +0000 (17:07 -0800)]
one more attempt
friendica [Sun, 26 Feb 2012 01:04:31 +0000 (17:04 -0800)]
missed a spot
Abinoam P. Marques Jr [Sun, 26 Feb 2012 00:56:14 +0000 (16:56 -0800)]
Comment notifications by e-mail now are threaded
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:23:00 +0000 (13:23 -0800)]
include/items.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
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:06:50 +0000 (13:06 -0800)]
DB_UPDATE_VERSION incremented
Abinoam P. Marques Jr [Sat, 25 Feb 2012 21:06:06 +0000 (13:06 -0800)]
Added notify-threads to update.php
Abinoam P. Marques Jr [Sat, 25 Feb 2012 20:33:08 +0000 (12:33 -0800)]
Added notify-threads to database.sql.
friendica [Sun, 26 Feb 2012 00:47:21 +0000 (16:47 -0800)]
reverse order of links
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)
friendica [Sat, 25 Feb 2012 22:22:51 +0000 (14:22 -0800)]
scale external images
friendica [Sat, 25 Feb 2012 21:00:44 +0000 (13:00 -0800)]
fixed link for toggling plugin from detail page
Michael [Sat, 25 Feb 2012 18:40:05 +0000 (19:40 +0100)]
poller.php: Test for moving to archive, vier-style: notifications fixed
friendica [Sat, 25 Feb 2012 13:00:48 +0000 (05:00 -0800)]
notify positioning, theming
friendica [Sat, 25 Feb 2012 12:37:12 +0000 (04:37 -0800)]
sysnotify count in wrong location, and wrong number
friendica [Sat, 25 Feb 2012 11:28:07 +0000 (03:28 -0800)]
theme seen,unseen notifications
Michael [Sat, 25 Feb 2012 10:13:04 +0000 (11:13 +0100)]
"vier" popup menu looks nicer now (more like quattro again)
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.
friendica [Sat, 25 Feb 2012 08:42:25 +0000 (00:42 -0800)]
photos in notifications
friendica [Sat, 25 Feb 2012 08:30:14 +0000 (00:30 -0800)]
theme info (like plugin info)
friendica [Sat, 25 Feb 2012 07:44:55 +0000 (23:44 -0800)]
notifications to zeros, bug in notify link
friendica [Sat, 25 Feb 2012 06:47:43 +0000 (22:47 -0800)]
string update for 2.38
friendica [Sat, 25 Feb 2012 04:40:09 +0000 (20:40 -0800)]
update author name across items if changed.
friendica [Sat, 25 Feb 2012 04:07:57 +0000 (20:07 -0800)]
waitman gobble fix for escaping code blocks in tinymce
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.
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.
Michael [Sat, 25 Feb 2012 00:10:45 +0000 (01:10 +0100)]
multipart messages complete, message-id conversion done.
friendica [Fri, 24 Feb 2012 20:52:50 +0000 (12:52 -0800)]
more privacy docs
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)
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.
friendica [Fri, 24 Feb 2012 04:29:09 +0000 (20:29 -0800)]
theme shakeup commences - themes are now administered in admin panel.
friendica [Fri, 24 Feb 2012 01:37:03 +0000 (17:37 -0800)]
system notifications to notify module, untranslated string in notifications.tpl
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
Michael [Thu, 23 Feb 2012 19:59:34 +0000 (20:59 +0100)]
GIT problems ...
Michael [Thu, 23 Feb 2012 19:53:22 +0000 (20:53 +0100)]
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Michael [Thu, 23 Feb 2012 19:51:44 +0000 (20:51 +0100)]
bbcode.php: A list or quote at the beginning wasn't detected
Fabio Comuni [Thu, 23 Feb 2012 15:21:28 +0000 (16:21 +0100)]
fix visualization in groupeditor
Fabio Comuni [Thu, 23 Feb 2012 15:17:36 +0000 (16:17 +0100)]
less html in mod/group.php, template for group members editor, quattro theme for group edit.
Simon [Thu, 23 Feb 2012 14:44:06 +0000 (06:44 -0800)]
Merge pull request #47 from fabrixxm/master
quattro: fix typos
Fabio Comuni [Thu, 23 Feb 2012 14:23:52 +0000 (15:23 +0100)]
Merge remote-tracking branch 'friendica/master'
Tobias Diekershoff [Thu, 23 Feb 2012 13:16:20 +0000 (14:16 +0100)]
quattro-green: removed contact_template.tpl
Fabio Comuni [Thu, 23 Feb 2012 13:10:32 +0000 (14:10 +0100)]
Merge remote-tracking branch 'friendica/master'
Fabio Comuni [Thu, 23 Feb 2012 13:10:23 +0000 (14:10 +0100)]
quattro: fix typos
Tobias Diekershoff [Thu, 23 Feb 2012 11:54:14 +0000 (12:54 +0100)]
green-quattro: applied a color for shiny class and preview
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
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
Tobias Diekershoff [Thu, 23 Feb 2012 10:12:36 +0000 (11:12 +0100)]
fix img tag with size attribute
friendica [Thu, 23 Feb 2012 08:30:17 +0000 (00:30 -0800)]
Merge branch 'master' into notify
friendica [Thu, 23 Feb 2012 08:28:26 +0000 (00:28 -0800)]
more theme notify fixes
Tobias Diekershoff [Thu, 23 Feb 2012 08:04:00 +0000 (09:04 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 23 Feb 2012 08:02:40 +0000 (09:02 +0100)]
quattro: added styling to pivate message view
friendica [Thu, 23 Feb 2012 07:34:30 +0000 (23:34 -0800)]
new notify sort of working in testbubble
Michael Vogel [Thu, 23 Feb 2012 06:55:56 +0000 (07:55 +0100)]
README file shortened because this was for my branch 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.
friendica [Thu, 23 Feb 2012 06:36:07 +0000 (22:36 -0800)]
Merge branch 'master' into notify
friendica [Thu, 23 Feb 2012 04:58:04 +0000 (20:58 -0800)]
nested quote check fails to account for strpos returning position 0
friendica [Thu, 23 Feb 2012 04:31:33 +0000 (20:31 -0800)]
restore poller normal operation
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, ...
friendica [Thu, 23 Feb 2012 03:58:01 +0000 (19:58 -0800)]
Merge branch 'pull'
friendica [Thu, 23 Feb 2012 03:56:28 +0000 (19:56 -0800)]
allow forum posts by followers on Diaspora
Michael [Wed, 22 Feb 2012 14:20:49 +0000 (15:20 +0100)]
German translation more gender friendly. Some more logging in poller.php
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 ;)
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>
friendica [Wed, 22 Feb 2012 09:50:06 +0000 (01:50 -0800)]
never enough documentation
friendica [Wed, 22 Feb 2012 07:35:50 +0000 (23:35 -0800)]
waitman gobble media upload via api patch
friendica [Wed, 22 Feb 2012 07:13:03 +0000 (23:13 -0800)]
escape smiley conversion in code and pre blocks
friendica [Wed, 22 Feb 2012 04:22:09 +0000 (20:22 -0800)]
some cleanup of tb notifications
friendica [Wed, 22 Feb 2012 03:03:55 +0000 (19:03 -0800)]
new notifications
friendica [Wed, 22 Feb 2012 02:10:15 +0000 (18:10 -0800)]
add full email link to notification
friendica [Wed, 22 Feb 2012 00:59:57 +0000 (16:59 -0800)]
mark all notifications read
friendica [Tue, 21 Feb 2012 22:32:17 +0000 (14:32 -0800)]
Merge branch 'pull'