]> git.mxchange.org Git - friendica.git/log
friendica.git
11 years agoFurther redoings
Michael Vogel [Mon, 12 Aug 2013 09:12:00 +0000 (11:12 +0200)]
Further redoings

11 years agoredoing the change concerning the hostname.
Michael Vogel [Mon, 12 Aug 2013 09:09:11 +0000 (11:09 +0200)]
redoing the change concerning the hostname.

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sun, 11 Aug 2013 19:20:36 +0000 (21:20 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoAdded an option to configure the hostname manually. And there was a problem when...
Michael Vogel [Sun, 11 Aug 2013 19:19:26 +0000 (21:19 +0200)]
Added an option to configure the hostname manually. And there was a problem when APC wasn't present.

11 years ago- Using APC to store config values (when present)
Michael Vogel [Fri, 9 Aug 2013 16:28:50 +0000 (18:28 +0200)]
- Using APC to store config values (when present)
- Enabling interlacing for pictures

11 years agoMerge pull request #751 from fabrixxm/master
fabrixxm [Thu, 8 Aug 2013 15:36:22 +0000 (08:36 -0700)]
Merge pull request #751 from fabrixxm/master

move register_adminadd_eml.tpl to view/en/

11 years agomove register_adminadd_eml.tpl to view/en/
Fabrixxm [Thu, 8 Aug 2013 15:33:53 +0000 (11:33 -0400)]
move register_adminadd_eml.tpl to view/en/

11 years agoPT BR: update to the strings
Tobias Diekershoff [Tue, 6 Aug 2013 18:12:37 +0000 (20:12 +0200)]
PT BR: update to the strings

11 years agoMerge pull request #744 from annando/master
fabrixxm [Tue, 6 Aug 2013 16:50:51 +0000 (09:50 -0700)]
Merge pull request #744 from annando/master

- More visible reshares
- lockfile for onepoll.php
- clear old smarty3 cache files
- rework tag serarch
- add more logs for diaspora messages

11 years agoIf APC is enabled then store config data there
Michael Vogel [Mon, 5 Aug 2013 22:20:16 +0000 (00:20 +0200)]
If APC is enabled then store config data there

11 years agoSome debugging information added
Michael Vogel [Mon, 5 Aug 2013 21:06:40 +0000 (23:06 +0200)]
Some debugging information added

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Mon, 5 Aug 2013 18:32:02 +0000 (20:32 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoChanged the tag search. This hopefully speeds it up on larger systems.
Michael Vogel [Mon, 5 Aug 2013 18:31:08 +0000 (20:31 +0200)]
Changed the tag search. This hopefully speeds it up on larger systems.

11 years agoMerge pull request #750 from zered/deleted_user_disp
fabrixxm [Mon, 5 Aug 2013 11:24:54 +0000 (04:24 -0700)]
Merge pull request #750 from zered/deleted_user_disp

Deleted user display in admin page

11 years agoAdding a "User waiting for permanent deletion" table in admin page
Zered [Mon, 5 Aug 2013 04:08:33 +0000 (06:08 +0200)]
Adding a "User waiting for permanent deletion" table in admin page

11 years agoMerge pull request #748 from fabrixxm/bug739
fabrixxm [Sun, 4 Aug 2013 07:17:07 +0000 (00:17 -0700)]
Merge pull request #748 from fabrixxm/bug739

add tag to term table. fix hex tag filter. close #739

11 years agohex tag filter: look at entire string
Fabrixxm [Sun, 4 Aug 2013 07:12:17 +0000 (03:12 -0400)]
hex tag filter: look at entire string

11 years agoremove debug code. again.
Fabrixxm [Sun, 4 Aug 2013 07:11:01 +0000 (03:11 -0400)]
remove debug code. again.

11 years agoNL: update to the strings
Tobias Diekershoff [Sun, 4 Aug 2013 06:40:55 +0000 (08:40 +0200)]
NL: update to the strings

11 years agoremove debug code
Fabrixxm [Sat, 3 Aug 2013 19:18:41 +0000 (15:18 -0400)]
remove debug code

11 years agoadd tag to term table. fix "#xNNNN" tag filter.
Fabrixxm [Sat, 3 Aug 2013 19:12:50 +0000 (15:12 -0400)]
add tag to term table. fix "#xNNNN" tag filter.

11 years agoMerge pull request #2 from friendica/master
Zered [Fri, 2 Aug 2013 17:59:13 +0000 (10:59 -0700)]
Merge pull request #2 from friendica/master

Update zered's repo

11 years agoMerge pull request #1 from zered/solve_741
Zered [Fri, 2 Aug 2013 17:57:20 +0000 (10:57 -0700)]
Merge pull request #1 from zered/solve_741

Solving the "Disallow public access to addons listed in the apps menu" h...

11 years agoMerge pull request #747 from zered/solve_741
fabrixxm [Fri, 2 Aug 2013 16:57:17 +0000 (09:57 -0700)]
Merge pull request #747 from zered/solve_741

Solving the "Disallow public access to addons listed in the apps menu" h...

11 years agoMerge pull request #745 from mexon/redirect_fix
fabrixxm [Fri, 2 Aug 2013 15:43:01 +0000 (08:43 -0700)]
Merge pull request #745 from mexon/redirect_fix

Appending URLs in case of redirect is incorrect

11 years agoNL: update to the strings
Tobias Diekershoff [Wed, 31 Jul 2013 04:41:11 +0000 (06:41 +0200)]
NL: update to the strings

11 years agoMerge pull request #746 from fabrixxm/bug740
fabrixxm [Mon, 29 Jul 2013 17:17:59 +0000 (10:17 -0700)]
Merge pull request #746 from fabrixxm/bug740

Close #740

11 years agoapi: ``api_status_show()`` returns correct post id
Fabrixxm [Mon, 29 Jul 2013 14:48:30 +0000 (10:48 -0400)]
api: ``api_status_show()`` returns correct post id

11 years agoReplicate redirect URL building logic for post requests
Matthew Exon [Mon, 29 Jul 2013 14:33:10 +0000 (22:33 +0800)]
Replicate redirect URL building logic for post requests

11 years agoIf the header returns an absolute path as a redirect, don't simply append the path...
Matthew Exon [Mon, 29 Jul 2013 02:11:08 +0000 (10:11 +0800)]
If the header returns an absolute path as a redirect, don't simply append the path to the old URL, remove the old absolute path first.

For example, original URL:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html

Redirect from header:

/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Incorrect result:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Correct result after this patch:

http://www.theregister.co.uk/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

11 years agoPreparations for a more visible reshare when exporting to twitter, statusnet or facebook.
Michael Vogel [Sun, 28 Jul 2013 18:38:48 +0000 (20:38 +0200)]
Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.

11 years agoSolving the "Disallow public access to addons listed in the apps menu" has no effect bug
Zered [Wed, 24 Jul 2013 01:45:22 +0000 (03:45 +0200)]
Solving the "Disallow public access to addons listed in the apps menu" has no effect bug

Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook)

Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged

11 years agoPL: update to the strings
Tobias Diekershoff [Mon, 22 Jul 2013 05:53:02 +0000 (07:53 +0200)]
PL: update to the strings

11 years agoallow admins to add a new user from the admin panel (eventually fixing oldbug #383)
Tobias Diekershoff [Sun, 21 Jul 2013 06:46:57 +0000 (08:46 +0200)]
allow admins to add a new user from the admin panel (eventually fixing oldbug #383)

11 years agoLockfile for onepoll, removing old smarty3 cache files.
Michael Vogel [Fri, 19 Jul 2013 21:38:23 +0000 (23:38 +0200)]
Lockfile for onepoll, removing old smarty3 cache files.

11 years agoMerge pull request #735 from fabrixxm/bug712
fabrixxm [Fri, 12 Jul 2013 07:51:26 +0000 (00:51 -0700)]
Merge pull request #735 from fabrixxm/bug712

Fixes #712

11 years agoBG: update for the strings
Tobias Diekershoff [Fri, 12 Jul 2013 07:37:51 +0000 (09:37 +0200)]
BG: update for the strings

11 years agoBG: update for the strings
Tobias Diekershoff [Fri, 12 Jul 2013 07:37:26 +0000 (09:37 +0200)]
BG: update for the strings

11 years agoIT: update for the strings
Tobias Diekershoff [Fri, 12 Jul 2013 07:37:09 +0000 (09:37 +0200)]
IT: update for the strings

11 years agoFixes #712
Fabrixxm [Thu, 11 Jul 2013 07:34:49 +0000 (03:34 -0400)]
Fixes #712

11 years agoMerge pull request #732 from fabrixxm/bug728
fabrixxm [Tue, 9 Jul 2013 08:50:07 +0000 (01:50 -0700)]
Merge pull request #732 from fabrixxm/bug728

Fix diaspora contacts profile image

11 years agoNL: update to the strings
Tobias Diekershoff [Mon, 8 Jul 2013 12:42:56 +0000 (14:42 +0200)]
NL: update to the strings

11 years agostupid typo
fabrixxm [Mon, 8 Jul 2013 12:21:49 +0000 (14:21 +0200)]
stupid typo

11 years agoshould fix #728
Fabrixxm [Mon, 8 Jul 2013 08:52:14 +0000 (04:52 -0400)]
should fix #728

11 years agoMerge pull request #713 from annando/master
fabrixxm [Fri, 5 Jul 2013 19:40:30 +0000 (12:40 -0700)]
Merge pull request #713 from annando/master

ejabberd and friendica

11 years agoNL: update of the strings
Tobias Diekershoff [Fri, 5 Jul 2013 10:14:34 +0000 (12:14 +0200)]
NL: update of the strings

11 years agoFR: update of the strings
Tobias Diekershoff [Fri, 5 Jul 2013 10:14:20 +0000 (12:14 +0200)]
FR: update of the strings

11 years agoPT_BR: update of the strings
Tobias Diekershoff [Fri, 5 Jul 2013 10:13:43 +0000 (12:13 +0200)]
PT_BR: update of the strings

11 years agoMerge pull request #720 from fabrixxm/feed_push
fabrixxm [Mon, 1 Jul 2013 17:16:53 +0000 (10:16 -0700)]
Merge pull request #720 from fabrixxm/feed_push

Feed PuSH

11 years agoNL: translation added from transifex
Tobias Diekershoff [Sat, 29 Jun 2013 08:45:25 +0000 (10:45 +0200)]
NL: translation added from transifex

11 years agoCS: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:36:21 +0000 (14:36 +0200)]
CS: update to the strings

11 years agoDE: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:35:53 +0000 (14:35 +0200)]
DE: update to the strings

11 years agoZH_CN: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:33:33 +0000 (14:33 +0200)]
ZH_CN: update to the strings

