fabrixxm
|
f44846555a
|
quattro: hide acl button in edit post
fix #1780
|
2015-12-04 19:29:13 +01:00 |
|
Tobias Diekershoff
|
eaf975faae
|
Merge pull request #2130 from annando/1512-contact-rework
Some more contact rework
|
2015-12-04 06:53:29 +01:00 |
|
rabuzarus
|
4b7f080c46
|
ping: further work
|
2015-12-03 22:42:53 +01:00 |
|
|
rabuzarus
|
c0406918ec
|
ping: cleanup
|
2015-12-03 17:15:49 +01:00 |
|
Michael Vogel
|
1a170c8743
|
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
Conflicts:
mod/contacts.php
mod/crepair.php
|
2015-12-03 14:38:04 +01:00 |
|
|
Michael Vogel
|
1f9644bded
|
Merge pull request #2131 from rabuzarus/3011_hcard_vcard
unify hcard and vcard
|
2015-12-03 14:16:52 +01:00 |
|
|
rabuzarus
|
d963cdfe48
|
photos-albms widget: add some classes
|
2015-12-02 20:01:22 +01:00 |
|
|
Michael Vogel
|
4286225f37
|
Added/Changed accesskeys for the new tab actions
|
2015-12-02 07:56:10 +01:00 |
|
|
Michael Vogel
|
7ed73a06ab
|
Solved a problem with author links that are different from what is provided in the contact
|
2015-12-01 23:51:34 +01:00 |
|
|
rabuzarus
|
1d6d9d3d24
|
photos-albms widget: add some classes
|
2015-12-01 21:07:05 +01:00 |
|
|
rabuzarus
|
cd7ec72b20
|
unify hcard and vcard: make $pdesc available in hcard&vcard
|
2015-12-01 19:47:23 +01:00 |
|
|
Michael Vogel
|
c45b16d2a1
|
Unifying the texts.
|
2015-12-01 19:02:03 +01:00 |
|
rabuzarus
|
39b37281a7
|
Merge develop into 3011_hcard_vcard
|
2015-12-01 18:34:13 +01:00 |
|
|
rabuzarus
|
89c5989cfb
|
unify hcard and vcard
|
2015-12-01 18:31:08 +01:00 |
|
|
Michael Vogel
|
06a4b0dc5e
|
Header removed in the contact area
|
2015-12-01 18:21:05 +01:00 |
|
|
Michael Vogel
|
1c93729c46
|
Tab is added to "all friends" and "common friends"
|
2015-12-01 08:12:05 +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
|
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 |
|
|
fabrixxm
|
2753e62483
|
Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
|
2015-11-30 14:45: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
|
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 |
|
|
Michael Vogel
|
8b23e77171
|
Only show supported networks in sidebar and contact list
|
2015-11-29 13:37:24 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
rabuzarus
|
f5597da059
|
forumlist - mark selected forum as selected
|
2015-11-28 23:52:12 +01:00 |
|
|
Michael Vogel
|
68916689de
|
Introductions are now added as well
|
2015-11-28 23:35:02 +01:00 |
|
|
Michael Vogel
|
3067663909
|
The manage page now shows the unread notifications
|
2015-11-28 22:56:48 +01:00 |
|
|
Michael Vogel
|
6e957c6c91
|
Merge pull request #2112 from rabuzarus/2811_group_side
group_side - unify look with forumlist
|
2015-11-28 21:12:56 +01:00 |
|
|
rabuzarus
|
aa047e16d7
|
directory - reduce the number of queries
|
2015-11-28 21:12:44 +01:00 |
|
|
rabuzarus
|
a3059d02d4
|
group_side - unify look with forumlist
|
2015-11-28 20:09:28 +01:00 |
|
|
Michael Vogel
|
25c0c5d4ad
|
Issue 1925 - display nickname@hostname.com
|
2015-11-28 18:49:37 +01:00 |
|
|
Michael Vogel
|
388847e1f3
|
Issue 1779: There is now an atom feed link under the connect link on the profile page
|
2015-11-28 18:11:34 +01:00 |
|
|
Michael Vogel
|
b53a2c3122
|
Changed documentation
|
2015-11-28 17:43:52 +01:00 |
|
|
Michael Vogel
|
679ce3243e
|
Admin settings for table optimisation
|
2015-11-28 16:35:16 +01:00 |
|
|
Michael Vogel
|
20befee9ed
|
Dupilcated tags shouldn't happen anymore when parsing a webpage.
|
2015-11-28 13:15:00 +01:00 |
|