]>
git.mxchange.org Git - friendica.git/log
Tobias Hößl [Sun, 11 Mar 2012 11:27:47 +0000 (11:27 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica
Simon [Sun, 11 Mar 2012 06:33:40 +0000 (22:33 -0800)]
Merge pull request #119 from simonlnu/master
Simon L'nu [Sun, 11 Mar 2012 06:32:11 +0000 (01:32 -0500)]
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 11 Mar 2012 06:24:59 +0000 (01:24 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sun, 11 Mar 2012 02:52:50 +0000 (18:52 -0800)]
bug #328
friendica [Sat, 10 Mar 2012 23:53:36 +0000 (15:53 -0800)]
default the text template var on conversations
friendica [Sat, 10 Mar 2012 23:50:51 +0000 (15:50 -0800)]
bug #327 - composed private message is lost if no recip specified.
friendica [Sat, 10 Mar 2012 22:45:23 +0000 (14:45 -0800)]
Merge branch 'pull'
friendica [Sat, 10 Mar 2012 22:44:43 +0000 (14:44 -0800)]
revup
tomtom84 [Sat, 10 Mar 2012 12:24:49 +0000 (04:24 -0800)]
Merge pull request #118 from tomtom84/master
tommy tomson [Sat, 10 Mar 2012 12:22:41 +0000 (13:22 +0100)]
fixed login-fields, fixed. notofication.png, changed locations
Tobias Diekershoff [Sat, 10 Mar 2012 09:36:20 +0000 (10:36 +0100)]
German translation
Simon L'nu [Sat, 10 Mar 2012 05:15:29 +0000 (00:15 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sat, 10 Mar 2012 03:50:45 +0000 (19:50 -0800)]
Merge branch 'pull'
friendica [Sat, 10 Mar 2012 03:50:31 +0000 (19:50 -0800)]
spec directory
friendica [Sat, 10 Mar 2012 03:42:52 +0000 (19:42 -0800)]
Merge pull request #117 from unary/issue299
Michael Johnston [Sat, 10 Mar 2012 02:29:39 +0000 (21:29 -0500)]
allow user to set number of items to show on network page
Simon L'nu [Sat, 10 Mar 2012 00:02:29 +0000 (19:02 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Fri, 9 Mar 2012 22:44:29 +0000 (14:44 -0800)]
Merge branch 'pull'
friendica [Fri, 9 Mar 2012 22:43:48 +0000 (14:43 -0800)]
revup
tomtom84 [Fri, 9 Mar 2012 17:17:01 +0000 (09:17 -0800)]
Merge pull request #116 from tomtom84/master
tommy tomson [Fri, 9 Mar 2012 17:15:27 +0000 (18:15 +0100)]
add js to hide nav-menus, when clicked outside
tomtom84 [Fri, 9 Mar 2012 12:24:59 +0000 (04:24 -0800)]
Merge pull request #115 from tomtom84/master
tommy tomson [Fri, 9 Mar 2012 12:23:38 +0000 (13:23 +0100)]
fixes in css
friendica [Fri, 9 Mar 2012 10:50:57 +0000 (02:50 -0800)]
recover contacts total count which got lost
Tobias Hößl [Fri, 9 Mar 2012 10:00:12 +0000 (10:00 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica
friendica [Fri, 9 Mar 2012 08:48:16 +0000 (00:48 -0800)]
Merge branch 'pull'
friendica [Fri, 9 Mar 2012 08:47:10 +0000 (00:47 -0800)]
bug #324 - tinymce used for mail even if editplain being used.
friendica [Fri, 9 Mar 2012 08:31:17 +0000 (00:31 -0800)]
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
Simon [Fri, 9 Mar 2012 05:28:35 +0000 (21:28 -0800)]
Merge pull request #114 from simonlnu/master
Simon L'nu [Fri, 9 Mar 2012 05:26:54 +0000 (00:26 -0500)]
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
friendica [Fri, 9 Mar 2012 05:14:41 +0000 (21:14 -0800)]
keep tony from talking to himself
Simon [Fri, 9 Mar 2012 05:03:16 +0000 (21:03 -0800)]
Merge pull request #113 from simonlnu/master
Simon L'nu [Fri, 9 Mar 2012 05:00:56 +0000 (00:00 -0500)]
i consider dispy pretty stable at this point, so i'm removing the experimental fileSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Fri, 9 Mar 2012 03:39:39 +0000 (19:39 -0800)]
Merge pull request #112 from tomtom84/master
tommy tomson [Fri, 9 Mar 2012 03:38:20 +0000 (04:38 +0100)]
removed info
tomtom84 [Fri, 9 Mar 2012 03:16:01 +0000 (19:16 -0800)]
Merge pull request #111 from tomtom84/master
tommy tomson [Fri, 9 Mar 2012 03:14:24 +0000 (04:14 +0100)]
add info
friendica [Fri, 9 Mar 2012 02:20:10 +0000 (18:20 -0800)]
Merge pull request #109 from beardy-unixer/
6ae5962b009cfd88925eae721e24bf895e8b78d5
More improved transparency smileys
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
Thomas [Fri, 9 Mar 2012 01:49:12 +0000 (01:49 +0000)]
More improved transparency for smilies
Simon L'nu [Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
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
Simon L'nu [Thu, 8 Mar 2012 20:30:47 +0000 (15:30 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Thu, 8 Mar 2012 18:39:03 +0000 (10:39 -0800)]
Merge pull request #108 from simonlnu/master
Simon L'nu [Thu, 8 Mar 2012 18:37:45 +0000 (13:37 -0500)]
make svg from notifications.svg to ease future editing. more dispy tweaksSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 8 Mar 2012 15:46:40 +0000 (10:46 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tomtom84 [Thu, 8 Mar 2012 13:52:14 +0000 (05:52 -0800)]
Merge pull request #107 from tomtom84/master
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())
Simon L'nu [Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
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
Thomas [Wed, 7 Mar 2012 00:12:24 +0000 (00:12 +0000)]
removed dolphin file (wtf?)
Thomas [Wed, 7 Mar 2012 00:08:50 +0000 (00:08 +0000)]
.
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
projects / friendica.git / log