11 years agoPL: update to the strings
Tobias Diekershoff [Fri, 28 Jun 2013 12:31:57 +0000 (14:31 +0200)]
PL: update to the strings

11 years agoMerge pull request #721 from fabrixxm/master
fabrixxm [Fri, 28 Jun 2013 07:19:56 +0000 (00:19 -0700)]
Merge pull request #721 from fabrixxm/master

uexport: fix full export

11 years agouexport: fix full export
Fabrixxm [Fri, 28 Jun 2013 07:16:25 +0000 (03:16 -0400)]
uexport: fix full export
- add new line after each valid json line
- export table row as single json object

11 years agoComplete oStatus conversations: Changed from file_get_contents to fetch_url
Michael Vogel [Thu, 27 Jun 2013 20:27:59 +0000 (22:27 +0200)]
Complete oStatus conversations: Changed from file_get_contents to fetch_url

11 years agoremove unneeded logger function
Fabrixxm [Thu, 27 Jun 2013 13:58:39 +0000 (09:58 -0400)]
remove unneeded logger function

11 years agoadd pubsubhubbub support to feed contacts
Fabrixxm [Thu, 27 Jun 2013 13:51:13 +0000 (09:51 -0400)]
add pubsubhubbub support to feed contacts

11 years agoCA: update to the strings
Tobias Diekershoff [Thu, 27 Jun 2013 05:29:18 +0000 (07:29 +0200)]
CA: update to the strings

