]>
git.mxchange.org Git - friendica.git/log
Simon L'nu [Fri, 27 Apr 2012 08:15:27 +0000 (04:15 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Fri, 27 Apr 2012 08:10:33 +0000 (01:10 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 27 Apr 2012 08:10:09 +0000 (01:10 -0700)]
fix view contacts
Simon [Fri, 27 Apr 2012 06:36:11 +0000 (23:36 -0700)]
Merge pull request #270 from simonlnu/master
Simon L'nu [Fri, 27 Apr 2012 06:33:58 +0000 (02:33 -0400)]
fix 2 issues. contacts img in finder; wall filer titleSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 27 Apr 2012 06:28:44 +0000 (02:28 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Fri, 27 Apr 2012 04:53:40 +0000 (21:53 -0700)]
reset qcomment selector after insert.
friendica [Fri, 27 Apr 2012 03:08:57 +0000 (20:08 -0700)]
put fakelink back in birthday notice
friendica [Fri, 27 Apr 2012 03:02:42 +0000 (20:02 -0700)]
birthday contact link goes to event page instead of remote profile
friendica [Fri, 27 Apr 2012 02:56:25 +0000 (19:56 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Fri, 27 Apr 2012 02:55:20 +0000 (19:55 -0700)]
make comment edit icons look more like base theme
Simon [Fri, 27 Apr 2012 00:15:14 +0000 (17:15 -0700)]
Merge pull request #269 from simonlnu/master
Simon L'nu [Fri, 27 Apr 2012 00:13:11 +0000 (20:13 -0400)]
fix s/color/colour/g issueSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Fri, 27 Apr 2012 00:07:54 +0000 (20:07 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Thu, 26 Apr 2012 22:35:25 +0000 (15:35 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 26 Apr 2012 22:35:00 +0000 (15:35 -0700)]
rev update
friendica [Thu, 26 Apr 2012 22:33:34 +0000 (15:33 -0700)]
Merge pull request #267 from tomtom84/master
Simon [Thu, 26 Apr 2012 20:23:23 +0000 (13:23 -0700)]
Merge pull request #268 from simonlnu/master
Simon L'nu [Thu, 26 Apr 2012 20:14:42 +0000 (16:14 -0400)]
announced dipsy change. re-tie your boots, we're in for a wee ride ;)Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 26 Apr 2012 20:10:17 +0000 (16:10 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Thu, 26 Apr 2012 19:07:46 +0000 (21:07 +0200)]
diabook-themes: small-fix
tommy tomson [Thu, 26 Apr 2012 15:21:27 +0000 (17:21 +0200)]
add link "remove account" to /mod/settings.php
friendica [Thu, 26 Apr 2012 08:35:50 +0000 (01:35 -0700)]
Merge pull request #265 from cvogeley/master
friendica [Thu, 26 Apr 2012 08:34:21 +0000 (01:34 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Thu, 26 Apr 2012 08:33:41 +0000 (01:33 -0700)]
rev update, fix autoname test "random" failure
Simon [Thu, 26 Apr 2012 06:45:32 +0000 (23:45 -0700)]
Merge pull request #266 from simonlnu/master
Simon L'nu [Thu, 26 Apr 2012 06:38:18 +0000 (02:38 -0400)]
convert stylesheets to less, and compress output cssSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Thu, 26 Apr 2012 04:20:00 +0000 (00:20 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Thomas Willingham [Wed, 25 Apr 2012 22:40:40 +0000 (23:40 +0100)]
Diabook-dark more CSS fixes.
Christian Vogeley [Wed, 25 Apr 2012 19:30:04 +0000 (21:30 +0200)]
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
Christian Vogeley [Wed, 25 Apr 2012 19:28:13 +0000 (21:28 +0200)]
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
Christian Vogeley [Wed, 25 Apr 2012 19:08:31 +0000 (21:08 +0200)]
added BBCODE thing in comments
Simon L'nu [Wed, 25 Apr 2012 17:47:20 +0000 (13:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Christian Vogeley [Wed, 25 Apr 2012 17:09:46 +0000 (19:09 +0200)]
add cleanzero theme
friendica [Wed, 25 Apr 2012 12:41:32 +0000 (05:41 -0700)]
bug #307, explaining decentralised private photos is impossible.
friendica [Wed, 25 Apr 2012 08:36:22 +0000 (01:36 -0700)]
this turns out to be harder than I thought
friendica [Wed, 25 Apr 2012 07:25:05 +0000 (00:25 -0700)]
Merge pull request #264 from mschmitt/master
friendica [Wed, 25 Apr 2012 07:14:20 +0000 (00:14 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 25 Apr 2012 07:13:36 +0000 (00:13 -0700)]
cleanup - make bb-buttons vanish when comment closed
Simon L'nu [Wed, 25 Apr 2012 07:05:47 +0000 (03:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Martin Schmitt [Wed, 25 Apr 2012 06:50:02 +0000 (08:50 +0200)]
Esperanto at 100% again
tomtom84 [Wed, 25 Apr 2012 01:42:32 +0000 (18:42 -0700)]
Merge pull request #263 from tomtom84/master
tommy tomson [Wed, 25 Apr 2012 01:38:21 +0000 (03:38 +0200)]
diabook-themes: fix css to login.tpl
friendica [Wed, 25 Apr 2012 01:23:48 +0000 (18:23 -0700)]
restore qcomment selector
friendica [Wed, 25 Apr 2012 00:55:56 +0000 (17:55 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Wed, 25 Apr 2012 00:55:35 +0000 (17:55 -0700)]
rev update
friendica [Wed, 25 Apr 2012 00:54:41 +0000 (17:54 -0700)]
Merge pull request #262 from tomtom84/master
tommy tomson [Wed, 25 Apr 2012 00:43:50 +0000 (02:43 +0200)]
zero-themes: add bbcode-toolbar to commentbox
tommy tomson [Tue, 24 Apr 2012 22:19:57 +0000 (00:19 +0200)]
diabook-themes: small fix
friendica [Tue, 24 Apr 2012 21:50:22 +0000 (14:50 -0700)]
Merge pull request #261 from fabrixxm/eventspage
Thomas Willingham [Tue, 24 Apr 2012 19:07:08 +0000 (20:07 +0100)]
Diabook-dark css fix
Thomas Willingham [Tue, 24 Apr 2012 19:00:49 +0000 (20:00 +0100)]
Diabook-dark, couple of new icons, and another css fix.
friendica [Tue, 24 Apr 2012 08:02:22 +0000 (01:02 -0700)]
fix tags test with new url
Fabio Comuni [Tue, 24 Apr 2012 07:50:44 +0000 (09:50 +0200)]
quattro: small week calendar view for event/birthday reminders
Fabio Comuni [Tue, 24 Apr 2012 07:50:10 +0000 (09:50 +0200)]
remove html from get_birthdays() and get_events()
Simon L'nu [Tue, 24 Apr 2012 07:33:46 +0000 (03:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Fabio Comuni [Tue, 24 Apr 2012 06:12:30 +0000 (08:12 +0200)]
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
friendica [Tue, 24 Apr 2012 05:42:48 +0000 (22:42 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Tue, 24 Apr 2012 05:41:32 +0000 (22:41 -0700)]
separate tag search from body search
friendica [Tue, 24 Apr 2012 05:22:05 +0000 (22:22 -0700)]
Merge pull request #260 from mschmitt/master
Martin Schmitt [Tue, 24 Apr 2012 04:52:36 +0000 (06:52 +0200)]
Esperanto at 100% again
friendica [Tue, 24 Apr 2012 04:10:53 +0000 (21:10 -0700)]
Merge pull request #259 from beardy-unixer/master
Thomas Willingham [Tue, 24 Apr 2012 03:55:39 +0000 (04:55 +0100)]
Improvements to diabook-dark
Thomas Willingham [Tue, 24 Apr 2012 03:54:14 +0000 (04:54 +0100)]
Merge remote-tracking branch 'upstream/master'
friendica [Tue, 24 Apr 2012 02:42:57 +0000 (19:42 -0700)]
move unfriend to standalone function for use in account removal
friendica [Tue, 24 Apr 2012 01:28:33 +0000 (18:28 -0700)]
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
Thomas Willingham [Tue, 24 Apr 2012 01:18:51 +0000 (02:18 +0100)]
Merge remote-tracking branch 'upstream/master'
Simon L'nu [Mon, 23 Apr 2012 22:25:14 +0000 (18:25 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Diekershoff [Mon, 23 Apr 2012 18:55:48 +0000 (20:55 +0200)]
DE strings, correction of a typo
tommy tomson [Mon, 23 Apr 2012 16:42:37 +0000 (18:42 +0200)]
diabok-themes: fixed bug in green-wide and dark-wide
tommy tomson [Mon, 23 Apr 2012 15:22:22 +0000 (17:22 +0200)]
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
tommy tomson [Mon, 23 Apr 2012 13:47:18 +0000 (15:47 +0200)]
diabook-themes: bugfix in admin-section
friendica [Mon, 23 Apr 2012 12:42:46 +0000 (05:42 -0700)]
allow bbcode representation of html symbols such as © by wrapping in bb brackets
friendica [Mon, 23 Apr 2012 12:16:57 +0000 (05:16 -0700)]
protect jappixmini/proxy from typo check, more work on email2 connector
Simon L'nu [Mon, 23 Apr 2012 02:22:52 +0000 (22:22 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Mon, 23 Apr 2012 02:19:02 +0000 (19:19 -0700)]
bug #388 - notify_comment received after post deleted
friendica [Sun, 22 Apr 2012 23:25:02 +0000 (16:25 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 23:24:29 +0000 (16:24 -0700)]
don't allow non-existent themes as choices
friendica [Sun, 22 Apr 2012 22:43:24 +0000 (15:43 -0700)]
Merge pull request #258 from unary/api
friendica [Sun, 22 Apr 2012 22:41:47 +0000 (15:41 -0700)]
Merge pull request #257 from CatoTH/master
tommy tomson [Sun, 22 Apr 2012 21:58:34 +0000 (23:58 +0200)]
diabook-themes: bugfix
tommy tomson [Sun, 22 Apr 2012 20:31:44 +0000 (22:31 +0200)]
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
Michael Johnston [Sun, 22 Apr 2012 17:37:25 +0000 (13:37 -0400)]
api: add support for StatusNet-style media param to API
Simon L'nu [Sun, 22 Apr 2012 16:27:59 +0000 (12:27 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Tobias Hößl [Sun, 22 Apr 2012 13:31:07 +0000 (13:31 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Sun, 22 Apr 2012 13:28:54 +0000 (13:28 +0000)]
Add a hook
Tobias Diekershoff [Sun, 22 Apr 2012 11:13:27 +0000 (13:13 +0200)]
DE strings update
tommy tomson [Sun, 22 Apr 2012 10:59:00 +0000 (12:59 +0200)]
diabook-themes: comment-bbcode-bugfix
Simon [Sun, 22 Apr 2012 05:23:13 +0000 (22:23 -0700)]
Merge pull request #256 from simonlnu/master
Simon L'nu [Sun, 22 Apr 2012 05:22:29 +0000 (01:22 -0400)]
fix tinymce themingSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sun, 22 Apr 2012 02:29:08 +0000 (19:29 -0700)]
Merge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 02:28:45 +0000 (19:28 -0700)]
rev update
tommy tomson [Sun, 22 Apr 2012 01:15:06 +0000 (03:15 +0200)]
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes
Simon L'nu [Sat, 21 Apr 2012 08:34:56 +0000 (04:34 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
friendica [Sat, 21 Apr 2012 08:18:46 +0000 (01:18 -0700)]
rev update
Simon [Sat, 21 Apr 2012 00:19:49 +0000 (17:19 -0700)]
Merge pull request #255 from simonlnu/master
Simon L'nu [Sat, 21 Apr 2012 00:18:47 +0000 (20:18 -0400)]
fix checkbox/radio buttons for some browsersSigned-off-by: Simon L'nu <simon.lnu@gmail.com>
Simon L'nu [Sat, 21 Apr 2012 00:16:06 +0000 (20:16 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
tommy tomson [Fri, 20 Apr 2012 23:06:17 +0000 (01:06 +0200)]
diabook-themes: add diabook-dark
projects / friendica.git / log