]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge pull request #2828 from tobiasd/20161001-availlang
Michael Vogel [Sat, 1 Oct 2016 18:48:22 +0000 (20:48 +0200)]
Merge pull request #2828 from tobiasd/20161001-availlang

with translations now in /view/lang/lng shift the array index along

7 years agowith translations now in /view/lang/lng shift the array index along
Tobias Diekershoff [Sat, 1 Oct 2016 14:07:23 +0000 (16:07 +0200)]
with translations now in /view/lang/lng shift the array index along

7 years agoMerge pull request #2821 from Hypolite/Issue-#2817
Tobias Diekershoff [Sat, 1 Oct 2016 08:58:32 +0000 (10:58 +0200)]
Merge pull request #2821 from Hypolite/Issue-#2817

Fix #2817 - Move translation language folder in a subfolder of view

7 years agoMerge pull request #2826 from annando/1610-utf8mb4
Tobias Diekershoff [Sat, 1 Oct 2016 08:51:33 +0000 (10:51 +0200)]
Merge pull request #2826 from annando/1610-utf8mb4

Support of utf8mb4

7 years agoMerge pull request #2824 from Hypolite/Issue-#2823
Michael Vogel [Sat, 1 Oct 2016 08:40:08 +0000 (10:40 +0200)]
Merge pull request #2824 from Hypolite/Issue-#2823

Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing

7 years agoMerge pull request #2820 from Hypolite/Issue-#2816
Tobias Diekershoff [Sat, 1 Oct 2016 08:37:10 +0000 (10:37 +0200)]
Merge pull request #2820 from Hypolite/Issue-#2816

[Hotfix] Fix #2816 - [Admin] Unable to save config items present in .htconfig.php but not in DB

7 years agoRemoved unneeded line
Michael Vogel [Sat, 1 Oct 2016 08:33:09 +0000 (08:33 +0000)]
Removed unneeded line

7 years agoSupport of utf8mb4
Michael Vogel [Sat, 1 Oct 2016 08:21:37 +0000 (08:21 +0000)]
Support of utf8mb4

7 years agoFix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
Hypolite Petovan [Sat, 1 Oct 2016 03:26:22 +0000 (23:26 -0400)]
Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing

- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing

7 years agoMerge pull request #2819 from Hypolite/Issue-#2814
rabuzarus [Fri, 30 Sep 2016 15:47:01 +0000 (17:47 +0200)]
Merge pull request #2819 from Hypolite/Issue-#2814

Fix #2814

7 years agoFix #2817
Hypolite Petovan [Fri, 30 Sep 2016 14:46:56 +0000 (10:46 -0400)]
Fix #2817

- Change all references to language folders

7 years agoFix #2817
Hypolite Petovan [Fri, 30 Sep 2016 14:45:47 +0000 (10:45 -0400)]
Fix #2817

- Move translation folders under `view/lang`

7 years agoFix Issue #2816
Hypolite Petovan [Fri, 30 Sep 2016 13:22:35 +0000 (09:22 -0400)]
Fix Issue #2816

- Fix wrong variable name in Config and PConfig

7 years agoRemove extraneous comments
Hypolite Petovan [Fri, 30 Sep 2016 13:22:00 +0000 (09:22 -0400)]
Remove extraneous comments

- If needed, the version control system can be used to restore this code

7 years agoFix #2814
Hypolite Petovan [Fri, 30 Sep 2016 03:46:43 +0000 (23:46 -0400)]
Fix #2814

- [frio] Add a wrapping `a` tag around the notification text
- Add an event listener preventing popup menus to close when they are
themselves clicked

7 years agoMerge pull request #2805 from tobiasd/20160927-msg
rabuzarus [Thu, 29 Sep 2016 15:35:59 +0000 (17:35 +0200)]
Merge pull request #2805 from tobiasd/20160927-msg

regenerated messages.po

7 years agoMerge pull request #2809 from Hypolite/frio-fix-terms
rabuzarus [Thu, 29 Sep 2016 10:40:23 +0000 (12:40 +0200)]
Merge pull request #2809 from Hypolite/frio-fix-terms

[frio] Fix terms capitalization

7 years agoMerge pull request #2815 from annando/1609-mysql
Tobias Diekershoff [Thu, 29 Sep 2016 07:26:17 +0000 (09:26 +0200)]
Merge pull request #2815 from annando/1609-mysql

We should only use utf8mb4 for dumpsql and new installations