11 years agoignore hex escapes as numeric tags
friendica [Wed, 26 Jun 2013 11:58:54 +0000 (04:58 -0700)]
ignore hex escapes as numeric tags

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 26 Jun 2013 11:07:44 +0000 (04:07 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agoput tags in items
friendica [Wed, 26 Jun 2013 11:02:04 +0000 (04:02 -0700)]
put tags in items

11 years agoDE: update to the strings
Tobias Diekershoff [Wed, 26 Jun 2013 08:42:08 +0000 (10:42 +0200)]
DE: update to the strings

11 years agoBG: added translation of the strings from transifex
Tobias Diekershoff [Mon, 24 Jun 2013 17:04:46 +0000 (19:04 +0200)]
BG: added translation of the strings from transifex

11 years agoBG: added translation of the strings from transifex
Tobias Diekershoff [Mon, 24 Jun 2013 17:04:25 +0000 (19:04 +0200)]
BG: added translation of the strings from transifex

11 years agoVier: A little rearrangement of the menu order.
Michael Vogel [Sat, 22 Jun 2013 22:26:04 +0000 (00:26 +0200)]
Vier: A little rearrangement of the menu order.

11 years agoVier: Introductions are now shown. The popup menu when editing a profile is visible...
Michael Vogel [Sat, 22 Jun 2013 22:07:21 +0000 (00:07 +0200)]
Vier: Introductions are now shown. The popup menu when editing a profile is visible again.

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sat, 22 Jun 2013 16:31:28 +0000 (18:31 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoIt's now possible to authenticate an ejabberd server against friendica. See auth_ejab...
Michael Vogel [Sat, 22 Jun 2013 15:34:52 +0000 (17:34 +0200)]
It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install.

11 years agoFR: update to the strings
Tobias Diekershoff [Sat, 22 Jun 2013 05:13:44 +0000 (07:13 +0200)]
FR: update to the strings

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 21 Jun 2013 12:02:43 +0000 (05:02 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years ago-- #039; is not a tag
friendica [Fri, 21 Jun 2013 12:00:30 +0000 (05:00 -0700)]
--  #039; is not a tag

11 years agoIT: update to the strings
Tobias Diekershoff [Fri, 21 Jun 2013 07:00:16 +0000 (09:00 +0200)]
IT: update to the strings

11 years agoNB_NO: update to the strings
Tobias Diekershoff [Fri, 21 Jun 2013 06:56:16 +0000 (08:56 +0200)]
NB_NO: update to the strings

11 years agoNB_NO: update to the strings
Tobias Diekershoff [Thu, 20 Jun 2013 05:50:19 +0000 (07:50 +0200)]
NB_NO: update to the strings

11 years agopager: fix stupid typo
fabrixxm [Wed, 19 Jun 2013 12:28:39 +0000 (14:28 +0200)]
pager: fix stupid typo

11 years agoNB_NO: update to the strings
Tobias Diekershoff [Wed, 19 Jun 2013 08:57:59 +0000 (10:57 +0200)]
NB_NO: update to the strings

11 years agoMerge pull request #697 from annando/master
fabrixxm [Mon, 17 Jun 2013 12:09:54 +0000 (05:09 -0700)]
Merge pull request #697 from annando/master

API can now fetch posts from a single thread

11 years agoMerge pull request #703 from fabrixxm/master
fabrixxm [Mon, 17 Jun 2013 08:30:00 +0000 (01:30 -0700)]
Merge pull request #703 from fabrixxm/master

fix pagination template

11 years agopagination: fix template
Fabrixxm [Mon, 17 Jun 2013 08:28:34 +0000 (04:28 -0400)]
pagination: fix template

11 years agoMerge pull request #695 from fabrixxm/master
fabrixxm [Mon, 17 Jun 2013 07:52:30 +0000 (00:52 -0700)]
Merge pull request #695 from fabrixxm/master

move html from paginate functions to template

11 years agoZH-CN: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:51:59 +0000 (14:51 +0200)]
ZH-CN: update to the strings

11 years agoIT: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:51:17 +0000 (14:51 +0200)]
IT: update to the strings

11 years agoNB_NO: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:50:22 +0000 (14:50 +0200)]
NB_NO: update to the strings

