Michael Vogel
|
fe900ac576
|
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
|
2015-12-01 17:16:31 +01:00 |
|
|
Michael Vogel
|
6910604ffb
|
Merge pull request #2125 from rabuzarus/2911_event_template
vier event_form: include bb-tags for editing
|
2015-12-01 17:13:46 +01:00 |
|
fabrixxm
|
0dee14d91d
|
Merge pull request #2129 from annando/1512-diaspora-cid
Diaspora comments/likes: The contact id and the network is now taken …
|
2015-12-01 17:11:35 +01:00 |
|
|
Michael Vogel
|
50a46c2c6e
|
Merge pull request #2127 from tobiasd/20151201-de
DE translations THX Abrax
|
2015-12-01 17:01:47 +01:00 |
|
|
Michael Vogel
|
107204f405
|
Diaspora comments/likes: The contact id and the network is now taken from the contact
|
2015-12-01 15:36:32 +01:00 |
|
|
fabrixxm
|
9e0a15c972
|
Merge pull request #2128 from tobiasd/20151201-issue2079
add the module to the page title
|
2015-12-01 14:33:25 +01:00 |
|
Tobias Diekershoff
|
51d392b97f
|
add the module to the page title
|
2015-12-01 14:19:06 +01:00 |
|
|
Tobias Diekershoff
|
91bac8a6e0
|
DE translations THX Abrax
|
2015-12-01 13:56:23 +01:00 |
|
|
Michael Vogel
|
1c93729c46
|
Tab is added to "all friends" and "common friends"
|
2015-12-01 08:12:05 +01:00 |
|
|
Tobias Diekershoff
|
146f386e37
|
Merge pull request #2126 from annando/1511-duplicates
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
|
2015-12-01 06:07:18 +01:00 |
|
|
Michael Vogel
|
712b3c7593
|
Merge pull request #2121 from rabuzarus/3011_viewcontactstitle
make viewcontacts part of the profile tab
|
2015-11-30 23:29:35 +01:00 |
|
|
Michael Vogel
|
b0898cc461
|
Bugfix: The duplicate check sometimes seemed to have scrambled the posts
|
2015-11-30 23:13:56 +01:00 |
|
|
Michael Vogel
|
0278e60664
|
Merge pull request #2104 from rabuzarus/2611_contacts_directory
display contact information in contact and directory according to the…
|
2015-11-30 18:07:35 +01:00 |
|
rabuzarus
|
2ce64c2496
|
change shortcut for viewcontacts + shortcut docu
|
2015-11-30 16:23:03 +01:00 |
|
|
rabuzarus
|
39b85c8486
|
vier event_form: include bb-tags for editing
|
2015-11-30 16:00:41 +01:00 |
|
|
fabrixxm
|
2753e62483
|
Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
|
2015-11-30 14:45:23 +01:00 |
|
|
Michael Vogel
|
5126b3938c
|
Merge pull request #2124 from tobiasd/20151130-messagespo-credits
regenerated messages.po and credits.txt
|
2015-11-30 13:58:48 +01:00 |
|
|
Tobias Diekershoff
|
6da6504738
|
regenerated master messages.po file
|
2015-11-30 13:16:46 +01:00 |
|
|
Tobias Diekershoff
|
50c004aa5f
|
regenerated credits.txt
|
2015-11-30 13:16:23 +01:00 |
|
|
fabrixxm
|
a60b702df1
|
Merge pull request #2113 from annando/1511-manage-notifications
The manage page now shows the notifications
|
2015-11-30 12:04:53 +01:00 |
|
|
Michael Vogel
|
4efb6c6f79
|
Merge pull request #2120 from rabuzarus/2911_network_header
2911 network header
|
2015-11-30 08:30:34 +01:00 |
|
|
Michael Vogel
|
8c35304013
|
Some SQL improvements
|
2015-11-30 08:25:11 +01:00 |
|
rabuzarus
|
45c2a4868e
|
make viewcontacts part of the profile tab
|
2015-11-30 03:25:23 +01:00 |
|
|
rabuzarus
|
a6aac8f950
|
networkheader: do css work the other supported themes
|
2015-11-30 01:24:22 +01:00 |
|
|
Michael Vogel
|
a638417ab5
|
Show contact comments in the post
|
2015-11-29 23:46:10 +01:00 |
|
|
Michael Vogel
|
91011b7190
|
Removing of useless code
|
2015-11-29 23:36:19 +01:00 |
|
|
Michael Vogel
|
a7ea6ef096
|
Use the template for the header.
|
2015-11-29 23:33:32 +01:00 |
|
|
Michael Vogel
|
42d903dd68
|
Redesign of the contact pages, new tab for contact statuses
|
2015-11-29 23:22:05 +01:00 |
|
|
Tobias Diekershoff
|
f45a8f1a03
|
Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
|
2015-11-29 23:19:12 +01:00 |
|
|
Tobias Diekershoff
|
d3d0647ff8
|
Merge pull request #2108 from annando/1511-optimize-tables
Optimize tables on a daily base that are written very often
|
2015-11-29 23:18:06 +01:00 |
|
|
Tobias Diekershoff
|
93fd6dce84
|
Merge pull request #2111 from annando/issue-1925
Issue 1925 - display nickname@hostname.com
|
2015-11-29 19:48:08 +01:00 |
|
|
Michael Vogel
|
ca47c1c4df
|
Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution
|
2015-11-29 17:05:40 +01:00 |
|
|
Michael Vogel
|
5649e9e193
|
The contact page now contains more data
|
2015-11-29 17:04:48 +01:00 |
|
|
rabuzarus
|
70860e5836
|
new_event: default size of textfields
|
2015-11-29 16:16:18 +01:00 |
|
|
Tobias Diekershoff
|
3f2a55c267
|
Merge pull request #2118 from annando/1511-supported-networks
Only show supported networks in sidebar and contact list
|
2015-11-29 16:03:10 +01:00 |
|
|
Tobias Diekershoff
|
69de262e97
|
Merge pull request #2117 from annando/1511-feed-remote
Bugfix: Only show the feed link for local profiles
|
2015-11-29 15:56:24 +01:00 |
|
|
Michael Vogel
|
2fabde5d2d
|
Added the old Facebook addon for addon check
|
2015-11-29 13:42:31 +01:00 |
|
|
Michael Vogel
|
8b23e77171
|
Only show supported networks in sidebar and contact list
|
2015-11-29 13:37:24 +01:00 |
|
|
Michael Vogel
|
56e7b2002d
|
Merge pull request #2116 from tobiasd/2110-followup
followup for #2110 putting the styling in less file and recompile css
|
2015-11-29 12:03:25 +01:00 |
|
|
Michael Vogel
|
1cd06df5fa
|
Bugfix: Only show the feed link for local profiles
|
2015-11-29 12:02:14 +01:00 |
|
|
Tobias Diekershoff
|
ba441789b9
|
followup for #2110 putting the styling in less file and recompile css
|
2015-11-29 11:18:32 +01:00 |
|
|
Michael Vogel
|
583a2f709b
|
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
|
2015-11-29 10:25:44 +01:00 |
|
|
Michael Vogel
|
c77ef0c493
|
Viewcontacts now only shows native contacts (no more connector contacts)
|
2015-11-29 09:56:34 +01:00 |
|
|
Michael Vogel
|
00cc409461
|
The photo menu now respects if the local users differs from the contact owner
|
2015-11-29 09:35:35 +01:00 |
|
|
Tobias Diekershoff
|
a770be3cb6
|
Merge pull request #2107 from annando/1511-duplicated-keywords
Duplicated tags shouldn't happen anymore when parsing a webpage.
|
2015-11-29 08:43:19 +01:00 |
|
|
Tobias Diekershoff
|
b67f33f6d5
|
Merge pull request #2109 from annando/1511-duplicated-tags-diaspora
Avoid duplicated tags in postings to Diaspora
|
2015-11-29 08:42:10 +01:00 |
|
|
Tobias Diekershoff
|
be40fb8186
|
Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
|
2015-11-29 08:40:39 +01:00 |
|
|
Tobias Diekershoff
|
78858cb57d
|
Merge pull request #2114 from rabuzarus/28.11_forumlist
forumlist - mark selected forum as selected
|
2015-11-29 08:21:37 +01:00 |
|
|
rabuzarus
|
1a0cb99d56
|
redesign the network page header when cid selected
|
2015-11-29 04:57:42 +01:00 |
|
|
rabuzarus
|
73dbd73990
|
directory - little change in the sql query
|
2015-11-29 00:09:09 +01:00 |
|