7 years agoWe should only use utf8mb4 for dumpsql and new installations
Michael Vogel [Thu, 29 Sep 2016 06:31:42 +0000 (06:31 +0000)]
We should only use utf8mb4 for dumpsql and new installations

7 years agoMerge pull request #2812 from Hypolite/fix-browser-notifications
Tobias Diekershoff [Thu, 29 Sep 2016 05:40:59 +0000 (07:40 +0200)]
Merge pull request #2812 from Hypolite/fix-browser-notifications

Add HTML entity decoding to browser notifications

7 years agoAdd HTML entity decoding to browser notifications
Hypolite Petovan [Thu, 29 Sep 2016 03:17:49 +0000 (23:17 -0400)]
Add HTML entity decoding to browser notifications

7 years ago[frio] Capitalize Jot tabs title
Hypolite Petovan [Thu, 29 Sep 2016 01:09:03 +0000 (21:09 -0400)]
[frio] Capitalize Jot tabs title

- Revert translation term change for "permissions"

7 years ago[frio] Capitalize dropdown menu links
Hypolite Petovan [Thu, 29 Sep 2016 00:59:54 +0000 (20:59 -0400)]
[frio] Capitalize dropdown menu links

7 years ago[frio] Capitalize a few terms for consistency
Hypolite Petovan [Thu, 29 Sep 2016 00:53:25 +0000 (20:53 -0400)]
[frio] Capitalize a few terms for consistency

- Changed the translation term "permissions" because only frio is using
it
- Changed the vote links style because it is shared with other themes

7 years ago[frio] Fix whitespace style.css
Hypolite Petovan [Thu, 29 Sep 2016 00:51:56 +0000 (20:51 -0400)]
[frio] Fix whitespace style.css

7 years agoMerge pull request #2807 from Hypolite/frio-larger-view-develop
rabuzarus [Wed, 28 Sep 2016 18:32:11 +0000 (20:32 +0200)]
Merge pull request #2807 from Hypolite/frio-larger-view-develop

[frio] Changes to shared post display (width, base font size)

7 years agoSet block quote size to current text-size
Hypolite Petovan [Wed, 28 Sep 2016 18:25:41 +0000 (14:25 -0400)]
Set block quote size to current text-size

7 years agoFix abnormal font size for shared posts
Hypolite Petovan [Wed, 28 Sep 2016 18:01:12 +0000 (14:01 -0400)]
Fix abnormal font size for shared posts

- Use normal font size for shared content

7 years ago[frio] Increase available width for shared content
Hypolite Petovan [Wed, 28 Sep 2016 17:08:58 +0000 (13:08 -0400)]
[frio] Increase available width for shared content

- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content

7 years agoRevert "[frio] Increase center column width"
Hypolite Petovan [Wed, 28 Sep 2016 16:58:44 +0000 (12:58 -0400)]
Revert "[frio] Increase center column width"

This reverts commit 0c383ad9ffd7df05898ad5da4058fae5f4ea0901.

7 years ago[frio] Remove shared content horizontal margins
Hypolite Petovan [Wed, 28 Sep 2016 15:59:54 +0000 (11:59 -0400)]
[frio] Remove shared content horizontal margins

7 years ago[frio] Increase center column width
Hypolite Petovan [Wed, 28 Sep 2016 15:59:05 +0000 (11:59 -0400)]
[frio] Increase center column width

- Added two Bootstrap divisions to the center column

7 years agoMerge pull request #2790 from gerhard6380/develop
Tobias Diekershoff [Wed, 28 Sep 2016 06:11:20 +0000 (08:11 +0200)]
Merge pull request #2790 from gerhard6380/develop

New API /api/friendica/profile/show

7 years agoregenerated messages.po
Tobias Diekershoff [Tue, 27 Sep 2016 19:36:27 +0000 (21:36 +0200)]
regenerated messages.po

7 years agoMerge pull request #2802 from annando/xmpp-profile
Tobias Diekershoff [Tue, 27 Sep 2016 18:57:56 +0000 (20:57 +0200)]
Merge pull request #2802 from annando/xmpp-profile

New fields for the DFRN protocol (XMPP and Account Type)

7 years agoDocumentation added
Michael Vogel [Tue, 27 Sep 2016 18:29:50 +0000 (18:29 +0000)]
Documentation added

7 years ago"Company" is now "Organisation" and there is an auto update
Michael Vogel [Mon, 26 Sep 2016 19:35:01 +0000 (19:35 +0000)]
"Company" is now "Organisation" and there is an auto update