11 years agoCS: update to the strings
Tobias Diekershoff [Sun, 16 Jun 2013 12:49:04 +0000 (14:49 +0200)]
CS: update to the strings

11 years agoAPI: Changed "parent_id" to "conversation_id" since that reflects better the meaning...
Michael Vogel [Sun, 16 Jun 2013 11:42:43 +0000 (13:42 +0200)]
API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.

11 years agoOStatus: identi.ca seemed to have changed the format of activity streams for their...
Michael Vogel [Sun, 16 Jun 2013 11:28:04 +0000 (13:28 +0200)]
OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it
API: It is now possible to fetch only posts from one thread.

11 years agomove html from paginate functions to template
Fabrixxm [Thu, 13 Jun 2013 12:12:15 +0000 (08:12 -0400)]
move html from paginate functions to template

11 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 13 Jun 2013 04:42:20 +0000 (21:42 -0700)]
Merge https://github.com/friendica/friendica into pull

11 years agodon't try to parse empty xml with simplepie, throws conversion warning
friendica [Thu, 13 Jun 2013 04:41:07 +0000 (21:41 -0700)]
don't try to parse empty xml with simplepie, throws conversion warning

11 years agoMerge pull request #693 from fabrixxm/moveme
tobiasd [Thu, 13 Jun 2013 04:30:32 +0000 (21:30 -0700)]
Merge pull request #693 from fabrixxm/moveme

