Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 00:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
10243 commits 3 branches 64 tags 237 MiB
Commit graph

3451 commits

Author SHA1 Message Date
rabuzarus
c01dbc274c fix remote-link button in vier 2015-06-11 02:49:09 +02:00
Michael Vogel
a2ae4ccc9b Merge pull request #1636 from rabuzarus/albums_widget 
make use of global.css
 2015-05-31 18:04:40 +02:00
rabuzarus
afd1e0e6d0 make use of global.css 2015-05-31 13:55:21 +02:00
fabrixxm
1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget 
move html to photo_albums.tpl
 2015-05-31 10:07:43 +02:00
Michael Vogel
2550e02399 Merge pull request #1627 from rabuzarus/section-title 
move html of h2 headings to section_title.tpl
 2015-05-31 09:52:46 +02:00
Michael Vogel
b778467121 Merge pull request #1620 from tobiasd/20150529-de 
DE update to the strings
 2015-05-31 01:05:11 +02:00
rabuzarus
74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
rabuzarus
553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus
5cbb5b140c css work 2015-05-29 16:08:17 +02:00
Tobias Diekershoff
9a22b4818e Merge pull request #1618 from rabuzarus/vcard 
remove html and make use of vcard-widget.tpl
 2015-05-29 08:52:27 +02:00
Tobias Diekershoff
ffefc512d3 DE update to the strings 2015-05-29 08:46:40 +02:00
rabuzarus
415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
fabrixxm
b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574 
Issue #1574
 2015-05-27 11:07:30 +02:00
Tobias Diekershoff
bfcd3bbc9e CS update to the strings 2015-05-27 09:58:20 +02:00
rabuzarus
15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus
f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
rabuzarus
b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
fabrixxm
8990a22dc0 duepuntozer: style video delete button 2015-05-24 10:35:55 +02:00
fabrixxm
d204e2524b vier: style video delete button 2015-05-24 10:34:17 +02:00
fabrixxm
646ea377ac quattro: readd video delete button styles 
because i'm not so good at resolving merge conflicts...
 2015-05-24 10:28:15 +02:00
fabrixxm
b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm
4554526515 Merge pull request #1570 from rabuzarus/archive-widget 
port of red matrix archive widget
 2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d Merge pull request #1598 from rabuzarus/datepicker 
new datetimepicker for event creation
 2015-05-24 10:16:29 +02:00
fabrixxm
7c2608e07d quattro: style video delete button 2015-05-23 22:51:34 +02:00
fabrixxm
83697cf3e5 Delete attachments on item deletion 
Delete video from videos page
 2015-05-23 22:35:02 +02:00
fabrixxm
3cb4f91807 Merge pull request #1596 from rabuzarus/event-preview 
event preview for frost theme
 2015-05-23 20:15:10 +02:00
fabrixxm
dd9f4439ce update IT 2015-05-23 20:08:57 +02:00
rabuzarus
5e6c140fc1 add double click on calendar day for frost theme 2015-05-23 20:02:57 +02:00
rabuzarus
6731ffbfc8 event preview for frost theme 2015-05-23 19:23:32 +02:00
rabuzarus
3504b3b94f make frost + frost-mobile work with datepicker 2015-05-23 18:49:56 +02:00
rabuzarus
76283ff205 cleanup quattro less file 2015-05-23 17:50:18 +02:00
rabuzarus
9c803f7dbb quattro css changes added to the less file 2015-05-23 17:45:44 +02:00
Michael Vogel
41d5e89f50 Merge pull request #1592 from tobiasd/20150522-de 
DE update to the strings
 2015-05-23 09:21:05 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff
a9fa049659 DE update to the strings 2015-05-22 16:58:16 +02:00
Tobias Diekershoff
0f0e570aa0 NL update to the strings 2015-05-21 19:03:28 +02:00
fabrixxm
dbafc917c2 update IT 2015-05-21 10:54:03 +02:00
fabrixxm
8bbffe0a54 update IT 2015-05-21 10:50:29 +02:00
rabuzarus
101804d505 minor polishing 2015-05-19 01:07:40 +02:00
rabuzarus
30348a1bc0 port of red matrix archive-widget 2015-05-19 01:03:08 +02:00
Tobias Diekershoff
d4cb18538e PT-BR: update to the strings 2015-05-16 07:41:40 +02:00
Tobias Diekershoff
9575fd4a73 Merge pull request #1560 from rabuzarus/add_event 
Double click on day in calendar creats new event starting that day
 2015-05-15 08:20:15 +02:00
