git.mxchange.org Git - quix0rs-gnu-social.git/log

Merge branch 'master' of gitorious.org:social/mainline into nightly

Conflicts:
INSTALL

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/quix0rs-gnu-social into nightly

Conflicts:
actions/showstream.php
classes/Notice.php
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'rewrites-nightly/type-hints-asserts' into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added checked type-hint for StartNoticeDistribute event.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Better readable.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Filter out img, video and audio tags in notice HTML

Because we don't want to auto-fetch items from a remote server. Such
items should be delivered as attachment metadata and portrayed in the
way the local instance chooses.

Choices for portrayal are either simply nullifying this and embedding
the data, linking the file remotely requiring a manual click or maybe
use remote oEmbed data etc. to download files locally so no remote
requests have to be made.

Marcus Moeller fixed some layout bugs I introduced

imitate ->boolean with $def=false

php5-intl is required

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

No need to do pkeyGet if not repeated (thanks hannes)

Kind of reverts commit d9ed2a0

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/showstream.php
classes/Notice.php
plugins/OStatus/classes/Ostatus_profile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

repeated did not always find the Notice (deleted?)

Add repeated_id to SimpleStatusArray for Qvitter's benefit

Moving some more repeat stuff into the Share plugin

Notice properties set in bad order on activityobject saving

Share never actually set the repeat_of value

Event fixes for activityhandlerplugin

repeat actions to Share plugin

Merge branch 'nightly' into repeat_as_shareplugin

ImageFile->resize now totally replaced with resizeTo

Repeats shown in threaded noticelist now handled by plugin

Finalize move of 'repeat' Command

Why did I keep these functions from FavoritePlugin?

Receiving Share activity fixes

Forgot to translate 'self' to 'Ostatus_profile' etc.

Share plugin now handles showing form in NoticeOptionItems

Move share command interpretation to SharePlugin

Some fixes to the SharePlugin.php file came along

Remove unnecessary require lines and definitions

ProfileNoticeList and ProfileNoticeListItem are in their own files now too

Add ProfileNoticeList[Item] as separate lib class files

Moving Ostatus_profile processShare to SharePlugin

Merge branch 'nightly' into repeat_as_shareplugin

Repeat confirmation dialogbox fix

until we use jQuery UI dialog stuff

Initial work on making the Share verb handled in plugin

Merge branch 'nightly' of gitorious.org:social/quix0rs-social into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

ImageFile $id argument is only for File objects

Remember to eliminate the Avatar/group logo call to ImageFile->resize!

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>

Same as last commit, don't give ID if it's not for a File object

ImageFile should not have an $id set if not a File

javascript fixes for reply form fetching

It doesn't update the ID properly yet, which should be done to avoid
creating duplicate forms which are identical to HTML parsers...

FormAction wants getInstructions to be protected

only showInstructions is public

Added checked type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
classes/Notice.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added checked type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

more descriptive setting name

SiteNoticeInSidebar widget did not define divId()

ActivityVerb is a core plugin

FavoritePlugin is now an "ActivityVerbHandlerPlugin"

Let the creator decide which HTML tag to use for NoticeListItem

Notice elements don't need to be floating...

Maybe it was originally meant to be without a comma between .notice and .profile?

Move AlreadyFulfilled check to Fave::addNew

Added basic language support for sending out invitations:
- This allows for example sending German mails from an English instance
- Added some checked type-hints (all around language stuff)

Some code improvement:
- array $foo=null and then an is_null($foo) makes no sense,
better use array $foo=array() directly.
- onTitle()'s parameter $paths now always must be an array

Signed-off-by: Roland Haeder <roland@mxchange.org>
This conflict was because 'master' has StatusNet as class, but 'nigtly' already
has GNUSocial as class name.

Conflicts:
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

favorite and like are synonyms of each other

First ActivityVerbPlugin sketch

Notice class got exception throwing getById

Less code, more happy.

Make 'activity' a blacklisted nickname

Will add a plugin called ActivityVerb which makes activity interaction
more standardized.

The argument formatting regexps are the third argument

