Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 04:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
12915 commits 3 branches 64 tags 246 MiB
Commit graph

12915 commits

This branch
This branch
All branches
Author SHA1 Message Date
rabuzarus
967c3b3deb frio: events - don't show author name if there is no author name 2016-10-17 22:51:51 +02:00
rabuzarus
430ffb792e frio: stop the custom cal rendering (if no author-name exist) only for the modes agendaWeek and agendaDay 2016-10-17 22:14:12 +02:00
rabuzarus
88f1affb2f quattro: fix events_reminder 2016-10-17 18:57:21 +02:00
rabuzarus
8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
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
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
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
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
Tobias Diekershoff
bb423ff9b4 rework fallback code 2016-10-03 21:12:47 +02: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
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
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
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
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
Tobias Diekershoff
894b4286f5 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
 2016-10-01 10:37:10 +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
rabuzarus
9f17b925c6 Merge pull request #2819 from Hypolite/Issue-#2814 
Fix #2814
 2016-09-30 17:47:01 +02:00
Hypolite Petovan
8fc558b8e6 Fix #2817 
- Change all references to language folders
 2016-09-30 10:46:56 -04:00
Hypolite Petovan
5a5284b94e Fix #2817 
- Move translation folders under `view/lang`
 2016-09-30 10:45:47 -04:00