]>
git.mxchange.org Git - friendica.git/log
friendica [Mon, 7 May 2012 03:08:20 +0000 (20:08 -0700)]
Merge branch 'ac'
friendica [Mon, 7 May 2012 03:06:39 +0000 (20:06 -0700)]
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
friendica [Mon, 7 May 2012 02:56:27 +0000 (19:56 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Mon, 7 May 2012 02:55:39 +0000 (19:55 -0700)]
mail autcomplete testing
friendica [Mon, 7 May 2012 02:53:34 +0000 (19:53 -0700)]
email recip autocomplete
friendica [Mon, 7 May 2012 02:52:22 +0000 (19:52 -0700)]
rev update
tommy tomson [Mon, 7 May 2012 00:49:44 +0000 (02:49 +0200)]
diabook-theme: small fix
tommy tomson [Mon, 7 May 2012 00:24:43 +0000 (02:24 +0200)]
diabook-theme: add "Earth Layers"-box at right_side
tommy tomson [Sun, 6 May 2012 21:26:44 +0000 (23:26 +0200)]
diabook-theme: twitterbox-bugfix
tommy tomson [Sun, 6 May 2012 10:25:09 +0000 (12:25 +0200)]
diabook: small fix
tommy tomson [Sun, 6 May 2012 10:09:22 +0000 (12:09 +0200)]
Merge remote-tracking branch 'origin/master'
tommy tomson [Sun, 6 May 2012 10:08:46 +0000 (12:08 +0200)]
diabook-theme: bugfix
Simon [Sun, 6 May 2012 10:08:08 +0000 (03:08 -0700)]
Merge pull request #290 from simonlnu/master
Simon L'nu [Sun, 6 May 2012 10:05:31 +0000 (06:05 -0400)]
fixing widths to be more dynamic where possible. font size fixes. add README.mdSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 6 May 2012 08:51:15 +0000 (04:51 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sun, 6 May 2012 00:54:19 +0000 (17:54 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 6 May 2012 00:53:23 +0000 (17:53 -0700)]
bad sql left after the mailbox in/out merge
Simon L'nu [Sun, 6 May 2012 00:08:19 +0000 (20:08 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Sat, 5 May 2012 22:36:46 +0000 (00:36 +0200)]
diabook-theme: small fix
tommy tomson [Sat, 5 May 2012 22:10:35 +0000 (00:10 +0200)]
diabook-theme: twitter-box-update at right_aside
tommy tomson [Sat, 5 May 2012 18:01:38 +0000 (20:01 +0200)]
diabook-theme: can now set the twitter search term in theme-settings & small fixes
friendica [Sat, 5 May 2012 14:05:32 +0000 (07:05 -0700)]
consolidate item deletion so we can fix orphaned categories and file_as tags.
friendica [Sat, 5 May 2012 12:04:05 +0000 (05:04 -0700)]
Merge pull request #289 from cvogeley/master
Tobias Diekershoff [Sat, 5 May 2012 07:11:25 +0000 (09:11 +0200)]
DE: new email templates translated
friendica [Sat, 5 May 2012 00:43:47 +0000 (17:43 -0700)]
workaround to clean up orphaned filetags
friendica [Fri, 4 May 2012 23:45:10 +0000 (16:45 -0700)]
only show remove category to item owner
Christian Vogeley [Fri, 4 May 2012 22:45:35 +0000 (00:45 +0200)]
Option to set theme width added. Minor layout changes
Simon L'nu [Fri, 4 May 2012 21:43:04 +0000 (17:43 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Fri, 4 May 2012 21:13:03 +0000 (14:13 -0700)]
Merge pull request #288 from simonlnu/master
Simon L'nu [Fri, 4 May 2012 21:06:17 +0000 (17:06 -0400)]
fix lightbox; finished dark, now on to lightSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 4 May 2012 21:03:23 +0000 (17:03 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Fri, 4 May 2012 13:43:24 +0000 (06:43 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 4 May 2012 13:42:56 +0000 (06:42 -0700)]
category removal
friendica [Fri, 4 May 2012 10:27:48 +0000 (03:27 -0700)]
Merge pull request #287 from mschmitt/master
Martin Schmitt [Fri, 4 May 2012 10:02:05 +0000 (12:02 +0200)]
Esperanto 100%
friendica [Fri, 4 May 2012 08:46:36 +0000 (01:46 -0700)]
"show more" friends in common
Simon L'nu [Fri, 4 May 2012 06:31:21 +0000 (02:31 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Diekershoff [Fri, 4 May 2012 05:30:49 +0000 (07:30 +0200)]
DE strings
friendica [Fri, 4 May 2012 04:50:48 +0000 (21:50 -0700)]
implement max load average before queuing/deferring delivery and poller processes
friendica [Fri, 4 May 2012 03:47:04 +0000 (20:47 -0700)]
yet another bug in remote_friends_in_common
friendica [Fri, 4 May 2012 00:20:24 +0000 (17:20 -0700)]
string update
friendica [Fri, 4 May 2012 00:19:53 +0000 (17:19 -0700)]
use html symbols for double quotes
friendica [Thu, 3 May 2012 23:55:03 +0000 (16:55 -0700)]
string update
friendica [Thu, 3 May 2012 23:45:30 +0000 (16:45 -0700)]
Merge pull request #284 from fabrixxm/master
friendica [Thu, 3 May 2012 21:01:06 +0000 (14:01 -0700)]
Merge pull request #286 from grossard/french_proofreading
Ludovic Grossard [Thu, 3 May 2012 20:35:59 +0000 (22:35 +0200)]
proofreading the mail templates in fr
Simon [Thu, 3 May 2012 18:39:34 +0000 (11:39 -0700)]
Merge pull request #285 from simonlnu/master
Simon L'nu [Thu, 3 May 2012 18:35:21 +0000 (14:35 -0400)]
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 3 May 2012 18:25:18 +0000 (14:25 -0400)]
major reworking of dispy dark. light to followSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 3 May 2012 18:18:40 +0000 (14:18 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Fabio Comuni [Thu, 3 May 2012 13:28:23 +0000 (15:28 +0200)]
validate_url() and validate_email() validate also IP address.
tommy tomson [Thu, 3 May 2012 05:57:40 +0000 (07:57 +0200)]
diabook-theme: small fix
friendica [Thu, 3 May 2012 05:38:17 +0000 (22:38 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 3 May 2012 05:33:51 +0000 (22:33 -0700)]
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
Simon L'nu [Thu, 3 May 2012 04:25:56 +0000 (00:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Thu, 3 May 2012 04:25:23 +0000 (06:25 +0200)]
diabook-theme: small fix
tommy tomson [Thu, 3 May 2012 04:05:55 +0000 (06:05 +0200)]
diabook-theme: made boxes at right_aside sortable
friendica [Thu, 3 May 2012 04:00:39 +0000 (21:00 -0700)]
use cid rather than uid in perms
friendica [Thu, 3 May 2012 03:49:51 +0000 (20:49 -0700)]
Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora
Zach Prezkuta [Thu, 3 May 2012 03:12:57 +0000 (21:12 -0600)]
Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
friendica [Wed, 2 May 2012 23:27:19 +0000 (16:27 -0700)]
use mysql replace on cache items
friendica [Wed, 2 May 2012 23:15:59 +0000 (16:15 -0700)]
fixing common friends
friendica [Wed, 2 May 2012 22:27:39 +0000 (15:27 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 2 May 2012 22:26:57 +0000 (15:26 -0700)]
rev update
friendica [Wed, 2 May 2012 20:49:57 +0000 (13:49 -0700)]
Merge pull request #282 from max-weller/master
Simon L'nu [Wed, 2 May 2012 16:49:00 +0000 (12:49 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Max Weller [Wed, 2 May 2012 14:59:58 +0000 (16:59 +0200)]
Moved Meta Viewport from global head.tpl to diabook's header
tommy tomson [Wed, 2 May 2012 14:27:01 +0000 (16:27 +0200)]
diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
tommy tomson [Wed, 2 May 2012 12:33:04 +0000 (14:33 +0200)]
diabook-theme: tryied to improve performance a bit
tommy tomson [Wed, 2 May 2012 10:40:51 +0000 (12:40 +0200)]
diabook-theme: fix footer/impressum
friendica [Wed, 2 May 2012 09:18:54 +0000 (02:18 -0700)]
missing param
friendica [Wed, 2 May 2012 08:45:57 +0000 (01:45 -0700)]
provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
friendica [Wed, 2 May 2012 08:07:23 +0000 (01:07 -0700)]
delineate the new profile changes from the rest of the text
friendica [Wed, 2 May 2012 07:58:28 +0000 (00:58 -0700)]
how did that happen?
friendica [Wed, 2 May 2012 07:44:37 +0000 (00:44 -0700)]
shuffle results of remote_common_friends widget
friendica [Wed, 2 May 2012 06:16:58 +0000 (23:16 -0700)]
only validate once
friendica [Wed, 2 May 2012 06:15:39 +0000 (23:15 -0700)]
perform basic validation
Simon L'nu [Wed, 2 May 2012 05:54:59 +0000 (01:54 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Wed, 2 May 2012 04:22:27 +0000 (21:22 -0700)]
final touches - show friends in common with total strangers from different sites
friendica [Wed, 2 May 2012 03:38:06 +0000 (20:38 -0700)]
fix size
friendica [Wed, 2 May 2012 03:36:35 +0000 (20:36 -0700)]
cross fingers
friendica [Wed, 2 May 2012 03:33:19 +0000 (20:33 -0700)]
reduce the scope a bit
friendica [Wed, 2 May 2012 03:22:59 +0000 (20:22 -0700)]
add template
friendica [Wed, 2 May 2012 03:11:35 +0000 (20:11 -0700)]
fn not found
friendica [Wed, 2 May 2012 02:24:22 +0000 (19:24 -0700)]
really fat fingers today - though none of this has gone further than my own site
friendica [Wed, 2 May 2012 02:20:41 +0000 (19:20 -0700)]
another one
friendica [Wed, 2 May 2012 02:19:24 +0000 (19:19 -0700)]
typo
friendica [Wed, 2 May 2012 02:16:18 +0000 (19:16 -0700)]
first try common friends for visitors
Simon L'nu [Wed, 2 May 2012 01:38:33 +0000 (21:38 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Wed, 2 May 2012 00:10:26 +0000 (17:10 -0700)]
improve handling of relative feed url's
friendica [Tue, 1 May 2012 22:50:14 +0000 (15:50 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 1 May 2012 22:49:22 +0000 (15:49 -0700)]
convert html entities to utf-8 before email header encoding
Thomas Willingham [Tue, 1 May 2012 20:37:49 +0000 (21:37 +0100)]
More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway.
Thomas Willingham [Tue, 1 May 2012 20:05:55 +0000 (21:05 +0100)]
modified: images/smiley-thumbsup.gif
tommy tomson [Tue, 1 May 2012 14:46:08 +0000 (16:46 +0200)]
diabook-themes: small fix at "community pages"-box
friendica [Tue, 1 May 2012 08:34:47 +0000 (01:34 -0700)]
link socgraph to zrls
friendica [Tue, 1 May 2012 08:19:02 +0000 (01:19 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 1 May 2012 08:16:47 +0000 (01:16 -0700)]
adding zrl support to social graphs
Simon [Tue, 1 May 2012 08:03:52 +0000 (01:03 -0700)]
Merge pull request #281 from simonlnu/master
Simon L'nu [Tue, 1 May 2012 08:02:56 +0000 (04:02 -0400)]
lighten bg and darken font on dispy lightSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
projects / friendica.git / log