]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoput community back on the lower tab. It belongs with message streams
friendica [Fri, 27 Apr 2012 09:30:49 +0000 (02:30 -0700)]
put community back on the lower tab. It belongs with message streams

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 27 Apr 2012 08:10:33 +0000 (01:10 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agofix view contacts
friendica [Fri, 27 Apr 2012 08:10:09 +0000 (01:10 -0700)]
fix view contacts

12 years agoMerge pull request #270 from simonlnu/master
Simon [Fri, 27 Apr 2012 06:36:11 +0000 (23:36 -0700)]
Merge pull request #270 from simonlnu/master

fix 2 issues

12 years agofix 2 issues. contacts img in finder; wall filer title
Simon L'nu [Fri, 27 Apr 2012 06:33:58 +0000 (02:33 -0400)]
fix 2 issues. contacts img in finder; wall filer title

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 27 Apr 2012 06:28:44 +0000 (02:28 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  reset qcomment selector after insert.
  put fakelink back in birthday notice
  birthday contact link goes to event page instead of remote profile
  make comment edit icons look more like base theme
  rev update

* master:

12 years agoreset qcomment selector after insert.
friendica [Fri, 27 Apr 2012 04:53:40 +0000 (21:53 -0700)]
reset qcomment selector after insert.

12 years agoput fakelink back in birthday notice
friendica [Fri, 27 Apr 2012 03:08:57 +0000 (20:08 -0700)]
put fakelink back in birthday notice

12 years agobirthday contact link goes to event page instead of remote profile
friendica [Fri, 27 Apr 2012 03:02:42 +0000 (20:02 -0700)]
birthday contact link goes to event page instead of remote profile

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 27 Apr 2012 02:56:25 +0000 (19:56 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agomake comment edit icons look more like base theme
friendica [Fri, 27 Apr 2012 02:55:20 +0000 (19:55 -0700)]
make comment edit icons look more like base theme

12 years agoMerge pull request #269 from simonlnu/master
Simon [Fri, 27 Apr 2012 00:15:14 +0000 (17:15 -0700)]
Merge pull request #269 from simonlnu/master

fix s/color/colour/g issue

12 years agofix s/color/colour/g issue
Simon L'nu [Fri, 27 Apr 2012 00:13:11 +0000 (20:13 -0400)]
fix s/color/colour/g issue

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 27 Apr 2012 00:07:54 +0000 (20:07 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 26 Apr 2012 22:35:25 +0000 (15:35 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 26 Apr 2012 22:35:00 +0000 (15:35 -0700)]
rev update

12 years agoMerge pull request #267 from tomtom84/master
friendica [Thu, 26 Apr 2012 22:33:34 +0000 (15:33 -0700)]
Merge pull request #267 from tomtom84/master

add link "remove account" to /mod/settings.php

12 years agoMerge pull request #268 from simonlnu/master
Simon [Thu, 26 Apr 2012 20:23:23 +0000 (13:23 -0700)]
Merge pull request #268 from simonlnu/master

announced dipsy change. re-tie your boots, we're in for a wee ride ;)

12 years agoannounced dipsy change. re-tie your boots, we're in for a wee ride ;)
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>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 26 Apr 2012 20:10:17 +0000 (16:10 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update, fix autoname test "random" failure
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  added BBCODE thing in comments
  add cleanzero theme

* master:

12 years agodiabook-themes: small-fix
tommy tomson [Thu, 26 Apr 2012 19:07:46 +0000 (21:07 +0200)]
diabook-themes: small-fix

12 years agoadd link "remove account" to /mod/settings.php
tommy tomson [Thu, 26 Apr 2012 15:21:27 +0000 (17:21 +0200)]
add link "remove account" to /mod/settings.php

12 years agoMerge pull request #265 from cvogeley/master
friendica [Thu, 26 Apr 2012 08:35:50 +0000 (01:35 -0700)]
Merge pull request #265 from cvogeley/master

cleanzero theme added

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 26 Apr 2012 08:34:21 +0000 (01:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update, fix autoname test "random" failure
friendica [Thu, 26 Apr 2012 08:33:41 +0000 (01:33 -0700)]
rev update, fix autoname test "random" failure

12 years agoMerge pull request #266 from simonlnu/master
Simon [Thu, 26 Apr 2012 06:45:32 +0000 (23:45 -0700)]
Merge pull request #266 from simonlnu/master

convert stylesheets to less, and compress output css

12 years agoconvert stylesheets to less, and compress output css
Simon L'nu [Thu, 26 Apr 2012 06:38:18 +0000 (02:38 -0400)]
convert stylesheets to less, and compress output css

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 26 Apr 2012 04:20:00 +0000 (00:20 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark more CSS fixes.

* master:

12 years agoDiabook-dark more CSS fixes.
Thomas Willingham [Wed, 25 Apr 2012 22:40:40 +0000 (23:40 +0100)]
Diabook-dark more CSS fixes.

Slowly getting there.

12 years agoduepuntozero: move community and manage link to upper right area + css fixes to avoid...
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

12 years agoduepuntozero: move community and manage link to upper right area + css fixes to avoid...
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

12 years agoadded BBCODE thing in comments
Christian Vogeley [Wed, 25 Apr 2012 19:08:31 +0000 (21:08 +0200)]
added BBCODE thing in comments

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 25 Apr 2012 17:47:20 +0000 (13:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #307, explaining decentralised private photos is impossible.
  this turns out to be harder than I thought
  cleanup - make bb-buttons vanish when comment closed
  Esperanto at 100% again

* master:

12 years agoadd cleanzero theme
Christian Vogeley [Wed, 25 Apr 2012 17:09:46 +0000 (19:09 +0200)]
add cleanzero theme

12 years agobug #307, explaining decentralised private photos is impossible.
friendica [Wed, 25 Apr 2012 12:41:32 +0000 (05:41 -0700)]
bug #307, explaining decentralised private photos is impossible.

12 years agothis turns out to be harder than I thought
friendica [Wed, 25 Apr 2012 08:36:22 +0000 (01:36 -0700)]
this turns out to be harder than I thought

12 years agoMerge pull request #264 from mschmitt/master
friendica [Wed, 25 Apr 2012 07:25:05 +0000 (00:25 -0700)]
Merge pull request #264 from mschmitt/master

Esperanto at 100% again

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 25 Apr 2012 07:14:20 +0000 (00:14 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agocleanup - make bb-buttons vanish when comment closed
friendica [Wed, 25 Apr 2012 07:13:36 +0000 (00:13 -0700)]
cleanup - make bb-buttons vanish when comment closed

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 25 Apr 2012 07:05:47 +0000 (03:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: fix css to login.tpl
  restore qcomment selector
  rev update
  zero-themes: add bbcode-toolbar to commentbox
  diabook-themes: small fix
  Diabook-dark css fix
  Diabook-dark, couple of new icons, and another css fix.
  fix tags test with new url
  quattro: small week calendar view for event/birthday reminders
  remove html from get_birthdays() and get_events()
  events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])

* master:

12 years agoEsperanto at 100% again
Martin Schmitt [Wed, 25 Apr 2012 06:50:02 +0000 (08:50 +0200)]
Esperanto at 100% again

12 years agoMerge pull request #263 from tomtom84/master
tomtom84 [Wed, 25 Apr 2012 01:42:32 +0000 (18:42 -0700)]
Merge pull request #263 from tomtom84/master

diabook-themes: fix css to login.tpl

12 years agodiabook-themes: fix css to login.tpl
tommy tomson [Wed, 25 Apr 2012 01:38:21 +0000 (03:38 +0200)]
diabook-themes: fix css to login.tpl

12 years agorestore qcomment selector
friendica [Wed, 25 Apr 2012 01:23:48 +0000 (18:23 -0700)]
restore qcomment selector

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 25 Apr 2012 00:55:56 +0000 (17:55 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Wed, 25 Apr 2012 00:55:35 +0000 (17:55 -0700)]
rev update

12 years agoMerge pull request #262 from tomtom84/master
friendica [Wed, 25 Apr 2012 00:54:41 +0000 (17:54 -0700)]
Merge pull request #262 from tomtom84/master

zero-themes: add bbcode-toolbar to commentbox

12 years agozero-themes: add bbcode-toolbar to commentbox
tommy tomson [Wed, 25 Apr 2012 00:43:50 +0000 (02:43 +0200)]
zero-themes: add bbcode-toolbar to commentbox

12 years agodiabook-themes: small fix
tommy tomson [Tue, 24 Apr 2012 22:19:57 +0000 (00:19 +0200)]
diabook-themes: small fix

12 years agoMerge pull request #261 from fabrixxm/eventspage
friendica [Tue, 24 Apr 2012 21:50:22 +0000 (14:50 -0700)]
Merge pull request #261 from fabrixxm/eventspage

Some tweak on events page and events/bitrhdays reminder

12 years agoDiabook-dark css fix
Thomas Willingham [Tue, 24 Apr 2012 19:07:08 +0000 (20:07 +0100)]
Diabook-dark css fix

12 years agoDiabook-dark, couple of new icons, and another 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.

12 years agofix tags test with new url
friendica [Tue, 24 Apr 2012 08:02:22 +0000 (01:02 -0700)]
fix tags test with new url

12 years agoquattro: small week calendar view for event/birthday reminders
Fabio Comuni [Tue, 24 Apr 2012 07:50:44 +0000 (09:50 +0200)]
quattro: small week calendar view for event/birthday reminders

12 years agoremove html from get_birthdays() and get_events()
Fabio Comuni [Tue, 24 Apr 2012 07:50:10 +0000 (09:50 +0200)]
remove html from get_birthdays() and get_events()

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 24 Apr 2012 07:33:46 +0000 (03:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  separate tag search from body search
  Esperanto at 100% again
  Improvements to diabook-dark
  move unfriend to standalone function for use in account removal
  more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips

* master:

12 years agoevents page: set calendar start date from url (events/[year]/[month]/) and show event...
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])

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 24 Apr 2012 05:42:48 +0000 (22:42 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoseparate tag search from body search
friendica [Tue, 24 Apr 2012 05:41:32 +0000 (22:41 -0700)]
separate tag search from body search

12 years agoMerge pull request #260 from mschmitt/master
friendica [Tue, 24 Apr 2012 05:22:05 +0000 (22:22 -0700)]
Merge pull request #260 from mschmitt/master

Esperanto at 100% again

12 years agoEsperanto at 100% again
Martin Schmitt [Tue, 24 Apr 2012 04:52:36 +0000 (06:52 +0200)]
Esperanto at 100% again

12 years agoMerge pull request #259 from beardy-unixer/master
friendica [Tue, 24 Apr 2012 04:10:53 +0000 (21:10 -0700)]
Merge pull request #259 from beardy-unixer/master

Diabook-dark

12 years agoImprovements to diabook-dark
Thomas Willingham [Tue, 24 Apr 2012 03:55:39 +0000 (04:55 +0100)]
Improvements to diabook-dark

Still a long way to go, but some icons and a few CSS fixes

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Tue, 24 Apr 2012 03:54:14 +0000 (04:54 +0100)]
Merge remote-tracking branch 'upstream/master'

Merge upstream

12 years agomove unfriend to standalone function for use in account removal
friendica [Tue, 24 Apr 2012 02:42:57 +0000 (19:42 -0700)]
move unfriend to standalone function for use in account removal

12 years agomore work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomp...
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

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Tue, 24 Apr 2012 01:18:51 +0000 (02:18 +0100)]
Merge remote-tracking branch 'upstream/master'

Merge upstream

12 years agoMerge branch 'master', remote-tracking branch 'remotes/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'

* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:

12 years agoDE strings, correction of a typo
Tobias Diekershoff [Mon, 23 Apr 2012 18:55:48 +0000 (20:55 +0200)]
DE strings, correction of a typo

12 years agodiabok-themes: fixed bug in green-wide and dark-wide
tommy tomson [Mon, 23 Apr 2012 16:42:37 +0000 (18:42 +0200)]
diabok-themes: fixed bug in green-wide and dark-wide

12 years agodiabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in...
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

12 years agodiabook-themes: bugfix in admin-section
tommy tomson [Mon, 23 Apr 2012 13:47:18 +0000 (15:47 +0200)]
diabook-themes: bugfix in admin-section

12 years agoallow bbcode representation of html symbols such as &copy; by wrapping in bb brackets
friendica [Mon, 23 Apr 2012 12:42:46 +0000 (05:42 -0700)]
allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets

12 years agoprotect jappixmini/proxy from typo check, more work on email2 connector
friendica [Mon, 23 Apr 2012 12:16:57 +0000 (05:16 -0700)]
protect jappixmini/proxy from typo check, more work on email2 connector

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 23 Apr 2012 02:22:52 +0000 (22:22 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:

12 years agobug #388 - notify_comment received after post deleted
friendica [Mon, 23 Apr 2012 02:19:02 +0000 (19:19 -0700)]
bug #388 - notify_comment received after post deleted

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 23:25:02 +0000 (16:25 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agodon't allow non-existent themes as choices
friendica [Sun, 22 Apr 2012 23:24:29 +0000 (16:24 -0700)]
don't allow non-existent themes as choices

12 years agoMerge pull request #258 from unary/api
friendica [Sun, 22 Apr 2012 22:43:24 +0000 (15:43 -0700)]
Merge pull request #258 from unary/api

api: add support for StatusNet-style media param to API

12 years agoMerge pull request #257 from CatoTH/master
friendica [Sun, 22 Apr 2012 22:41:47 +0000 (15:41 -0700)]
Merge pull request #257 from CatoTH/master

Add a hook in mod/ping.php

12 years agodiabook-themes: bugfix
tommy tomson [Sun, 22 Apr 2012 21:58:34 +0000 (23:58 +0200)]
diabook-themes: bugfix

12 years agodiabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
tommy tomson [Sun, 22 Apr 2012 20:31:44 +0000 (22:31 +0200)]
diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer

12 years agoapi: add support for StatusNet-style media param to API
Michael Johnston [Sun, 22 Apr 2012 17:37:25 +0000 (13:37 -0400)]
api: add support for StatusNet-style media param to API

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 22 Apr 2012 16:27:59 +0000 (12:27 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings update
  diabook-themes: comment-bbcode-bugfix

* master:

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Tobias Hößl [Sun, 22 Apr 2012 13:31:07 +0000 (13:31 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoAdd a hook
Tobias Hößl [Sun, 22 Apr 2012 13:28:54 +0000 (13:28 +0000)]
Add a hook

12 years agoDE strings update
Tobias Diekershoff [Sun, 22 Apr 2012 11:13:27 +0000 (13:13 +0200)]
DE strings update

12 years agodiabook-themes: comment-bbcode-bugfix
tommy tomson [Sun, 22 Apr 2012 10:59:00 +0000 (12:59 +0200)]
diabook-themes: comment-bbcode-bugfix

12 years agoMerge pull request #256 from simonlnu/master
Simon [Sun, 22 Apr 2012 05:23:13 +0000 (22:23 -0700)]
Merge pull request #256 from simonlnu/master

fix tinymce theming

12 years agofix tinymce theming
Simon L'nu [Sun, 22 Apr 2012 05:22:29 +0000 (01:22 -0400)]
fix tinymce theming

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 22 Apr 2012 02:29:08 +0000 (19:29 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sun, 22 Apr 2012 02:28:45 +0000 (19:28 -0700)]
rev update

12 years agodiabook-themes: deleted obsolete diabook-folder & minor bug-fixes
tommy tomson [Sun, 22 Apr 2012 01:15:06 +0000 (03:15 +0200)]
diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 21 Apr 2012 08:34:56 +0000 (04:34 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master:

12 years agorev update
friendica [Sat, 21 Apr 2012 08:18:46 +0000 (01:18 -0700)]
rev update

12 years agoMerge pull request #255 from simonlnu/master
Simon [Sat, 21 Apr 2012 00:19:49 +0000 (17:19 -0700)]
Merge pull request #255 from simonlnu/master

fix checkboxes and radio buttons for some browsers

12 years agofix checkbox/radio buttons for some browsers
Simon L'nu [Sat, 21 Apr 2012 00:18:47 +0000 (20:18 -0400)]
fix checkbox/radio buttons for some browsers

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 21 Apr 2012 00:16:06 +0000 (20:16 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: add diabook-dark
  diabook-themes: add diabook-green and some minor css/bug-fixes
  rev update
  escape email template var names. fix bug n385.

* master:

12 years agodiabook-themes: add diabook-dark
tommy tomson [Fri, 20 Apr 2012 23:06:17 +0000 (01:06 +0200)]
diabook-themes: add diabook-dark