Commit graph

11562 commits

Author SHA1 Message Date
Tobias Diekershoff
afb8c87420 regenerated master messages.po file 2015-11-08 22:26:22 +01:00
Tobias Diekershoff
096cb917fc Merge pull request #2054 from fabrixxm/vier_aside_mobile
aside bar as menu in mobile
2015-11-08 19:17:32 +01:00
fabrixxm
df866253b0 aside bar as menu in mobile 2015-11-08 19:08:00 +01:00
Tobias Diekershoff
69076b9a01 Merge pull request #2053 from annando/1511-only-supported-themes
Only show supported themes on the admin site.
2015-11-08 18:39:07 +01:00
Michael Vogel
e803e56eea Only show supported themes on the admin site. 2015-11-08 18:35:39 +01:00
Tobias Diekershoff
686ba3fcb0 Merge pull request #2052 from fabrixxm/issue_1718
duepuntozero, vier: add unread messages per group
2015-11-08 18:29:15 +01:00
fabrixxm
c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
Tobias Diekershoff
a867e3a752 Merge pull request #2050 from fabrixxm/issue_1718
quattro: add unread message count per groups
2015-11-08 17:06:05 +01:00
fabrixxm
3c1127e613 remove debug code 2015-11-08 17:04:39 +01:00
fabrixxm
d522d7095d quattro: add unread message count per groups 2015-11-08 16:55:44 +01:00
Tobias Diekershoff
e6202defd1 Merge pull request #2049 from annando/1511-only-valid-contacts
Only show valid contacts on the group page
2015-11-08 16:46:45 +01:00
Michael Vogel
1c5eaa646c Only show valid contacts on the group side 2015-11-08 16:41:00 +01:00
Tobias Diekershoff
808eaa633a Merge branch 'develop' of https://github.com/friendica/friendica into develop 2015-11-08 16:04:50 +01:00
Tobias Diekershoff
631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop
Preview the last 5 conversations in message-sidebar
2015-11-08 16:03:04 +01:00
fabrixxm
e6a8a7c8a9 Merge pull request #2048 from strk/group_post
Include per-group count of unseen items in /ping output
2015-11-08 16:01:19 +01:00
Sandro Santilli
d31c372376 Revert the rename of <groups> 2015-11-08 15:56:43 +01:00
Sandro Santilli
e28072f548 Fix bugs and rename <groups> to <group_posts> 2015-11-08 15:56:08 +01:00
FlxAlbroscheit
613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
Tobias Diekershoff
d9e56e0450 Merge pull request #2047 from annando/1511-ostatus-warning
This is a bugfix for pull request 2040
2015-11-08 15:43:53 +01:00
Sandro Santilli
ba158dfeb1 Include per-group count of unseen items in /ping output
See #1718
Unfinished work
2015-11-08 15:33:12 +01:00
Michael Vogel
ea0397b676 This is a bugfix for pull request 2040 2015-11-08 15:32:16 +01:00
Tobias Diekershoff
c0e87b2bea Merge pull request #2045 from annando/1511-dirfind-addr
You can now discover previously unknown users via the dirsearch
2015-11-08 15:19:11 +01:00
Michael Vogel
c2beab0d56 Fixed an undefined variable 2015-11-08 15:17:08 +01:00
Tobias Diekershoff
b7507a8f22 Merge pull request #2044 from fabrixxm/issue_1249
User language setting is a setting and now is between settings in settings page
2015-11-08 15:04:01 +01:00
Michael Vogel
7de6f23f4a Now it is possible to search for @http://profile... 2015-11-08 15:00:52 +01:00
Michael Vogel
e12b0d27bb You can now search for @username@domain.tld in dirfind and the search will resolve that. 2015-11-08 14:48:47 +01:00
fabrixxm
ae9c9829fa Remove language selectors from themes
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm
fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
fabrixxm
e74916d395 Merge pull request #2042 from tobiasd/develop
some icons were added to the ShaShape iconset
2015-11-08 12:44:44 +01:00
Tobias Diekershoff
5605bb6101 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2015-11-08 12:37:17 +01:00
Tobias Diekershoff
4b9fa3fb7e some icons were added to the ShaShape iconset 2015-11-08 12:33:48 +01:00
Tobias Diekershoff
44cb02f6da Merge pull request #2041 from fabrixxm/issue_1991
File and Image dialog fixes
2015-11-08 12:18:16 +01:00
Tobias Diekershoff
baf8eb5081 Merge pull request #2040 from annando/issue-2038
Bugfix for non working pagination in GNU Social
2015-11-08 12:13:07 +01:00
fabrixxm
24d807221b Image filebrowser dialog links images to image page
fix #1991
2015-11-08 12:05:23 +01:00
fabrixxm
0363bab040 js: add new Dialog object
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
2015-11-08 12:01:19 +01:00
Michael Vogel
27b166caf6 Bugfix for not working pagination in GNU Social 2015-11-08 11:10:20 +01:00
Tobias Diekershoff
e4b2ef84b1 Merge pull request #2039 from silke/docs-de
Neue Version der SSL-Hilfe auf deutsch
2015-11-08 10:30:09 +01:00
Silke Meyer
79402e41c7 Updated German translation 2015-11-08 10:21:13 +01:00
Silke Meyer
9cc668d5be fixed typo 2015-11-08 10:13:38 +01:00
Tobias Diekershoff
50b3232bb0 Merge pull request #2037 from fabrixxm/issue_2022
Not current theme settings in admin page
2015-11-07 21:25:52 +01:00
fabrixxm
28a8c2369a Not current theme settings in admin page
fix #2022
2015-11-07 21:22:55 +01:00
Tobias Diekershoff
4126f9ab51 Merge pull request #2036 from silke/docs
Docs
2015-11-07 20:59:01 +01:00
Silke Meyer
f6d1205b04 Updated content. 2015-11-07 20:43:04 +01:00
Tobias Diekershoff
294b4ecf5e Merge pull request #2034 from fabrixxm/issue_1986
fix the contact photo menu
2015-11-07 20:29:20 +01:00
Tobias Diekershoff
882e10c6e1 Merge pull request #2032 from fabrixxm/cron_update_suggestions
cron: move update_suggestions in separated thread
2015-11-07 20:27:53 +01:00
FlxAlbroscheit
06676e7c1b Preview last five conversations in message-sidebar 2015-11-07 18:57:40 +01:00
FlxAlbroscheit
1b2349d011 Preview last five conversations in message-sidebar 2015-11-07 18:56:05 +01:00
FlxAlbroscheit
a8c033a7f6 Preview last five conversations in message-sidebar 2015-11-07 18:55:13 +01:00
FlxAlbroscheit
603dad93f3 Preview last five conversations in message-sidebar 2015-11-07 18:54:20 +01:00
FlxAlbroscheit
14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00