rabuzarus
fc4a76c033 Double click on day in calendar creats new event starting that day 2015-05-15 00:07:41 +02:00
fabrixxm
cbbb5da321 Merge pull request #1558 from rabuzarus/event-preview 
Event preview
 2015-05-14 16:32:24 +02:00
rabuzarus
de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff
2dd8db7de8 Merge pull request #1554 from FlxAlbroscheit/develop-1 
Issue #1504: Creating groups directly from the sidebar in contacts-page
 2015-05-13 19:59:58 +02:00
FlxAlbroscheit
4667d0e7e8 Add a group with one click 2015-05-12 14:09:51 +02:00
Michael Vogel
237b5a6e40 New page setting for the maximum frontend load value. 2015-05-02 22:05:04 +02:00
Michael Vogel
b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. 2015-04-30 06:12:21 +02:00
Tobias Diekershoff
e9dd3b38f3 DE update to the strings 2015-04-25 11:18:30 +02:00
Tobias Diekershoff
14d61b5644 FR update of the strings 2015-04-14 13:41:56 +02:00
Tobias Diekershoff
60a17ef88e CS update of the strings 2015-04-14 13:40:24 +02:00
Michael Vogel
1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update 
Conflicts:
	mod/contacts.php
 2015-04-12 09:59:28 +02:00
Michael Vogel
2c3e2908b2 There is now a new possibility to update contact data. 2015-04-11 23:51:47 +02:00
Michael Vogel
26eceaacbe Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-09 19:49:57 +02:00
Michael Vogel
f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Tobias Diekershoff
4ad52a417a DE update to the strings 2015-04-08 12:06:05 +02:00
Michael Vogel
3195157b2e Merge pull request #1499 from tobiasd/20150407_lng 
CS, FR update to the strings
 2015-04-07 19:08:30 +02:00
Johannes Schwab
107b495183 fix infinite scrolling with frost-mobile 2015-04-07 13:26:09 +02:00
Tobias Diekershoff
7ecc401b5c FR update of the strings 2015-04-07 09:07:04 +02:00
Tobias Diekershoff
52549dae7b CS update to the strings 2015-04-07 09:00:12 +02:00
Tobias Diekershoff
106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop 
Issue 1163: Feature allowing desktop-notifications
 2015-04-05 11:37:05 +02:00
Tobias Diekershoff
415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
Tobias Diekershoff
33952e5f1d DE update to the strings 2015-04-02 18:23:27 +02:00
FlxAlbroscheit
f054dbfc8d Feature for desktop-notifications 2015-03-31 02:11:46 +02:00
Tobias Diekershoff
0309c481a3 updating the core translation 2015-03-30 09:21:01 +02:00
Tobias Diekershoff
dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop 
Access a contact directly from the contact-manager-page
 2015-03-12 07:13:31 +01:00
FlxAlbroscheit
82359bb6cc Give access to contact's profile-URL 2015-03-10 22:47:38 +01:00
Michael Vogel
2eba5a32df New screenshot for "vier". 2015-03-09 23:21:40 +01:00
Michael Vogel
08696acb18 Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags 2015-03-08 03:23:49 +01:00
Michael Vogel
67d39770ed Improved the margins of the headers 2015-03-07 21:12:18 +01:00
Tobias Diekershoff
96a5257d9c RO: update to the strings 2015-03-05 22:48:50 +01:00
Michael Vogel
52e33d50ad Changing header sizes and changing the header type of oembed data. 2015-03-01 21:58:31 +01:00
Michael Vogel
da49814cbb Use a header element for the oembed data. 2015-03-01 21:24:10 +01:00
Michael Vogel
bf0f7c3d0a New bbcode elements h1 to h6 for a better conversion of Diaspora content 2015-03-01 20:07:56 +01:00
fabrixxm
eb1f21d1e5 Merge pull request #1412 from annando/1502-vier-plus-default 
"plus" is now the default style at "vier" for new installations
 2015-02-23 08:51:31 +01:00