Delete Faves onProfileDeleteRelated instead of User

Merge branch 'nightly', beginning of 1.2.x

Conflicts:
plugins/APC/locale/APC.pot
plugins/APC/locale/ast/LC_MESSAGES/APC.po
plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
plugins/APC/locale/br/LC_MESSAGES/APC.po
plugins/APC/locale/de/LC_MESSAGES/APC.po
plugins/APC/locale/es/LC_MESSAGES/APC.po
plugins/APC/locale/eu/LC_MESSAGES/APC.po
plugins/APC/locale/fr/LC_MESSAGES/APC.po
plugins/APC/locale/gl/LC_MESSAGES/APC.po
plugins/APC/locale/he/LC_MESSAGES/APC.po
plugins/APC/locale/ia/LC_MESSAGES/APC.po
plugins/APC/locale/id/LC_MESSAGES/APC.po
plugins/APC/locale/it/LC_MESSAGES/APC.po
plugins/APC/locale/mk/LC_MESSAGES/APC.po
plugins/APC/locale/ms/LC_MESSAGES/APC.po
plugins/APC/locale/nb/LC_MESSAGES/APC.po
plugins/APC/locale/nl/LC_MESSAGES/APC.po
plugins/APC/locale/pl/LC_MESSAGES/APC.po
plugins/APC/locale/pt/LC_MESSAGES/APC.po
plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
plugins/APC/locale/ru/LC_MESSAGES/APC.po
plugins/APC/locale/tl/LC_MESSAGES/APC.po
plugins/APC/locale/uk/LC_MESSAGES/APC.po
plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
plugins/Adsense/locale/Adsense.pot
plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
plugins/Aim/locale/Aim.pot
plugins/Aim/locale/af/LC_MESSAGES/Aim.po
plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
plugins/Aim/locale/de/LC_MESSAGES/Aim.po
plugins/Aim/locale/es/LC_MESSAGES/Aim.po
plugins/Aim/locale/eu/LC_MESSAGES/Aim.po
plugins/Aim/locale/fi/LC_MESSAGES/Aim.po
plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
plugins/Aim/locale/gl/LC_MESSAGES/Aim.po
plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
plugins/Aim/locale/it/LC_MESSAGES/Aim.po
plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
plugins/Aim/locale/ms/LC_MESSAGES/Aim.po
plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
plugins/Aim/locale/pl/LC_MESSAGES/Aim.po
plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
plugins/Blog/locale/Blog.pot
plugins/Blog/locale/ar/LC_MESSAGES/Blog.po
plugins/Blog/locale/br/LC_MESSAGES/Blog.po
plugins/Blog/locale/ca/LC_MESSAGES/Blog.po
plugins/Blog/locale/de/LC_MESSAGES/Blog.po
plugins/Blog/locale/es/LC_MESSAGES/Blog.po
plugins/Blog/locale/eu/LC_MESSAGES/Blog.po
plugins/Blog/locale/fr/LC_MESSAGES/Blog.po
plugins/Blog/locale/gl/LC_MESSAGES/Blog.po
plugins/Blog/locale/ia/LC_MESSAGES/Blog.po
plugins/Blog/locale/it/LC_MESSAGES/Blog.po
plugins/Blog/locale/lt/LC_MESSAGES/Blog.po
plugins/Blog/locale/mk/LC_MESSAGES/Blog.po
plugins/Blog/locale/nl/LC_MESSAGES/Blog.po
plugins/Blog/locale/tl/LC_MESSAGES/Blog.po
plugins/Blog/locale/tr/LC_MESSAGES/Blog.po
plugins/Irc/locale/Irc.pot
plugins/Irc/locale/ca/LC_MESSAGES/Irc.po
plugins/Irc/locale/de/LC_MESSAGES/Irc.po
plugins/Irc/locale/es/LC_MESSAGES/Irc.po
plugins/Irc/locale/eu/LC_MESSAGES/Irc.po
plugins/Irc/locale/fi/LC_MESSAGES/Irc.po
plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
plugins/Irc/locale/gl/LC_MESSAGES/Irc.po
plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
plugins/Irc/locale/it/LC_MESSAGES/Irc.po
plugins/Irc/locale/ja/LC_MESSAGES/Irc.po
plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
plugins/Irc/locale/tr/LC_MESSAGES/Irc.po
plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
plugins/Spotify/locale/Spotify.pot
plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po
plugins/TinyMCE/locale/TinyMCE.pot
plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
plugins/XCache/locale/XCache.pot
plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
plugins/XCache/locale/br/LC_MESSAGES/XCache.po
plugins/XCache/locale/de/LC_MESSAGES/XCache.po
plugins/XCache/locale/es/LC_MESSAGES/XCache.po
plugins/XCache/locale/eu/LC_MESSAGES/XCache.po
plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
plugins/XCache/locale/he/LC_MESSAGES/XCache.po
plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
plugins/XCache/locale/id/LC_MESSAGES/XCache.po
plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
plugins/XCache/locale/pl/LC_MESSAGES/XCache.po
plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
plugins/YammerImport/locale/YammerImport.pot
plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po

