tobias/friendica
1
0
Fork 0
Code Pull requests Activity
13025 commits 2 branches 61 tags 203 MiB
Commit graph

13025 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff 20e10a50c0 Merge pull request #2847 from rabuzarus/0510-frio-edit-profile-button 
frio: provide a edit profile button for the advanced profile page
 2016-10-05 18:34:06 +02:00
Michael Vogel aca6f63985 Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo 2016-10-05 16:19:42 +00:00
Michael Vogel 5fb2e47809 Increased performance when storing items 2016-10-05 16:12:53 +00:00
rabuzarus 88cef50aa2 frio: provide a edit profile button for the advanced profile page 2016-10-05 18:07:58 +02:00
Tobias Diekershoff eedeb3d588 Merge pull request #2846 from rabuzarus/0410-js-account-type 
show/hide page-flags according to the account-type
 2016-10-05 15:07:14 +02:00
rabuzarus 2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Hypolite Petovan c1611fd3f6 Fix Issue #2816 - Add backward compatible server_info support 2016-10-04 23:43:44 -04:00
Michael Vogel 95d2a7ae7a Merge pull request #2844 from tobiasd/20161004-de 
DE update to the translation
 2016-10-04 11:29:26 +02:00
Tobias Diekershoff 173bb74522 Merge pull request #2843 from annando/1610-gcontact-type 
The account type is now distributed via poco as well
 2016-10-04 09:29:31 +02:00
Tobias Diekershoff aab6ec0ede DE update to the translation 2016-10-04 07:59:35 +02:00
Michael Vogel 87300b2b49 When we have the field, we should use it :) 2016-10-04 03:58:47 +00:00
Michael Vogel 5f9f3b3570 Added the database field to database.sql 2016-10-04 03:53:31 +00:00
Michael Vogel 8cde8b375b Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type 2016-10-04 03:52:22 +00:00
Michael Vogel 66bec9475d Improved queries for the nodeinfo functionality and the admin page 2016-10-04 03:51:13 +00:00
Michael Vogel 095fa872ed Contact Type is now transmitted via poco 2016-10-04 03:48:01 +00:00
Michael Vogel 860f11e71b Merge pull request #2842 from tobiasd/20160929-lng 
lang handling for #2752
 2016-10-04 05:22:38 +02:00
Hypolite Petovan a052fe4a98 Fix Issue #2816 - MySQL version typo 2016-10-03 19:17:40 -04:00
Hypolite Petovan 0e8ae82a5c Fix Issue #2816 - Add MySQL version condition for IGNORE 
- Checks for MySQL version before adding the IGNORE keyword on index
creation
- Added new dryrun command to usage text
 2016-10-03 19:06:47 -04:00
Hypolite Petovan b3ac6189b3 Merge remote-tracking branch 'friendica/develop' into Issue-#2816-2 2016-10-03 19:04:57 -04:00
Tobias Diekershoff bb423ff9b4 rework fallback code 2016-10-03 21:12:47 +02:00
Hypolite Petovan d9a5554543 Fix Issue #2822 - Add new setting to user settings page 
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
 2016-10-02 15:25:10 -04:00
Hypolite Petovan 08a30bc1c6 Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting 
- Fix formatting according to PSR-2
- Add bandwitdh_saver setting check before replacing with "Embedded
content - Please reload"
 2016-10-02 15:23:05 -04:00
Hypolite Petovan 4021109696 Improve field_checkbox.tpl 
- Adds a hidden field to ensure the checkbox item will have a value
during save.
- Fix quotes for HTML attribute values
 2016-10-02 15:21:20 -04:00
Hypolite Petovan 72521cd9c8 Fix Issue #2816 - Change new database version number 2016-10-02 13:16:31 -04:00
rabuzarus 32f49b4de2 Merge pull request #2838 from annando/1610-dbstructure-maintenance 
dbstructure now switches in the maintenance mode when updating
 2016-10-02 16:21:35 +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
Tobias Diekershoff 2d450abd3b Merge pull request #2831 from annando/1610-fix-utf8mb4 
Little fix to the utf8mb4-fix: Now here's the changed database.sql
 2016-10-02 09:54:10 +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
Hypolite Petovan 28d13f8060 Fix Issue #2816 - Update database.sql 2016-10-02 00:25:07 -04:00
rabuzarus aba6f2bf27 fix @brief in doxygen for function oembed_iframe() 2016-10-02 06:04:34 +02:00
rabuzarus b59f8fe9e0 Merge pull request #2834 from Hypolite/Issue-#2800 
Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
 2016-10-02 05:50:10 +02:00
Hypolite Petovan 3f619726b1 Fix Issue #2816 - Update dbstructure instead of update 
- Add UNIQUE index support to `update_structure()`
- Move DB update from `update.php` to `dbstructure.php`
- Update DB_VERSION to 1210
 2016-10-01 23:29:30 -04: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
Hypolite Petovan 3c85fb8c9a Fix Issue #2816 
- Change (P)Config::set to use INSERT >>> ON DUPLICATE KEY UPDATE
- Add DB update
 2016-10-01 21:40:41 -04:00
Hypolite Petovan 0094dd8240 Remove repeated comment in frio notification template 2016-10-01 19:03:32 -04:00
Hypolite Petovan 4242c3f749 Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode 
- Add link switch prevention to frio theme
- Add reference to the script page
 2016-10-01 18:53:25 -04:00
Hypolite Petovan f302f66dcd Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode 
Add a event delegation to keep internal links inside the standalone
window.

Fixes 1. of #2800
 2016-10-01 18:19:43 -04:00
Michael Vogel 2a93c5b816 Little fix to the utf8mb4: Now here's the changed database.sql 2016-10-01 20:27:49 +00: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 bbfa7cac0f Merge pull request #2829 from rabuzarus/0110-frio-codeblock-css-line-height 
frio: improve readabillity for code blocks
 2016-10-01 21:31:48 +02:00
rabuzarus 21b3037342 frio: improve readabillity for code blocks 2016-10-01 21:16:23 +02:00
Michael Vogel 3e31b2c81a Merge pull request #2828 from tobiasd/20161001-availlang 
with translations now in /view/lang/lng shift the array index along
 2016-10-01 20:48:22 +02: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 5cfca894c1 On registration use the browser preferred language for the new account 2016-10-01 15:55:56 +02:00
Tobias Diekershoff 7aa4f5297d when the admin creates a new account, use the system language for this accounts 2016-10-01 15:55:18 +02:00