Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-20 07:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
12863 commits 2 branches 64 tags 236 MiB
Commit graph

12863 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
f4c2e2244d 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
 2016-09-29 23:46:43 -04:00
rabuzarus
21b2bfc806 Merge pull request #2805 from tobiasd/20160927-msg 
regenerated messages.po
 2016-09-29 17:35:59 +02:00
rabuzarus
835edf74b3 Merge pull request #2809 from Hypolite/frio-fix-terms 
[frio] Fix terms capitalization
 2016-09-29 12:40:23 +02: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
b0133ad11f Merge pull request #2812 from Hypolite/fix-browser-notifications 
Add HTML entity decoding to browser notifications
 2016-09-29 07:40:59 +02:00
Hypolite Petovan
62a2d0603d Add HTML entity decoding to browser notifications 2016-09-28 23:17:49 -04:00
Hypolite Petovan
a05a425448 [frio] Capitalize Jot tabs title 
- Revert translation term change for "permissions"
 2016-09-28 21:09:03 -04:00
Hypolite Petovan
24969d79d8 [frio] Capitalize dropdown menu links 2016-09-28 20:59:54 -04:00
Hypolite Petovan
b99b0ad931 [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
 2016-09-28 20:53:25 -04:00
Hypolite Petovan
34acfa1706 [frio] Fix whitespace style.css 2016-09-28 20:51:56 -04:00
rabuzarus
af3a672570 Merge pull request #2807 from Hypolite/frio-larger-view-develop 
[frio] Changes to shared post display (width, base font size)
 2016-09-28 20:32:11 +02:00
Hypolite Petovan
ed5e46892d Set block quote size to current text-size 2016-09-28 14:25:41 -04:00
Hypolite Petovan
7de64afc45 Fix abnormal font size for shared posts 
- Use normal font size for shared content
 2016-09-28 14:01:12 -04:00
Hypolite Petovan
f64bd451ca [frio] Increase available width for shared content 
- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content
 2016-09-28 13:08:58 -04:00
Hypolite Petovan
01a8671b66 Revert "[frio] Increase center column width" 
This reverts commit 0c383ad9ff.
 2016-09-28 12:58:44 -04:00
Hypolite Petovan
37b4b0205d [frio] Remove shared content horizontal margins 2016-09-28 11:59:54 -04:00
Hypolite Petovan
0c383ad9ff [frio] Increase center column width 
- Added two Bootstrap divisions to the center column
 2016-09-28 11:59:05 -04: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
39e2be54c4 regenerated messages.po 2016-09-27 21:36:27 +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
629dce0268 Documentation added 2016-09-27 18:29:50 +00:00
Michael Vogel
2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00: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
rabuzarus
2d983ea634 Merge pull request #2797 from tobiasd/20160924-de 
DE update to the translation
 2016-09-24 14:51:16 +02:00
Tobias Diekershoff
89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
rabuzarus
7b357843be Merge pull request #2795 from tobiasd/20160924-fr 
FR update to the strings, THX Hypolite Petovan
 2016-09-24 09:52:33 +02:00
rabuzarus
f094864d70 Merge pull request #2796 from tobiasd/20160924-msg 
regenerated messages.po to fix typos
 2016-09-24 09:52:15 +02:00
Tobias Diekershoff
58fb593e72 regenerated messages.po to fix typos 2016-09-24 09:45:44 +02:00
Tobias Diekershoff
076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
rabuzarus
049254774c Merge pull request #2794 from tobiasd/20160924-typos 
correction of typos
 2016-09-24 08:50:12 +02: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
c0aac54827 Merge remote-tracking branch 'upstream/develop' into develop 2016-09-23 19:34: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
Tobias Diekershoff
4caaeb9978 Merge pull request #2789 from annando/1609-escaping 
Special characters should be escaped
 2016-09-23 08:46:02 +02:00
Michael Vogel
5f9a392fc4 At the search we should do it as well. 2016-09-23 06:36:48 +00:00
Michael Vogel
3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Tobias Diekershoff
4948460232 Merge pull request #2787 from annando/1609-xmpp-auth 
Reworked ejabberd authentification
 2016-09-22 23:28:46 +02:00
gerhard6380
a04100cef7 changing gitignore 2016-09-22 22:08:24 +02:00