Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 07:33:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
10165 commits 3 branches 64 tags 246 MiB
Commit graph

10165 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tobiasd
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
tobiasd
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
tobiasd
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
tobiasd
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
tobiasd
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
hauke
0349127473 bug fix #1097 2014-09-05 23:57:17 +02:00
tobiasd
7eef05e4f5 Merge pull request #1098 from Beanow/release/profile-editor-improvements 
Profile editor improvements
 2014-09-05 22:20:31 +02:00
tobiasd
7ae14def8f Merge pull request #1095 from annando/master 
Ignore notifications (feature request #847) - database structure update should work now
 2014-09-05 22:18:53 +02:00
Beanow
992684c362 Merge branch 'feature/edit-profile-improvements' into develop 2014-09-04 23:58:22 +02:00
Michael Vogel
e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel
08df06ce60 Removed the obsolete update functions 2014-09-04 02:46:43 +02:00
Michael Vogel
24b3befc4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	update.php
 2014-09-04 02:29:12 +02:00
Michael Vogel
56f0af2067 The "ignore" feature can be disabled and enabled, the value will now be retrieved. 2014-09-04 01:27:28 +02:00
Michael Vogel
e32e458cb8 Added new file for ignoring threads 2014-09-04 01:04:43 +02:00
Michael Vogel
0e2376b457 Updated font awesome to new version 2014-09-04 01:01:39 +02:00
Michael Vogel
7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
fabrixxm
f17e6f534f Merge pull request #1093 from annando/master 
Added an alternate link to the profile in the atom feeds (feature request #925)
 2014-09-03 09:59:51 +02:00
Michael Vogel
73904bfa03 Added an alternate link to the profile in the atom feeds (feature request #925) 2014-09-03 09:52:31 +02:00
tobiasd
ae2094487b Merge pull request #1092 from annando/master 
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct text.
 2014-09-03 07:44:17 +02:00