]>
git.mxchange.org Git - friendica.git/log
Alexander Kampmann [Thu, 22 Mar 2012 11:45:11 +0000 (12:45 +0100)]
removed problem from previous commit
Alexander Kampmann [Thu, 22 Mar 2012 11:43:03 +0000 (12:43 +0100)]
tests for the template engine
Alexander Kampmann [Thu, 15 Mar 2012 11:55:49 +0000 (12:55 +0100)]
integrated profiler
Alexander Kampmann [Thu, 15 Mar 2012 10:45:06 +0000 (11:45 +0100)]
added simple build-in profiling
Alexander Kampmann [Thu, 15 Mar 2012 09:51:22 +0000 (10:51 +0100)]
another test for xmlify
Alexander Kampmann [Wed, 14 Mar 2012 11:57:35 +0000 (12:57 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann [Wed, 14 Mar 2012 11:54:49 +0000 (12:54 +0100)]
splitted tests into several files
tommy tomson [Wed, 14 Mar 2012 11:50:11 +0000 (12:50 +0100)]
add links to home, profile, photos, events, notes to aside in network-stream
Alexander Kampmann [Wed, 14 Mar 2012 11:31:25 +0000 (12:31 +0100)]
removed done TODO
Alexander Kampmann [Wed, 14 Mar 2012 11:30:52 +0000 (12:30 +0100)]
get_tags tests corrected. They test for the right things now.
tommy tomson [Mon, 12 Mar 2012 23:38:38 +0000 (00:38 +0100)]
fix css
tomtom84 [Mon, 12 Mar 2012 23:06:15 +0000 (16:06 -0700)]
Merge pull request #127 from tomtom84/master
tommy tomson [Mon, 12 Mar 2012 23:04:19 +0000 (00:04 +0100)]
use fancybox instead of lightbox
tomtom84 [Mon, 12 Mar 2012 22:33:29 +0000 (15:33 -0700)]
Merge pull request #126 from tomtom84/master
tommy tomson [Mon, 12 Mar 2012 22:31:54 +0000 (23:31 +0100)]
fixes
tomtom84 [Mon, 12 Mar 2012 20:11:19 +0000 (13:11 -0700)]
Merge pull request #125 from tomtom84/master
tommy tomson [Mon, 12 Mar 2012 20:09:16 +0000 (21:09 +0100)]
add lightbox, fixex in css
Alexander Kampmann [Mon, 12 Mar 2012 12:59:00 +0000 (13:59 +0100)]
get tags test improved
friendica [Mon, 12 Mar 2012 07:57:06 +0000 (00:57 -0700)]
Merge branch 'pull'
friendica [Mon, 12 Mar 2012 04:32:11 +0000 (21:32 -0700)]
more save to file backend
friendica [Mon, 12 Mar 2012 03:19:56 +0000 (20:19 -0700)]
backend for "save to file" feature
Simon L'nu [Mon, 12 Mar 2012 01:34:51 +0000 (21:34 -0400)]
fix dispy-dark photo album stuffSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 12 Mar 2012 01:33:06 +0000 (21:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Mon, 12 Mar 2012 00:37:29 +0000 (17:37 -0700)]
Merge pull request #124 from simonlnu/master
Simon L'nu [Mon, 12 Mar 2012 00:36:16 +0000 (20:36 -0400)]
fix dispys' css and layoutSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Mon, 12 Mar 2012 00:33:10 +0000 (20:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 12 Mar 2012 00:09:07 +0000 (17:09 -0700)]
Merge branch 'pull'
friendica [Sun, 11 Mar 2012 22:50:23 +0000 (15:50 -0700)]
community meta tag renamed from "ika"
Simon L'nu [Sun, 11 Mar 2012 21:05:08 +0000 (17:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 11 Mar 2012 14:29:45 +0000 (07:29 -0700)]
Merge pull request #123 from simonlnu/master
Simon L'nu [Sun, 11 Mar 2012 14:29:12 +0000 (10:29 -0400)]
screwed up on the font-size for screen last pushSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 11 Mar 2012 14:25:39 +0000 (10:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon [Sun, 11 Mar 2012 14:25:27 +0000 (07:25 -0700)]
Merge pull request #122 from simonlnu/master
Simon L'nu [Sun, 11 Mar 2012 14:24:49 +0000 (10:24 -0400)]
add some '@media handheld' types for dispysSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon [Sun, 11 Mar 2012 14:15:35 +0000 (07:15 -0700)]
Merge pull request #121 from simonlnu/master
Simon L'nu [Sun, 11 Mar 2012 14:14:31 +0000 (10:14 -0400)]
fix more stuffSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon [Sun, 11 Mar 2012 13:13:10 +0000 (06:13 -0700)]
Merge pull request #120 from simonlnu/master
Simon L'nu [Sun, 11 Mar 2012 13:12:31 +0000 (09:12 -0400)]
fix some stuff right awaySigned-off-by: Simon L'nu <simon.lnu@gmail.com>
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
Alexander Kampmann [Fri, 9 Mar 2012 11:57:11 +0000 (12:57 +0100)]
splitted test cases.
Alexander Kampmann [Fri, 9 Mar 2012 11:18:37 +0000 (12:18 +0100)]
changed a test string
Alexander Kampmann [Fri, 9 Mar 2012 11:17:19 +0000 (12:17 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann [Fri, 9 Mar 2012 11:16:58 +0000 (12:16 +0100)]
added some tests
friendica [Fri, 9 Mar 2012 10:50:57 +0000 (02:50 -0800)]
recover contacts total count which got lost
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>
Alexander Kampmann [Thu, 8 Mar 2012 16:46:40 +0000 (17:46 +0100)]
added library and include to .htaccess
Alexander Kampmann [Thu, 8 Mar 2012 16:44:57 +0000 (17:44 +0100)]
excludes reports from git
Alexander Kampmann [Thu, 8 Mar 2012 16:43:12 +0000 (17:43 +0100)]
better tests
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
projects / friendica.git / log