7 years agoWe are now having an account type and are publishing it
Michael Vogel [Sun, 25 Sep 2016 20:37:27 +0000 (20:37 +0000)]
We are now having an account type and are publishing it

7 years agoremove parameter from doxygen description
gerhard6380 [Sun, 25 Sep 2016 20:25:59 +0000 (22:25 +0200)]
remove parameter from doxygen description

7 years agoanother correction of spaces
gerhard6380 [Sun, 25 Sep 2016 16:52:59 +0000 (18:52 +0200)]
another correction of spaces

7 years agochange spaces/tabstopps
gerhard6380 [Sun, 25 Sep 2016 16:50:08 +0000 (18:50 +0200)]
change spaces/tabstopps

7 years agocorrect some spaces/tabs
gerhard6380 [Sun, 25 Sep 2016 16:45:00 +0000 (18:45 +0200)]
correct some spaces/tabs

7 years agocorrect tab indents and CRLF
gerhard6380 [Sun, 25 Sep 2016 16:22:42 +0000 (18:22 +0200)]
correct tab indents and CRLF

7 years agoThe XMPP address is now in the profile and will be transmitted
Michael Vogel [Sun, 25 Sep 2016 15:28:00 +0000 (15:28 +0000)]
The XMPP address is now in the profile and will be transmitted

7 years agoMerge pull request #2797 from tobiasd/20160924-de
rabuzarus [Sat, 24 Sep 2016 12:51:16 +0000 (14:51 +0200)]
Merge pull request #2797 from tobiasd/20160924-de

DE update to the translation

7 years agoDE update to the translation
Tobias Diekershoff [Sat, 24 Sep 2016 12:16:58 +0000 (14:16 +0200)]
DE update to the translation

7 years agoMerge pull request #2795 from tobiasd/20160924-fr
rabuzarus [Sat, 24 Sep 2016 07:52:33 +0000 (09:52 +0200)]
Merge pull request #2795 from tobiasd/20160924-fr

FR update to the strings, THX Hypolite Petovan

7 years agoMerge pull request #2796 from tobiasd/20160924-msg
rabuzarus [Sat, 24 Sep 2016 07:52:15 +0000 (09:52 +0200)]
Merge pull request #2796 from tobiasd/20160924-msg

regenerated messages.po to fix typos

7 years agoregenerated messages.po to fix typos
Tobias Diekershoff [Sat, 24 Sep 2016 07:45:44 +0000 (09:45 +0200)]
regenerated messages.po to fix typos

7 years agoFR update to the strings, THX Hypolite Petovan
Tobias Diekershoff [Sat, 24 Sep 2016 07:35:23 +0000 (09:35 +0200)]
FR update to the strings, THX Hypolite Petovan

7 years agoMerge pull request #2794 from tobiasd/20160924-typos
rabuzarus [Sat, 24 Sep 2016 06:50:12 +0000 (08:50 +0200)]
Merge pull request #2794 from tobiasd/20160924-typos

correction of typos

7 years agocorrection of typos
Tobias Diekershoff [Sat, 24 Sep 2016 06:08:04 +0000 (08:08 +0200)]
correction of typos

7 years agocorrection of typos
Tobias Diekershoff [Sat, 24 Sep 2016 06:07:48 +0000 (08:07 +0200)]
correction of typos