Michael Vogel
f3cc065e66 Show the profile visibility only for Friendica contacts. 2015-02-21 20:03:02 +01:00
Michael Vogel
19af382ffb "plus" is now the default style at "vier" for new installations 2015-02-21 09:44:13 +01:00
Michael Vogel
8179f2f65e Only show the relation on native networks. 2015-02-20 23:56:41 +01:00
Michael Vogel
a8a37a35db Only show the options that fit to the current network. 2015-02-20 23:12:04 +01:00
Michael Vogel
7e42315d9c Merge pull request #1408 from tobiasd/issue885 
decreasing bubble display time in themes from 10s to 5s
 2015-02-19 23:02:55 +01:00
Tobias Diekershoff
985d771b13 decreasing bubble display time in themes from 10s to 5s 2015-02-19 21:24:09 +01:00
Michael Vogel
4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. 2015-02-18 23:40:46 +01:00
Fabrixxm
b7a50a24c7 Merge branch 'release-3.3.3' into develop 2015-02-18 08:38:06 +01:00
Michael Vogel
4b7ff42a89 Bugfix: See issue 1338 2015-02-17 19:48:02 +01:00
Michael Vogel
a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-17 19:18:17 +01:00
Michael Vogel
52de6c11b1 There is now a link to the profile behind the avatar picture on the display page 2015-02-17 17:33:28 +01:00
Fabrixxm
9d3fb417c2 Escape values to input fields (and some 'title' and 'alt') 2015-02-16 09:30:12 +01:00
Johannes Schwab
9f4523dc9a fix infinite scrolling with frost 2015-02-13 01:21:57 +01:00
Johannes Schwab
12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Tobias Diekershoff
e3b6770ad4 CS, ZH-CN: update to the strings 2015-02-12 07:59:21 +01:00
Tobias Diekershoff
400e11fd9f ZH-CN update to the strings 2015-02-10 07:47:26 +01:00
Tobias Diekershoff
4e4702fb8b CS, IT: update to the strings 2015-02-09 19:53:35 +01:00
Fabrixxm
f4f0f2bbc7 update IT strings 2015-02-09 11:55:14 +01:00
Tobias Diekershoff
93cb464d79 DE update to the strings 2015-02-09 11:19:56 +01:00
Michael Vogel
21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
Tobias Diekershoff
18cfb5e726 Merge pull request #1377 from tobiasd/20150209cs 
CS update to the strings
 2015-02-09 08:45:48 +01:00
Tobias Diekershoff
898d4b2a62 CS update to the strings 2015-02-09 07:57:03 +01:00
Michael Vogel
842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +01:00
Michael Vogel
7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel
8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default 
Conflicts:
	mod/admin.php
 2015-02-08 13:26:28 +01:00
Tobias Diekershoff
b4dc344f9c Merge pull request #1374 from annando/1502-noscrape-always-active 
Noscrape is now enabled all the time
 2015-02-08 12:48:13 +01:00
Tobias Diekershoff
1418d6bc27 Merge pull request #1373 from annando/1502-bugfix-admin-aside 
Bad HTML in the admin side menu for webfinger and probe
 2015-02-08 12:47:46 +01:00
Michael Vogel
1781fbff13 Bad HTML in the admin side menu for webfinger and probe 2015-02-08 12:12:19 +01:00
Michael Vogel
f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel
1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Tobias Diekershoff
cea445de2e FR update for the strings 2015-02-08 10:44:47 +01:00
Tobias Diekershoff
5aba3abfc1 CS DE FR: update to the strings 2015-02-05 11:06:23 +01:00
Tobias Diekershoff
485432e734 FR: some more updates to the strings 2015-02-04 11:54:13 +01:00
Tobias Diekershoff
14dec94d33 DE FR: update to the strings 2015-02-04 11:41:06 +01:00
Michael Vogel
f5ec5a4349 Some diabook features can dramatically slow down the system. There is a new switch to disable this. 2015-02-03 19:59:47 +01:00
Tobias Diekershoff
09b90244c3 Merge pull request #1344 from annando/1502-new-vier-version 
New version for "Vier"
 2015-02-02 21:50:54 +01:00
Michael Vogel
9c0dc86eea Merge pull request #1342 from tobiasd/20150202_admin 
added diagnostics tools to the admin side panel
 2015-02-02 21:14:41 +01:00
Michael Vogel
dbe52c74b5 Added Beanow as author, since he did most of the last changes. 2015-02-02 21:03:14 +01:00
Michael Vogel
9f0e19762e New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow! 2015-02-02 21:00:32 +01:00
Tobias Diekershoff
8a17c3d348 added diagnostics tools to the admin side panel 2015-02-02 18:26:38 +01:00
Michael Vogel
1fb79a1a59 Merge pull request #1333 from tobiasd/20150131_ptbr 
PT-BR: update to the strings
 2015-02-01 16:40:24 +01:00