Merge commit 'refs/merge-requests/56' of https://gitorious.org/social/mainline into merge-requests/56

'checked' must be false because else the browser won't send any location and it is better for privacy ... :-)

Signed-off-by: Roland Haeder <roland@mxchange.org>

onEndInitializeQueueManager expects a QueueManager object, so let's set it here.

Signed-off-by: Roland Haeder <roland@mxchange.org>

onArgsInitialize() wants an array and many plugins want to add more elements, so make it everywhere the same.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added more checked type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/OStatus/OStatusPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added more checked type-hints.

Signed-off-by: Roland Haeder <roland@mxchange.org>

DB_DataObject won't save value 0 because it is "false"

A bug which we fix here and there by sending the string '0' instead.
We will be able to remove these hacks ("booleanintstring") when the
next release of DB_DataObject comes as I patched it for them.

Make the OpenID settings page use more of HTMLOutputter functions

Don't display labels by default in notice forms

There are either descriptive placeholders or informational text next to
the elements.

Don't use a placeholder value on the nickname field

(because the placeholder would be 'Nickname', and it might confuse
someone who thinks they can use capital letters...)

Let text inputs have placeholder values.

Move more POST handling into ManagedAction

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/replies.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

A bunch of FormAction and ManagedAction synchronization

TagProfileAction and OStatusPlugin now use less redundant code

ROLLBACK queries in the proper order

Sensitive-test _is_ done in index.php

Some reply buttons wouldn't work the first time they were clicked.

RepliesAction migrated to extend ManagedAction

Snapshot of the Transifex translation project - February 2015

All the AJAX calls should be made with $.ajax

because we're gonna want to expect application/xml or text/xml back.

There's a weird thing in Firefox where the call on line ~703 makes the
web developer console output "not well formed" which is for the returned
data. It is assumed to be text/xml - which it is - but the doctype says
"html" (because it is first <?xml..?> followed by <!DOCTYPE html ...->

This doesn't cause any malfunction right now, just the output in the
console. I'm not exactly sure how to fix it. Probably remove the DOCTYPE
output for AJAX calls, but I'm not sure that's the best way. Could this
maybe even be a browser/javascript/whatever bug? Because the Content-Type
from the server _is_ right...

Need to run the NoticeFormSetup if forms are prerendered

Don't put submit button in reply field edge-to-edge

Don't put reply in a popup, it was undesired for users

Maybe could make that optional or something in the DefaultLayout plugin...

Email settings fix for the DB_DataObject bug for saving value 0

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Reply popup works now

...WHY does javascript let me define the same value twice in the same
definition without warning about it? I hate Javascript. :(

Change the title of NewnoticeAction if replying

input elements outside of label elements

HTML lets us put the input element inside the label and then they
are automatically paired, but this is more explicit and clear imho.

Merge branch 'social-nightly' into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'social-master' into nightly

Conflicts:
lib/noticeform.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' into social-nightly

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'nightly' into social-nightly

Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>