Michael Vogel
d55275f211
GUID should be urlencoded in template since it is urlencoded in uri as well.
2015-07-11 14:37:02 +02:00
Michael Vogel
bc6e5a4f2d
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
2015-07-06 17:35:48 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
fabrixxm
5a1bb9866d
Merge branch '3.4.1'
2015-07-06 14:52:23 +02:00
Tobias Diekershoff
13bbfd188f
Merge pull request #1737 from fabrixxm/changelog
...
small updates to CHANGELOG
2015-07-06 14:36:08 +02:00
fabrixxm
fb966a7d1a
small updates to CHANGELOG
2015-07-06 14:32:40 +02:00
Michael Vogel
bd3f877721
Merge pull request #1736 from fabrixxm/changelog
...
Update Changelog and version
2015-07-06 14:28:20 +02:00
fabrixxm
bc4b374f04
fix typos in changelog
2015-07-06 14:19:21 +02:00
Fabrixxm
c03c06cf30
Update version
2015-07-06 12:49:43 +02:00
Fabrixxm
e54414692e
Update CHANGELOG
2015-07-06 12:48:57 +02:00
Michael Vogel
d6d51e0259
Don't deliver answers to OStatus messages to Diaspora
2015-07-05 16:27:03 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +02:00
Michael Vogel
43f98bc854
When posting to Diaspora, now the contact names are containing the link to the user profile.
2015-07-04 23:49:52 +02:00
Tobias Diekershoff
08f276f87b
Merge pull request #1724 from rabuzarus/theme_uid
...
fix mobile-view
2015-07-04 07:14:24 +02:00
fabrixxm
75998b62de
Merge pull request #1726 from rabuzarus/acl-var
...
fix for #1725
2015-07-02 12:13:14 +02:00
rabuzarus
b827c2e805
inlude jotnets for bookmark acl
2015-07-02 12:09:40 +02:00
rabuzarus
a0b522c3be
fix toggle mobile/desktop view
2015-07-02 02:55:03 +02:00
rabuzarus
7c3af0d3ed
fix for mobile-view on system pages
2015-07-02 02:15:36 +02:00
rabuzarus
92a7a62608
fix mobile-view
2015-07-01 16:22:08 +02:00
Tobias Diekershoff
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
836058c477
Added help text
2015-07-01 00:41:04 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
Tobias Diekershoff
7b35e565d6
Merge pull request #1721 from rabuzarus/settings_translate
...
system settings is now a variable in settings_display.tpl
2015-06-30 20:19:43 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
fabrixxm
bafb436c48
Merge pull request #1719 from tobiasd/20150630-de
...
update translations for DE and IT
2015-06-30 10:01:26 +02:00
Tobias Diekershoff
b8f99f459b
DE update to the strings
2015-06-30 09:45:05 +02:00
Tobias Diekershoff
d4fa6ccfe8
IT update to the strings
2015-06-30 09:44:53 +02:00
fabrixxm
cca29f7819
Merge pull request #1711 from fabrixxm/lang
...
Update messages.po
2015-06-30 08:44:49 +02:00
Fabrixxm
2c8a70db58
update util/messages.po
2015-06-30 08:44:16 +02:00
Fabrixxm
de51cd5e65
Merge branch 'develop' into lang
2015-06-30 08:43:02 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm
97161413e7
Merge pull request #1714 from annando/1506-mail-link-profile
...
Show preselected mail receivers
2015-06-30 08:37:40 +02:00
fabrixxm
7a0f2b61ab
Merge pull request #1713 from annando/1506-ostatus-completion-timeframe
...
There is now two different checks for the completion of conversations
2015-06-30 08:36:33 +02:00
fabrixxm
76737fbf7b
Merge pull request #1712 from annando/1506-ostatus-guid
...
OStatus: Use the GUID format for the link to the item
2015-06-30 08:35:33 +02:00
fabrixxm
f121184158
Merge pull request #1716 from annando/1506-no-googlemap
...
Removed Google Maps
2015-06-30 08:27:59 +02:00
fabrixxm
511b4566b2
Merge pull request #1717 from annando/1506-ostatus-ignore-delete
...
OStatus: By using Qvitter, users can delete items.
2015-06-30 08:27:03 +02:00
Michael Vogel
06d446595e
OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it.
2015-06-30 08:08:02 +02:00
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +02:00
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +02:00
Michael Vogel
ab074e200b
Mail link in profile page
2015-06-29 22:54:26 +02:00
Michael Vogel
bffe35ab71
There is now two different checks for the completion of conversations
2015-06-29 21:53:59 +02:00
Michael Vogel
fcb3cbffe4
OStatus: Use the GUID format for the link to the item
2015-06-29 21:49:42 +02:00
Fabrixxm
1cc104af70
update util/messages.po
2015-06-29 15:59:28 +02:00
Fabrixxm
03d30983f6
Add new option "-s" to run_xgettext. Fix paths.
...
with this option, current directory is scanned for strings, and message.po is saved in lang/C subdir.
This is usefull when developing new addons outside from friendica tree.
2015-06-29 15:58:48 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
fabrixxm
1a1c2d74f6
Merge pull request #1698 from rabuzarus/identity
...
move some identity related functions to identity.php
2015-06-29 13:52:07 +02:00
fabrixxm
17514e0d68
Merge pull request #1703 from rabuzarus/readable_bytes
...
show maximagesize warning in a human readable format
2015-06-29 13:50:55 +02:00
fabrixxm
6c5b4b96a5
Merge pull request #1710 from rabuzarus/deactivate_log
...
deactivate logger in acl_lookup
2015-06-29 13:48:42 +02:00
rabuzarus
eedf829d5c
deactivate logger in acl_lookup
2015-06-29 13:46:47 +02:00
rabuzarus
68e565889d
moved formatBytes() to /include/text.php
2015-06-29 11:22:29 +02:00
Tobias Diekershoff
