1
0
Fork 0
Commit graph

3273 commits

Author SHA1 Message Date
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