]>
git.mxchange.org Git - friendica.git/log
tomtom84 [Fri, 9 Mar 2012 02:02:25 +0000 (18:02 -0800)]
Merge pull request #110 from tomtom84/master
tommy tomson [Fri, 9 Mar 2012 01:59:13 +0000 (02:59 +0100)]
fixed star-bug
friendica [Fri, 9 Mar 2012 00:30:45 +0000 (16:30 -0800)]
theme info file for testbubble
friendica [Fri, 9 Mar 2012 00:29:22 +0000 (16:29 -0800)]
catalan translation
friendica [Thu, 8 Mar 2012 22:35:48 +0000 (14:35 -0800)]
Merge branch 'pull'
friendica [Thu, 8 Mar 2012 22:35:47 +0000 (14:35 -0800)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 8 Mar 2012 22:34:58 +0000 (14:34 -0800)]
revup
tommy tomson [Thu, 8 Mar 2012 22:22:26 +0000 (23:22 +0100)]
add theme diabook-blue, fix css
tommy tomson [Thu, 8 Mar 2012 13:49:07 +0000 (14:49 +0100)]
add links to /profiles, add some icons to diabook/icons, fixes in css
friendica [Thu, 8 Mar 2012 05:25:14 +0000 (16:25 +1100)]
Update README
friendica [Thu, 8 Mar 2012 05:12:31 +0000 (21:12 -0800)]
reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())
friendica [Thu, 8 Mar 2012 02:23:55 +0000 (18:23 -0800)]
still getting parent relays on remote systems
friendica [Wed, 7 Mar 2012 23:55:20 +0000 (15:55 -0800)]
Merge branch 'pull'
friendica [Wed, 7 Mar 2012 23:54:37 +0000 (15:54 -0800)]
revup
Simon [Wed, 7 Mar 2012 17:36:28 +0000 (09:36 -0800)]
Merge pull request #105 from simonlnu/master
Simon L'nu [Wed, 7 Mar 2012 17:35:04 +0000 (12:35 -0500)]
fix jot.tpl buttons. fix up subsequent styling breakageSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Wed, 7 Mar 2012 17:32:28 +0000 (12:32 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Wed, 7 Mar 2012 15:08:23 +0000 (07:08 -0800)]
Merge pull request #104 from simonlnu/master
Simon L'nu [Wed, 7 Mar 2012 15:07:36 +0000 (10:07 -0500)]
push fix for funky menu action. the overflow-x might break again for some peopleSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Wed, 7 Mar 2012 15:05:32 +0000 (10:05 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Wed, 7 Mar 2012 07:44:18 +0000 (23:44 -0800)]
Merge pull request #103 from tomtom84/master
tommy tomson [Tue, 6 Mar 2012 23:47:43 +0000 (00:47 +0100)]
fix in navbar
Simon L'nu [Wed, 7 Mar 2012 02:33:56 +0000 (21:33 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Wed, 7 Mar 2012 01:52:00 +0000 (17:52 -0800)]
fix photos after permissions_sql change
friendica [Wed, 7 Mar 2012 01:22:13 +0000 (17:22 -0800)]
Merge branch 'pull'
friendica [Wed, 7 Mar 2012 01:21:14 +0000 (17:21 -0800)]
[privacy] rework latest fix
friendica [Wed, 7 Mar 2012 00:28:52 +0000 (16:28 -0800)]
remove stray debugging
Simon L'nu [Wed, 7 Mar 2012 00:06:02 +0000 (19:06 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Wed, 7 Mar 2012 00:05:35 +0000 (16:05 -0800)]
Merge pull request #102 from beardy-unixer/master
Simon L'nu [Tue, 6 Mar 2012 23:57:52 +0000 (18:57 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Thomas [Tue, 6 Mar 2012 23:56:37 +0000 (23:56 +0000)]
Merge remote-tracking branch 'upstream/master'
Thomas [Tue, 6 Mar 2012 23:54:31 +0000 (23:54 +0000)]
improved smiley transparency
tomtom84 [Tue, 6 Mar 2012 23:49:32 +0000 (15:49 -0800)]
Merge pull request #101 from tomtom84/master
tommy tomson [Tue, 6 Mar 2012 23:47:43 +0000 (00:47 +0100)]
fix in navbar
Simon L'nu [Tue, 6 Mar 2012 23:42:00 +0000 (18:42 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Tue, 6 Mar 2012 23:41:45 +0000 (15:41 -0800)]
Merge pull request #100 from simonlnu/master
Simon L'nu [Tue, 6 Mar 2012 23:38:44 +0000 (18:38 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Tue, 6 Mar 2012 23:29:18 +0000 (15:29 -0800)]
Merge branch 'pull'
friendica [Tue, 6 Mar 2012 23:28:27 +0000 (15:28 -0800)]
fix html reshares when editplain in use
Simon L'nu [Tue, 6 Mar 2012 23:26:22 +0000 (18:26 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Tue, 6 Mar 2012 23:24:15 +0000 (15:24 -0800)]
Merge pull request #94 from beardy-unixer/master
Simon [Tue, 6 Mar 2012 23:22:55 +0000 (15:22 -0800)]
Merge pull request #99 from tomtom84/master
friendica [Tue, 6 Mar 2012 23:15:59 +0000 (15:15 -0800)]
search should be ok, but a little extra security won't hurt
Simon L'nu [Tue, 6 Mar 2012 23:15:45 +0000 (18:15 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Tue, 6 Mar 2012 23:10:22 +0000 (15:10 -0800)]
Merge branch 'pull'
friendica [Tue, 6 Mar 2012 23:09:57 +0000 (15:09 -0800)]
string update
tommy tomson [Tue, 6 Mar 2012 23:07:27 +0000 (00:07 +0100)]
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Simon [Tue, 6 Mar 2012 23:04:50 +0000 (15:04 -0800)]
Merge pull request #98 from simonlnu/master
Simon L'nu [Tue, 6 Mar 2012 22:55:05 +0000 (17:55 -0500)]
dispy, dispy, oh what a little lispySigned-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Tue, 6 Mar 2012 22:53:14 +0000 (14:53 -0800)]
[PRIVACY] privacy issue bug #314
Simon L'nu [Tue, 6 Mar 2012 22:52:12 +0000 (17:52 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Tue, 6 Mar 2012 22:27:53 +0000 (14:27 -0800)]
bugs #312, #313
friendica [Tue, 6 Mar 2012 21:58:26 +0000 (13:58 -0800)]
Merge branch 'pull'
friendica [Tue, 6 Mar 2012 21:57:38 +0000 (13:57 -0800)]
revup
Simon [Tue, 6 Mar 2012 21:20:20 +0000 (13:20 -0800)]
Merge pull request #95 from simonlnu/master
Simon L'nu [Tue, 6 Mar 2012 21:18:26 +0000 (16:18 -0500)]
styling fixes in dispy. fix typos in settings.tplSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Thomas [Tue, 6 Mar 2012 20:50:38 +0000 (20:50 +0000)]
Fixed...merged with mainline THEN added beards.
Thomas [Tue, 6 Mar 2012 20:44:53 +0000 (20:44 +0000)]
added beard smileys
Simon L'nu [Tue, 6 Mar 2012 19:51:14 +0000 (14:51 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Thomas [Tue, 6 Mar 2012 19:15:40 +0000 (19:15 +0000)]
doc/Account-Basics.md
Thomas [Tue, 6 Mar 2012 19:15:24 +0000 (19:15 +0000)]
doc/Account-Basics.md
Thomas [Tue, 6 Mar 2012 19:11:24 +0000 (19:11 +0000)]
a
Thomas [Tue, 6 Mar 2012 19:07:15 +0000 (19:07 +0000)]
doc/Remove-Account.md
Thomas [Tue, 6 Mar 2012 19:04:42 +0000 (19:04 +0000)]
doc/Making-Friends.md
Thomas [Tue, 6 Mar 2012 18:55:45 +0000 (18:55 +0000)]
doc/Bugs-and-Issues.md
Thomas [Tue, 6 Mar 2012 18:48:39 +0000 (18:48 +0000)]
doc/Account-Basics.md
fabrixxm [Tue, 6 Mar 2012 13:09:03 +0000 (05:09 -0800)]
Merge pull request #93 from fabrixxm/master
friendica [Tue, 6 Mar 2012 12:28:45 +0000 (04:28 -0800)]
remove "smilie" expansion for Diaspora logo
friendica [Tue, 6 Mar 2012 10:17:55 +0000 (02:17 -0800)]
prevent duplicate likes
friendica [Tue, 6 Mar 2012 09:04:16 +0000 (01:04 -0800)]
Merge branch 'pull'
Fabio Comuni [Tue, 6 Mar 2012 08:50:18 +0000 (09:50 +0100)]
quattro: theme settings (a bit hackish)
Fabio Comuni [Tue, 6 Mar 2012 08:48:08 +0000 (09:48 +0100)]
Merge remote-tracking branch 'friendica/master'
tomtom84 [Tue, 6 Mar 2012 07:34:24 +0000 (23:34 -0800)]
Merge pull request #92 from tomtom84/master
tommy tomson [Tue, 6 Mar 2012 07:31:54 +0000 (08:31 +0100)]
add img
tommy tomson [Tue, 6 Mar 2012 07:28:21 +0000 (08:28 +0100)]
Merge remote-tracking branch 'origin/master'
tommy tomson [Tue, 6 Mar 2012 07:27:20 +0000 (08:27 +0100)]
fixes in diabook
friendica [Tue, 6 Mar 2012 07:20:42 +0000 (23:20 -0800)]
finalise spam storage model, begin driver changes.
Simon L'nu [Tue, 6 Mar 2012 04:36:22 +0000 (23:36 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Tue, 6 Mar 2012 02:52:15 +0000 (18:52 -0800)]
Merge branch 'pull'
friendica [Tue, 6 Mar 2012 02:51:21 +0000 (18:51 -0800)]
some admin page fixes and cleanup
Simon [Tue, 6 Mar 2012 02:21:15 +0000 (18:21 -0800)]
Merge pull request #91 from unary/darkzero
Michael Johnston [Tue, 6 Mar 2012 02:10:01 +0000 (21:10 -0500)]
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
friendica [Tue, 6 Mar 2012 00:43:44 +0000 (16:43 -0800)]
string update
friendica [Mon, 5 Mar 2012 23:59:28 +0000 (15:59 -0800)]
Merge branch 'pull'
friendica [Mon, 5 Mar 2012 23:58:26 +0000 (15:58 -0800)]
some testbubble stuff
Simon [Mon, 5 Mar 2012 23:19:02 +0000 (15:19 -0800)]
Merge pull request #90 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 23:18:04 +0000 (18:18 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 5 Mar 2012 23:16:51 +0000 (18:16 -0500)]
forgot a small change in .field_helpSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Mon, 5 Mar 2012 23:05:09 +0000 (15:05 -0800)]
Merge branch 'pull'
friendica [Mon, 5 Mar 2012 23:04:43 +0000 (15:04 -0800)]
can_write_wall documentation
Simon [Mon, 5 Mar 2012 22:57:51 +0000 (14:57 -0800)]
Merge pull request #89 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 22:57:04 +0000 (17:57 -0500)]
implement more of the changes requestedSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 5 Mar 2012 22:56:38 +0000 (17:56 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 5 Mar 2012 21:38:06 +0000 (13:38 -0800)]
Merge branch 'pull'
friendica [Mon, 5 Mar 2012 21:37:32 +0000 (13:37 -0800)]
revup
tommy tomson [Mon, 5 Mar 2012 21:31:03 +0000 (22:31 +0100)]
fixes
Simon [Mon, 5 Mar 2012 20:57:30 +0000 (12:57 -0800)]
Merge pull request #88 from simonlnu/master
Simon L'nu [Mon, 5 Mar 2012 20:55:17 +0000 (15:55 -0500)]
multiple fixes; the jot-header works as standalone, not sure what's up.Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 5 Mar 2012 18:17:40 +0000 (13:17 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Mon, 5 Mar 2012 18:17:26 +0000 (10:17 -0800)]
Merge pull request #87 from simonlnu/master
projects / friendica.git / log