7 years agoMerge branch 'develop' of https://github.com/gerhard6380/friendica into develop
gerhard6380 [Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)]
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
gerhard6380 [Fri, 23 Sep 2016 17:34:57 +0000 (19:34 +0200)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoChange API documentation to contain new API call /api/friendica/profile/show
gerhard6380 [Fri, 23 Sep 2016 17:26:44 +0000 (19:26 +0200)]
Change API documentation to contain new API call /api/friendica/profile/show

7 years agoNew API /api/friendica/profile/show to return data of all profiles a user has to...
gerhard6380 [Fri, 23 Sep 2016 17:06:41 +0000 (19:06 +0200)]
New API /api/friendica/profile/show to return data of all profiles a user has to a client

7 years agoMerge pull request #2789 from annando/1609-escaping
Tobias Diekershoff [Fri, 23 Sep 2016 06:46:02 +0000 (08:46 +0200)]
Merge pull request #2789 from annando/1609-escaping

Special characters should be escaped

7 years agoAt the search we should do it as well.
Michael Vogel [Fri, 23 Sep 2016 06:36:48 +0000 (06:36 +0000)]
At the search we should do it as well.

7 years agoSpecial characters should be escaped
Michael Vogel [Fri, 23 Sep 2016 06:29:02 +0000 (06:29 +0000)]
Special characters should be escaped

7 years agoMerge pull request #2787 from annando/1609-xmpp-auth
Tobias Diekershoff [Thu, 22 Sep 2016 21:28:46 +0000 (23:28 +0200)]
Merge pull request #2787 from annando/1609-xmpp-auth

Reworked ejabberd authentification

7 years agochanging gitignore
gerhard6380 [Thu, 22 Sep 2016 20:08:24 +0000 (22:08 +0200)]
changing gitignore

7 years agoMerge branch 'master'
gerhard6380 [Thu, 22 Sep 2016 19:59:51 +0000 (21:59 +0200)]
Merge branch 'master'

7 years agoadd Visual Studio special files to gitignore
gerhard6380 [Thu, 22 Sep 2016 19:55:16 +0000 (21:55 +0200)]
add Visual Studio special files to gitignore

7 years agoMerge pull request #2788 from tobiasd/20160922-de
Michael Vogel [Thu, 22 Sep 2016 18:23:15 +0000 (20:23 +0200)]
Merge pull request #2788 from tobiasd/20160922-de

DE update to the translation

7 years agoSome additional beautification
Michael Vogel [Thu, 22 Sep 2016 18:18:26 +0000 (18:18 +0000)]
Some additional beautification

7 years agoThe string is an array ...
Michael Vogel [Thu, 22 Sep 2016 18:07:32 +0000 (18:07 +0000)]
The string is an array ...

7 years agoDE update to the translation
Tobias Diekershoff [Thu, 22 Sep 2016 10:37:39 +0000 (12:37 +0200)]
DE update to the translation

7 years agoReworked ejabberd authentification
Michael Vogel [Thu, 22 Sep 2016 02:57:40 +0000 (02:57 +0000)]
Reworked ejabberd authentification

7 years agoMerge pull request #2785 from tobiasd/20160921-msg
Michael Vogel [Wed, 21 Sep 2016 12:29:45 +0000 (14:29 +0200)]
Merge pull request #2785 from tobiasd/20160921-msg

regenerated messages.po

7 years agoMerge pull request #2784 from tobiasd/20160921-ptbr
Michael Vogel [Wed, 21 Sep 2016 12:29:23 +0000 (14:29 +0200)]
Merge pull request #2784 from tobiasd/20160921-ptbr

PT BR update to the strings

7 years agoregenerated messages.po
Tobias Diekershoff [Wed, 21 Sep 2016 10:13:32 +0000 (12:13 +0200)]
regenerated messages.po

7 years agoPT BR update to the strings
Tobias Diekershoff [Wed, 21 Sep 2016 09:44:01 +0000 (11:44 +0200)]
PT BR update to the strings

7 years agoMerge pull request #2782 from tobiasd/20160920-adm
Michael Vogel [Tue, 20 Sep 2016 17:25:45 +0000 (19:25 +0200)]
Merge pull request #2782 from tobiasd/20160920-adm

Show the worker queue count if the workers are active

7 years agoMerge pull request #2783 from tobiasd/20160920-license
Michael Vogel [Tue, 20 Sep 2016 17:24:05 +0000 (19:24 +0200)]
Merge pull request #2783 from tobiasd/20160920-license

it is 2016 by now

7 years agoit is 2016 by now
Tobias Diekershoff [Tue, 20 Sep 2016 14:57:18 +0000 (16:57 +0200)]
it is 2016 by now

7 years agoShow the worker queue count if the workers are active
Tobias Diekershoff [Tue, 20 Sep 2016 13:45:55 +0000 (15:45 +0200)]
Show the worker queue count if the workers are active

7 years agoMerge pull request #2779 from tobiasd/20160913-admin
Michael Vogel [Wed, 14 Sep 2016 05:00:38 +0000 (07:00 +0200)]
Merge pull request #2779 from tobiasd/20160913-admin

display current state of PHP logging in admin panel logging informations

7 years agoThe info is not that important
Tobias Diekershoff [Wed, 14 Sep 2016 04:45:05 +0000 (06:45 +0200)]
The info is not that important

7 years agoMerge pull request #2778 from annando/1609-xmpp-auth
Tobias Diekershoff [Tue, 13 Sep 2016 21:04:34 +0000 (23:04 +0200)]
Merge pull request #2778 from annando/1609-xmpp-auth

XMPP authentification for multi domain systems

7 years agodisplay current state of PHP logging in admin panel logging informations
Tobias Diekershoff [Tue, 13 Sep 2016 20:52:21 +0000 (22:52 +0200)]
display current state of PHP logging in admin panel logging informations

7 years agoXMPP authentification for multi domain systems
Michael Vogel [Tue, 13 Sep 2016 20:29:47 +0000 (20:29 +0000)]
XMPP authentification for multi domain systems

7 years agoBump version
fabrixxm [Tue, 13 Sep 2016 16:52:29 +0000 (18:52 +0200)]
Bump version

7 years agoMerge branch 'master' into develop
fabrixxm [Tue, 13 Sep 2016 15:19:57 +0000 (17:19 +0200)]
Merge branch 'master' into develop

7 years agoFriendica 3.5
fabrixxm [Tue, 13 Sep 2016 14:46:11 +0000 (16:46 +0200)]
Friendica 3.5

7 years agoMerge pull request #2776 from tobiasd/20160913-installtxt
fabrixxm [Tue, 13 Sep 2016 13:48:23 +0000 (15:48 +0200)]
Merge pull request #2776 from tobiasd/20160913-installtxt

reflect requirements from install.md also in install.txt

7 years agoMerge pull request #2777 from tobiasd/20160916-fr
fabrixxm [Tue, 13 Sep 2016 13:48:07 +0000 (15:48 +0200)]
Merge pull request #2777 from tobiasd/20160916-fr

FR update to the strings, THX Damien Goutte-Gattat

7 years agoFR update to the strings, THX Damien Goutte-Gattat
Tobias Diekershoff [Tue, 13 Sep 2016 13:41:38 +0000 (15:41 +0200)]
FR update to the strings, THX Damien Goutte-Gattat

7 years agoreflect requirements from install.md also in install.txt
Tobias Diekershoff [Tue, 13 Sep 2016 12:49:21 +0000 (14:49 +0200)]
reflect requirements from install.md also in install.txt

7 years agoMerge pull request #2768 from tobiasd/20160906-changes
Michael Vogel [Mon, 12 Sep 2016 05:56:08 +0000 (07:56 +0200)]
Merge pull request #2768 from tobiasd/20160906-changes

changes since 3.4.3

7 years agomissing bracket
Tobias Diekershoff [Sun, 11 Sep 2016 06:03:12 +0000 (08:03 +0200)]
missing bracket

7 years agowork on forumdirectory
Tobias Diekershoff [Fri, 9 Sep 2016 21:22:59 +0000 (23:22 +0200)]
work on forumdirectory

7 years agoMerge pull request #2774 from annando/1609-worker-processes
Tobias Diekershoff [Fri, 9 Sep 2016 21:14:02 +0000 (23:14 +0200)]
Merge pull request #2774 from annando/1609-worker-processes

New process table for a better detection of running workers

7 years agoRestructured the way, processes are inserted and removed
Michael Vogel [Fri, 9 Sep 2016 20:55:49 +0000 (20:55 +0000)]
Restructured the way, processes are inserted and removed

7 years agoNew process table for a better detection of running workers
Michael Vogel [Fri, 9 Sep 2016 20:33:54 +0000 (20:33 +0000)]
New process table for a better detection of running workers

7 years agotwo more issues closed
Tobias Diekershoff [Fri, 9 Sep 2016 10:06:21 +0000 (12:06 +0200)]
two more issues closed

7 years agoMerge pull request #2771 from rabuzarus/0709-frio-dropItem-fix
Michael Vogel [Wed, 7 Sep 2016 04:53:53 +0000 (06:53 +0200)]
Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix

frio: fix dropItem() didn't work for hubzila posts

7 years agofrio: fix dropItem() didn't work for hubzila posts
rabuzarus [Wed, 7 Sep 2016 01:22:02 +0000 (03:22 +0200)]
frio: fix dropItem() didn't work for hubzila posts

7 years agoMerge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes
Tobias Diekershoff [Tue, 6 Sep 2016 19:52:33 +0000 (21:52 +0200)]
Merge branch '3.5rc' of https://github.com/friendica/friendica into 20160906-changes

7 years agoMerge pull request #2770 from annando/sql-default-value
Tobias Diekershoff [Tue, 6 Sep 2016 19:37:28 +0000 (21:37 +0200)]
Merge pull request #2770 from annando/sql-default-value

No "NOT NULL" for text fields in database