Silke Meyer
c90e47556a added setting for server's sender email address 2015-01-31 15:54:12 +01:00
Tobias Diekershoff
ac86aa5822 PT-BR: update to the strings 2015-01-31 08:42:36 +01:00
fabrixxm
147413507b Merge pull request #1320 from tobiasd/20150127adminpanel 
add links to the plugin config pages for active plugins
 2015-01-28 08:24:29 +01:00
Tobias Diekershoff
3df7370fa8 add links to the plugin config pages for active plugins 2015-01-27 14:34:11 +01:00
Michael Vogel
6a34210353 Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list 2015-01-27 10:20:00 +01:00
Michael Vogel
848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
fabrixxm
44df625bad Merge pull request #1305 from tobiasd/20150123-quaddro 
making the ignore button in contact suggestions visible in quattro
 2015-01-25 11:59:17 +01:00
fabrixxm
174d78c768 Merge pull request #1317 from tobiasd/20150125cs 
CS update to the strings
 2015-01-25 11:55:22 +01:00
Tobias Diekershoff
fc62c329c5 Merge pull request #1316 from annando/issue-1197 
Issue 1197: New hook for "oembed_fetch_url"
 2015-01-25 08:23:52 +01:00
Tobias Diekershoff
5cb3a0fced CS update to the strings 2015-01-25 08:21:55 +01:00
Michael Vogel
cb9196f6d6 Issue 1197: New hook for "oembed_fetch_url" 2015-01-25 00:58:51 +01:00
Tobias Diekershoff
a33ca89bb7 adding missing styling to the ignore button in quattro 2015-01-24 07:22:55 +01:00
Tobias Diekershoff
c5b8956730 FR update to the strings 2015-01-24 07:05:55 +01:00
Tobias Diekershoff
619f2a86f3 DE update to the strings 2015-01-24 07:05:42 +01:00
Tobias Diekershoff
d3bb944700 making the ignore button in contact suggestions visible in quattro 2015-01-23 09:51:24 +01:00
Michael Vogel
ed037124b3 Merge pull request #1299 from fabrixxm/optional-text-only-email 
Optional text only email
 2015-01-20 23:26:44 +01:00
fabrixxm
b2527039b7 add text-only email option 
add a checkbok to notification settings. if checked, html body is not added to email.
 2015-01-20 19:19:58 +01:00
Tobias Diekershoff
c5200f9327 profile edit homepage field type URL 2015-01-19 08:15:20 +01:00
Tobias Diekershoff
d58bac1138 template for password now support required and autofocus 2015-01-16 19:36:09 +01:00
Tobias Diekershoff
8b20af6ef5 template for input fields now supports required, autofocus and types email, url 2015-01-16 19:31:23 +01:00
Tobias Diekershoff
a21fe4059b Merge pull request #1285 from annando/1501-enhanced-poco 
"location" and "about" for contacts, improved suggestions, improved contacts exchange
 2015-01-09 08:37:05 +01:00
Michael Vogel
b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Tobias Diekershoff
b0ffe11b21 add thread un/ignore functionality to quattro theme 2015-01-05 09:05:27 +01:00
Tobias Diekershoff
882f9c83d6 FR update to the strings 2015-01-02 08:26:08 +01:00
Tobias Diekershoff
32400f5127 FR IT update to the strings 2014-12-31 12:41:00 +01:00
Tobias Diekershoff
e24f97de43 FR update to the strings 2014-12-30 09:04:35 +01:00
hauke
a72d60f481 Added h-card and functionality for IndieAuth/Web-sign-in 2014-12-28 15:48:24 +01:00
Rabuzarus
432cf6f2ce insert new line at the end 2014-12-25 16:31:52 +01:00
Rabuzarus
73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
tobiasd
dcd78603d3 Merge pull request #1243 from tobiasd/20141212 
RO and FR: update to the core strings
 2014-12-14 07:56:18 +01:00
Michael Vogel
8b433c2d11 Vier: New style "dark" 2014-12-13 23:13:34 +01:00
Tobias Diekershoff
f02435408c RO and FR: update to the core strings 2014-12-12 19:01:08 +01:00
Silke Meyer
f493252ac8 Use a sans-serif font-family in breathe 2014-12-06 20:05:30 +01:00