Michael Vogel
860f11e71b
Merge pull request #2842 from tobiasd/20160929-lng
...
lang handling for #2752
2016-10-04 05:22:38 +02:00
Tobias Diekershoff
bb423ff9b4
rework fallback code
2016-10-03 21:12:47 +02:00
Michael Vogel
6d16c39b7e
dbstructure now switches in the maintenance mode when updating
2016-10-02 13:52:52 +00:00
rabuzarus
fa33f94b29
Merge pull request #2830 from annando/1610-account_type
...
The account type is now read and displayed
2016-10-02 14:55:52 +02:00
Michael Vogel
116520e733
Merge pull request #2837 from rabuzarus/0210-add-missing-at-brief
...
fix @brief in doxygen for function oembed_iframe()
2016-10-02 09:47:55 +02:00
Tobias Diekershoff
ed631ba959
fallback to generic language for specific (de-CH => de)
2016-10-02 09:26:35 +02:00
Michael Vogel
ca53881cd3
Some more explanations
2016-10-02 06:40:08 +00:00
rabuzarus
aba6f2bf27
fix @brief in doxygen for function oembed_iframe()
2016-10-02 06:04:34 +02:00
rabuzarus
8fa64c43d6
Merge pull request #2818 from Hypolite/Issue-#2813
...
Fix Issue #2813 - Double notification + wrong message for requested registrations
2016-10-02 05:14:05 +02:00
Michael Vogel
9dee3cc809
Some small changes
2016-10-01 20:20:27 +00:00
Michael Vogel
60a0235af0
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
Tobias Diekershoff
8b972510fe
with translations now in /view/lang/lng shift the array index along
2016-10-01 16:07:23 +02:00
Tobias Diekershoff
aba8313b21
don't save browser selected language on login
2016-10-01 15:57:37 +02:00
Tobias Diekershoff
82dcc3fe79
Merge pull request #2821 from Hypolite/Issue-#2817
...
Fix #2817 - Move translation language folder in a subfolder of view
2016-10-01 10:58:32 +02:00
Tobias Diekershoff
4eaa0c4892
Merge pull request #2826 from annando/1610-utf8mb4
...
Support of utf8mb4
2016-10-01 10:51:33 +02:00
Michael Vogel
40fbe1644d
Merge pull request #2824 from Hypolite/Issue-#2823
...
Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
2016-10-01 10:40:08 +02:00
Michael Vogel
f4f09f08b5
Removed unneeded line
2016-10-01 08:33:09 +00:00
Michael Vogel
efd574ab83
Support of utf8mb4
2016-10-01 08:21:37 +00:00
Hypolite Petovan
76b1b109e5
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
2016-09-30 23:26:22 -04:00
Hypolite Petovan
8fc558b8e6
Fix #2817
...
- Change all references to language folders
2016-09-30 10:46:56 -04:00
Hypolite Petovan
76382147ae
Fix Issue #2816
...
- Fix wrong variable name in Config and PConfig
2016-09-30 09:22:35 -04:00
Hypolite Petovan
f9678bb6c3
Remove extraneous comments
...
- If needed, the version control system can be used to restore this code
2016-09-30 09:22:00 -04:00
Hypolite Petovan
f0382bb159
Restore admin notification email on register approval
...
- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
2016-09-30 08:57:16 -04:00
Tobias Diekershoff
92dac133a0
Merge pull request #2815 from annando/1609-mysql
...
We should only use utf8mb4 for dumpsql and new installations
2016-09-29 09:26:17 +02:00
Michael Vogel
6b318ed304
We should only use utf8mb4 for dumpsql and new installations
2016-09-29 06:31:42 +00:00
Tobias Diekershoff
1cfcc939c0
Merge pull request #2790 from gerhard6380/develop
...
New API /api/friendica/profile/show
2016-09-28 08:11:20 +02:00
Tobias Diekershoff
4aa834564a
Merge pull request #2802 from annando/xmpp-profile
...
New fields for the DFRN protocol (XMPP and Account Type)
2016-09-27 20:57:56 +02:00
Michael Vogel
d632d282cd
We are now having an account type and are publishing it
2016-09-25 20:37:27 +00:00
gerhard6380
6c3c3a64ae
remove parameter from doxygen description
2016-09-25 22:25:59 +02:00
gerhard6380
0e8a9f93d7
another correction of spaces
2016-09-25 18:52:59 +02:00
gerhard6380
0581cbcfc8
change spaces/tabstopps
2016-09-25 18:50:08 +02:00
gerhard6380
5e1726184a
correct some spaces/tabs
2016-09-25 18:45:00 +02:00
gerhard6380
01ff105a43
correct tab indents and CRLF
2016-09-25 18:22:42 +02:00
Michael Vogel
196eb6009f
The XMPP address is now in the profile and will be transmitted
2016-09-25 15:28:00 +00:00
Tobias Diekershoff
252f1827c1
correction of typos
2016-09-24 08:08:04 +02:00
Tobias Diekershoff
1ea9df5974
correction of typos
2016-09-24 08:07:48 +02:00
gerhard6380
528a492282
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
2016-09-23 19:38:57 +02:00
gerhard6380
afc7d316a7
Change API documentation to contain new API call /api/friendica/profile/show
2016-09-23 19:26:44 +02:00
gerhard6380
4de12dacc7
New API /api/friendica/profile/show to return data of all profiles a user has to a client
2016-09-23 19:06:41 +02:00
Michael Vogel
5f9a392fc4
At the search we should do it as well.
2016-09-23 06:36:48 +00:00
Michael Vogel
6fd54df940
Some additional beautification
2016-09-22 18:18:26 +00:00
Michael Vogel
abbf501602
The string is an array ...
2016-09-22 18:07:32 +00:00
Michael Vogel
c6f50d0468
Reworked ejabberd authentification
2016-09-22 02:57:40 +00:00
Michael Vogel
4f5997f30a
XMPP authentification for multi domain systems
2016-09-13 20:29:47 +00:00
Michael Vogel
1caa87dce6
Restructured the way, processes are inserted and removed
2016-09-09 20:55:49 +00:00
Michael Vogel
22f32d9721
New process table for a better detection of running workers
2016-09-09 20:33:54 +00:00
Michael Vogel
ac1787d1e5
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
2016-09-05 11:52:41 +00:00
Michael Vogel
1cb6043aea
Attachments are now displayed again.
2016-09-04 18:06:07 +02:00
Michael Vogel
6e25077893
Merge pull request #2760 from gerhard6380/3.5rc
...
API: change friendica_activities to include arrays of users
2016-09-03 20:47:52 +02:00
Michael Vogel
6df40b1161
sQL: No "NOT NULL" on text fields.
2016-09-03 15:06:42 +00:00
Tobias Diekershoff