uimport: set contacts 'avatar-date' to zero

11 years agouimport: set contacts 'avatar-date' to zero. should fix issue #692
Fabrixxm [Wed, 12 Jun 2013 07:51:53 +0000 (03:51 -0400)]
uimport: set contacts 'avatar-date' to zero. should fix issue #692

11 years agoMerge pull request #691 from annando/master
tobiasd [Tue, 11 Jun 2013 05:31:51 +0000 (22:31 -0700)]
Merge pull request #691 from annando/master

OStatus autocompletion improved

11 years agoMerge remote-tracking branch 'upstream/master'
Michael Vogel [Sat, 8 Jun 2013 10:30:36 +0000 (12:30 +0200)]
Merge remote-tracking branch 'upstream/master'

11 years agoostatus completion of threads now works with longer threads well.
Michael Vogel [Sat, 8 Jun 2013 10:28:19 +0000 (12:28 +0200)]
ostatus completion of threads now works with longer threads well.

11 years agoMerge pull request #690 from fermionic/agpl-20130604-frost-js-crash
fermionic [Wed, 5 Jun 2013 02:32:43 +0000 (19:32 -0700)]
Merge pull request #690 from fermionic/agpl-20130604-frost-js-crash

forgot to update Frost autocomplete JS location

11 years agoforgot to update Frost autocomplete JS location
Zach Prezkuta [Wed, 5 Jun 2013 02:25:52 +0000 (20:25 -0600)]
forgot to update Frost autocomplete JS location

11 years agoMerge pull request #689 from fermionic/20130601-cropper-frost-fix
friendica [Sun, 2 Jun 2013 23:44:27 +0000 (16:44 -0700)]
Merge pull request #689 from fermionic/20130601-cropper-frost-fix

Modify Cropper to avoid conflicts with jQuery

11 years agoremove some now-unnecessary templates
Zach Prezkuta [Sat, 1 Jun 2013 16:44:20 +0000 (10:44 -0600)]
remove some now-unnecessary templates