1
0
Fork 0
Commit graph

9029 commits

Author SHA1 Message Date
fabrixxm 0e628f840f send ostatus follow/share notifications via notification()
remove unused templates
2014-09-06 18:15:18 +02:00
hauke d061e1f8f2 Merge branch 'master' of https://github.com/friendica/friendica 2014-09-06 17:51:00 +02:00
Tobias Diekershoff a2ab431c4b Merge pull request #1111 from tugelbend/master
minified js files were out of date and inconsistently used.
2014-09-06 17:50:44 +02:00
hauke 56dfa7bf84 Merge branch 'master' of https://github.com/friendica/friendica 2014-09-06 17:50:32 +02:00
Tobias Diekershoff 1c8885351b Merge pull request #1110 from annando/1409-issue-1094
Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.
2014-09-06 17:48:56 +02:00
Tobias Diekershoff 2338419999 Merge pull request #1109 from tugelbend/master
Sections on setting pages fold/unfold on click
2014-09-06 17:48:02 +02:00
hauke 392b53dbf9 minified js files where out of date and inconsistently used. Removed until decision on minifying strategy 2014-09-06 17:46:31 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Michael Vogel 3b6c6d0cd9 Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it. 2014-09-06 17:22:59 +02:00
hauke 5205756898 Merge branch 'release/ui-improvements' 2014-09-06 17:02:25 +02:00
hauke 7dcf37f053 changed cursor style on settings page globally 2014-09-06 17:01:05 +02:00
hauke 25d7087d9e Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop 2014-09-06 16:55:07 +02:00
Tobias Diekershoff 0e9c8f6f1a Merge pull request #1108 from tugelbend/master
jquery update to version 1.11
2014-09-06 16:35:24 +02:00
hauke 10c72ec2f1 Merge branch 'release/jquery-update' 2014-09-06 16:24:42 +02:00
hauke 87fa2ee2af updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
fabrixxm 83df1f4583 fix italian smarty3 email templates 2014-09-06 16:12:05 +02:00
Tobias Diekershoff ca1f408f9b Merge pull request #1107 from annando/1409-issue-964
Issue 964 "Image upload from Twidere" is solved now
2014-09-06 15:57:35 +02:00
fabrixxm 16a07e6d83 cleanup multipart email sending code
remove 'EmailNotification' class and rename 'enotify' class as 'Emailer'
2014-09-06 15:52:53 +02:00
Michael Vogel f8845b6014 Issue 964 "Image upload from Twidere" is solved now 2014-09-06 15:47:45 +02:00
Tobias Diekershoff d839becb28 Merge pull request #1104 from fabrixxm/uimport_fix_avatar_urls
fix avatars urls on profile import
2014-09-06 14:52:43 +02:00
Tobias Diekershoff 267927d2dd Merge pull request #1106 from silke/frost-mobile-modifications
Frost mobile modifications
2014-09-06 14:52:12 +02:00
Silke Meyer 6369399b9f Shrink user icons in timeline to 48x48 2014-09-06 14:38:43 +02:00
Silke Meyer b9b490057a different minor modifications 2014-09-06 14:25:36 +02:00
hauke ec68e33c6b make items on settings pages fold/unfold on click 2014-09-06 13:53:23 +02:00
Tobias Diekershoff 95a481b732 Merge pull request #1103 from tobiasd/editsave
when editing a posting save it, not edit it to submit the changes
2014-09-06 12:52:37 +02:00
Tobias Diekershoff 2312b56947 when editing a posting save it, not edit it to submit the changes 2014-09-06 12:49:34 +02:00
Michael Vogel 5e3b8b3432 Creating a shadow entry for every public post and show it on the community page. 2014-09-06 12:38:06 +02:00
Silke Meyer 3290f6b360 Reduced height of navbar 2014-09-06 12:20:55 +02:00
Tobias Diekershoff 4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
2014-09-06 12:20:42 +02:00
Tobias Diekershoff 97a8a7b362 ZH-CN: update to the strings 2014-09-06 12:13:04 +02:00
Tobias Diekershoff d0b1f0f5ba RO: update to the strings 2014-09-06 12:12:38 +02:00
Tobias Diekershoff dd65b06ecf PT-BR: update to the strings 2014-09-06 12:12:19 +02:00
Tobias Diekershoff 4571670e4f PL: update to the strings 2014-09-06 12:11:59 +02:00
Tobias Diekershoff b948dca729 NL: update to the strings 2014-09-06 12:11:44 +02:00
Tobias Diekershoff c0e9e1849a NB-NO: update to the strings 2014-09-06 12:11:00 +02:00
Tobias Diekershoff 70031d8d3e IT: update to the strings 2014-09-06 12:10:36 +02:00
Tobias Diekershoff 414451cdad IS: update to the strings 2014-09-06 12:09:08 +02:00
Tobias Diekershoff 57f3ccc967 RU: update to the strings 2014-09-06 12:08:48 +02:00
Tobias Diekershoff cb0a2b3d35 FR: update to the strings 2014-09-06 12:08:20 +02:00
Tobias Diekershoff ebbaedb97d ES: update to the strings 2014-09-06 12:08:02 +02:00
Tobias Diekershoff d283ed4f51 EO: update to the strings 2014-09-06 12:07:45 +02:00
Tobias Diekershoff 6ddfaaae82 DE: update to the strings 2014-09-06 12:07:13 +02:00
Tobias Diekershoff e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
Tobias Diekershoff 582b90613b CS: update to the strings 2014-09-06 12:05:25 +02:00
Tobias Diekershoff fe8a5a93b4 BG: update to the strings 2014-09-06 12:04:23 +02:00
hauke 9a8d106414 fixed contact action button bar, typo correction 2014-09-06 11:49:31 +02:00
fabrixxm 325f2b1697 fix avatars urls on profile import 2014-09-06 11:29:24 +02:00
hauke 5f9845d235 make vagrant connect to the outside world on ubuntu 2014-09-06 10:39:23 +02:00
fabrixxm 6679d18826 Merge pull request #1100 from tugelbend/master
bug fix #1097
2014-09-06 10:35:40 +02:00
hauke 191595766d removed old comment that is no longer true 2014-09-06 00:14:25 +02:00