Commit graph

10742 commits

Author SHA1 Message Date
009b3364e5 Merge pull request #2074 from fabrixxm/issue_2071
Use static css in install procedure
2015-11-13 12:50:41 +01:00
fabrixxm
1f76e5158b Merge pull request #2073 from annando/1511-avatar
The "self" contact avatar picture is now updated
2015-11-13 11:26:45 +01:00
Fabrixxm
6605e30cf2 pass to all templates by default 2015-11-13 10:56:37 +01:00
Fabrixxm
0a9e017d34 Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
Michael Vogel
ab1edca0be Profile photos are now having an extension 2015-11-13 10:15:30 +01:00
Michael Vogel
6ddf62bdf7 Merge remote-tracking branch 'upstream/develop' into 1511-avatar 2015-11-13 09:48:34 +01:00
Michael Vogel
c951123b76 Cleaned code 2015-11-13 09:45:15 +01:00
fabrixxm
98f524db67 Merge pull request #2067 from annando/1511-optimize-sql
Optimized SQL queries to reduce the amount of write operations
2015-11-13 09:16:52 +01:00
fabrixxm
fc0b3d58cf Merge pull request #2070 from annando/1511-local-delivery-soapbox
Local delivery of comments to soap boxes are working now
2015-11-13 09:15:56 +01:00
Michael Vogel
11905c0bec The avatar picture wasn't updated at the contact table 2015-11-13 08:45:14 +01:00
Michael Vogel
5a8d66e2d4 Just removed blanks with tabs 2015-11-12 23:34:33 +01:00
Michael Vogel
1ea82ea355 Only allow non top level posts to soap boxes 2015-11-12 21:55:33 +01:00
Michael Vogel
3648094927 Local delivery of comments to soap boxes are working now 2015-11-12 21:43:42 +01:00
dab544ab76 Merge pull request #2069 from fabrixxm/vier_aside_mobile
Vier mobile
2015-11-12 10:18:52 +01:00
fabrixxm
c81f63a5b3 vier mobile: prefixed transition in css, mobile-related javascript only on mobile 2015-11-12 09:41:04 +01:00
fabrixxm
54460bdf35 fix tab icon padding 2015-11-12 09:41:04 +01:00
fabrixxm
b3e09b817f fix menu icon, add icon to tab 2015-11-12 09:40:28 +01:00
fabrixxm
e5edd7b7db mobile friendly tabs 2015-11-12 09:40:28 +01:00
c687069709 Merge pull request #2068 from annando/1511-vier-mobile-aside
Vier-Mobile: The left menu does now appears even when scrolled down
2015-11-12 09:09:28 +01:00
Michael Vogel
c95afa525e Some SQL queries were optimized to reduce the amount of write operations. 2015-11-12 08:59:29 +01:00
Michael Vogel
31c44bd398 Vier: The left menu does now appear reliably even if the user had scrolled down. 2015-11-12 08:57:57 +01:00
Michael Vogel
37c68f6548 Merge pull request #2065 from tobiasd/20151110-shashape
ShaShape iconset
2015-11-10 21:55:15 +01:00
Michael Vogel
a320805bd9 Merge pull request #2064 from tobiasd/20151110-de
update to the DE translation by Abrax
2015-11-10 21:53:06 +01:00
d6ac6aa615 updated the CSS file for the ShaShape iconset 2015-11-10 20:34:21 +01:00
835e6c4955 new version of the ShaShape iconset 2015-11-10 20:12:16 +01:00
76adcdc031 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2015-11-10 20:10:20 +01:00
37e1c916db update to the DE translation by Abrax 2015-11-10 20:02:19 +01:00
fabrixxm
a718b0db21 Merge pull request #2062 from annando/1511-vier-fonts
Vier: Make it look more beautiful under Linux
2015-11-10 16:31:41 +01:00
Michael Vogel
cba2a8b64b Vier: Make it look more beautiful under Linux 2015-11-10 16:25:36 +01:00
Michael Vogel
f5782be02e Merge pull request #2055 from tobiasd/20151108-messagespo
regenerated master messages.po file
2015-11-09 16:05:23 +01:00
afb8c87420 regenerated master messages.po file 2015-11-08 22:26:22 +01:00
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
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
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
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
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
808eaa633a Merge branch 'develop' of https://github.com/friendica/friendica into develop 2015-11-08 16:04:50 +01:00
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
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