Tobias Diekershoff
c6f0333026
moved some CSS stuff from the template to global.css
2016-01-18 13:22:07 +01:00
Michael Vogel
6c7cf2a766
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
2016-01-18 00:53:18 +01:00
Michael Vogel
36ba415df3
Merge pull request #2257 from rabuzarus/locked_features_united
...
feature management for admins
2016-01-18 00:51:50 +01:00
Tobias Diekershoff
98be92f48c
DE update to the strings
2016-01-17 22:25:05 +01:00
rabuzarus
f428635682
vier: add missing forumlist_profile
2016-01-17 15:54:58 +01:00
rabuzarus
c1ed2bd975
feature management for admins: Merge branch 'devolop'
2016-01-17 03:25:17 +01:00
Michael Vogel
228ce9e27e
Merge remote-tracking branch 'upstream/develop' into 1601-network-performance
2016-01-16 17:39:45 +01:00
Tobias Diekershoff
75f0053550
forgot the template
2016-01-16 13:57:40 +01:00
Tobias Diekershoff
20fe67f378
removed remote update functionality from admin panel
2016-01-16 11:52:21 +01:00
Michael Vogel
90a8d6f0f5
Several performance improvements
2016-01-15 23:27:25 +01:00
Tobias Diekershoff
629c69d9dd
only show the reload link if plugins are found
2016-01-15 19:35:45 +01:00
Tobias Diekershoff
7a7ffb2299
issue 2240 when no addon are installed hint the location of sources in the admin panel
2016-01-15 18:19:22 +01:00
Tobias Diekershoff
5099f43c42
only show platforms with counts > 0
2016-01-15 18:19:22 +01:00
Tobias Diekershoff
8e7d53cd41
added Chart.js 1.0.2 to friendica library and use it instead of CDN version for graphs
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
0d5fed5b3b
beautification of HTML code
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
0a5c9e96a8
moved viewing of friendica logs into a separate subpage, thus created a new template
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
ddb17d36a2
added PHP logging hint fields to the template
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
c1aa668fef
add log viewer to the aside menu of the admin panel
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
4af584cec2
small fix for the ShaShape font
2016-01-15 18:19:20 +01:00
Tobias Diekershoff
a4104d7c17
1st stuff for federation stats in the admin panel
2016-01-15 18:19:19 +01:00
fabrixxm
f4173d1764
Merge pull request #2244 from annando/1601-gcontact-total
...
Global contacts are now playing a central role
2016-01-14 10:14:52 +01:00
rabuzarus
556f76de01
vier: mobile view - fix word breaking
2016-01-13 19:56:21 +01:00
Michael Vogel
885dc1df81
gcontact update script, rebuilt follow page, query speedup for community and network groups
2016-01-10 09:19:00 +01:00
fabrixxm
fcf7a791f1
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
...
This reverts commit 83e54f70d3ecf576bdd0
2016-01-04 11:46:19 +01:00
fabrixxm
83e54f70d3
Merge pull request #2223 from rabuzarus/2912_photo_widget
...
photo aside widget for profile page
2016-01-04 10:06:07 +01:00
Michael Vogel
771d0c4bfa
Merge pull request #2224 from rabuzarus/2812_js_scrollbars
...
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
2016-01-03 14:09:17 +01:00
Tobias Diekershoff
680f1073cb
Typo in DE translations
2016-01-03 12:57:42 +01:00
fabrixxm
907d20940a
Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons
...
vier: make TopNavBar mobile friendly
2015-12-31 09:38:27 +01:00
Tobias Diekershoff
ab5d0aa5e6
DE update to the strings
2015-12-31 07:32:15 +01:00
Tobias Diekershoff
6961fa636a
FR update to the strings
2015-12-30 08:55:59 +01:00
rabuzarus
f8256fc53b
make perfect scrollbars work with quattro
2015-12-30 03:12:52 +01:00
rabuzarus
89c0a8f8a8
vier: remove double available accesskeys
2015-12-30 00:48:11 +01:00
rabuzarus
3366e530cd
photo aside widget: little polish
2015-12-30 00:37:24 +01:00
rabuzarus
20fbf670db
photo aside widget for profile page
2015-12-30 00:26:50 +01:00
Michael Vogel
b41ab85feb
Merge pull request #2220 from rabuzarus/2812_notify_menu
...
vier: some visual work on the notification menu
2015-12-29 14:31:41 +01:00
rabuzarus
871fb609d4
vier: add missing clear divs to right aside
2015-12-29 02:01:17 +01:00
rabuzarus
51a8864519
vier: make TopNavBar mobile friendly
2015-12-29 00:23:59 +01:00
rabuzarus
e93156427e
use perfect-scrollbars for nav-notifications-menu (and in vier aside)
2015-12-28 23:16:34 +01:00
rabuzarus
43d35315db
vier nav-notification-menu: further polishing
2015-12-28 22:04:54 +01:00
rabuzarus
c7d2d95705
vier nav-notification-menu: small cleanup
2015-12-28 20:52:11 +01:00
rabuzarus
093a3e6742
some work on vier nav-notification-menu
2015-12-28 20:40:04 +01:00
Tobias Diekershoff
99861b9fa6
Merge pull request #2216 from fabrixxm/feature-api-like
...
Works on API and a small refractor, updated docs
2015-12-28 18:39:21 +01:00
fabrixxm
6da04d16bd
get rid of unwanted <br>s in items with oembed
...
fix video thumbnail in quattro, vier, duepuntozero themes
2015-12-28 18:07:31 +01:00
Michael Vogel
9d83892151
Merge pull request #2215 from rabuzarus/2812_vier_mobile_fix
...
vier: fix for 2205
2015-12-28 10:41:39 +01:00
fabrixxm
696fe53d8f
sizes links in xml output of api/frienidca/photo is an array
2015-12-28 10:23:06 +01:00
fabrixxm
6b60560ea2
Changes in api
...
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
2015-12-28 10:23:06 +01:00
rabuzarus
e68fcc146a
vier: fix for 2205
2015-12-28 04:57:49 +01:00
Michael Vogel
8b25f51116
XRD now should react more like an OStatus server
2015-12-28 01:04:14 +01:00
Fabrixxm
d4dd863b4b
quattro: style managed unread notification
2015-12-21 16:19:56 +01:00
Fabrixxm
b79d98aea5
quattro: fix PM aside template
...
errors was raised with new "show message list in aside" patch
2015-12-21 09:43:10 +01:00
Tobias Diekershoff
719989249f
FR: update to the translation
2015-12-17 08:27:02 +01:00
rabuzarus
19a72b30b4
vier: fix missing icons
2015-12-15 15:13:46 +01:00
Tobias Diekershoff
9640eb7c81
IT update to the strings
2015-12-14 16:56:40 +01:00
Tobias Diekershoff
053b69eee4
FR update to the strings
2015-12-14 16:30:28 +01:00
Tobias Diekershoff
e97a6dfb77
DE update to the strings
2015-12-14 16:27:00 +01:00
fabrixxm
5b5b942325
Merge pull request #2172 from tobiasd/20151212-frosticons
...
added event icons from frost-mobile to frost
2015-12-13 09:21:03 +01:00
Tobias Diekershoff
4a7d6eb13c
resized icons to 16px
2015-12-13 08:09:53 +01:00
Michael Vogel
ec9b1b7afd
There is now a fragmentation level for the table optimisation
2015-12-12 17:46:24 +01:00
Tobias Diekershoff
a7b37faafd
added event icons from frost-mobile to frost
2015-12-12 06:23:54 +01:00
fabrixxm
8d1af68f44
missing frost-mobile event icons
2015-12-11 19:38:00 +01:00
Michael Vogel
6bd23721c2
Merge pull request #2169 from tobiasd/20151211-FR
...
update to the French translation
2015-12-11 11:23:49 +01:00
Tobias Diekershoff
5f27f509cb
Merge pull request #2167 from annando/1512-profile-aside
...
Sometimes there wasn't a linebreak before the address in the profile
2015-12-11 08:10:23 +01:00
Tobias Diekershoff
36769d77eb
FR update to the strings THX Perig
2015-12-11 08:03:09 +01:00
Michael Vogel
138d745f5e
Sometimes there wasn't a linebreak before the address in the profile
2015-12-10 21:39:44 +01:00
Michael Vogel
1e0f26da8d
Merge pull request #2166 from rabuzarus/1012_vier-forum
...
vier: fix little misspelling
2015-12-10 21:19:16 +01:00
rabuzarus
776cbe4a37
vier: fix little misspelling
2015-12-10 13:30:11 +01:00
Michael Vogel
59b2bde9a7
Do a linebreak before the output of rendertime
2015-12-08 19:41:27 +01:00
Michael Vogel
1fb636ba1e
Vier: The line-height seems to make problems with windows
2015-12-07 21:45:33 +01:00
Michael Vogel
01c9d13927
Issue 1871: Show an information if a group is empty
2015-12-05 23:29:42 +01:00
Tobias Diekershoff
f849ff0155
SV messages.po regenerated from strings.php
2015-12-04 21:31:33 +01:00
fabrixxm
38d46b164a
quattro: some love to events pages
2015-12-04 20:43:35 +01:00
fabrixxm
f739fdc517
Quattro: Rss icon for atom feed link in profile
2015-12-04 19:57:19 +01:00
fabrixxm
f44846555a
quattro: hide acl button in edit post
...
fix #1780
2015-12-04 19:29:13 +01:00
Fabrixxm
ddbba521c5
Add support for attending an event to frost themes
...
fix #1953
2015-12-04 15:01:46 +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
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
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
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
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
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
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
rabuzarus
a6aac8f950
networkheader: do css work the other supported themes
2015-11-30 01:24:22 +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
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
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
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
f5597da059
forumlist - mark selected forum as selected
2015-11-28 23:52:12 +01:00
Michael Vogel
58a261a29a
Other themes are now supported as well
2015-11-28 23:18:01 +01:00
Michael Vogel
3067663909
The manage page now shows the unread notifications
2015-11-28 22:56:48 +01:00
rabuzarus
a3059d02d4
group_side - unify look with forumlist
2015-11-28 20:09:28 +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
679ce3243e
Admin settings for table optimisation
2015-11-28 16:35:16 +01:00
Michael Vogel
3b6d3d1ade
Merge pull request #2099 from rabuzarus/2611_new_user_addr
...
generate addr for new registered users
2015-11-27 21:35:46 +01:00
rabuzarus
620299dc25
include friendica address in hcard
2015-11-26 17:46:38 +01:00
rabuzarus
ddf3589fc5
count unread forum items for forumlist widget (ping.php)
2015-11-24 22:14:26 +01:00
Tobias Diekershoff
1f583c9657
NL update to the strings, thx Ralph
2015-11-19 07:30:27 +01:00
Michael Vogel
41fe07e128
Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix
2015-11-17 21:34:01 +01:00
Michael Vogel
edb303d44a
Merge pull request #2086 from rabuzarus/0711_forumlist
...
0711 forumlist
2015-11-17 21:33:25 +01:00
rabuzarus
a07a0fd1d7
forumlist: fix id conflict and js show-more
2015-11-17 20:57:12 +01:00
Michael Vogel
5a1f763de0
The mobile.css seems to only work for mobiles at the moment.
2015-11-17 20:39:30 +01:00
Michael Vogel
a9444ec774
The mobile.css was commented out ...
2015-11-17 20:11:06 +01:00
Michael Vogel
4b21512f56
This is a quick fix for the the forumlist.
2015-11-17 19:56:32 +01:00
Michael Vogel
e43c7a4447
Merge pull request #2061 from rabuzarus/0711_forumlist
...
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Fabrixxm
0a9e017d34
Installer use static css, fix #2071
2015-11-13 10:56:06 +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
Tobias Diekershoff
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
31c44bd398
Vier: The left menu does now appear reliably even if the user had scrolled down.
2015-11-12 08:57:57 +01:00
rabuzarus
902735f6d4
forumlist: dbupdate
2015-11-11 23:39:14 +01:00
rabuzarus
988d0327ae
forumlist: forgot some required_once for plugin_enabled()
2015-11-11 21:37:16 +01:00
rabuzarus
215205d376
forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()
2015-11-11 21:31:26 +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
Tobias Diekershoff
d6ac6aa615
updated the CSS file for the ShaShape iconset
2015-11-10 20:34:21 +01:00
Tobias Diekershoff
835e6c4955
new version of the ShaShape iconset
2015-11-10 20:12:16 +01:00
Tobias Diekershoff
37e1c916db
update to the DE translation by Abrax
2015-11-10 20:02:19 +01:00
Michael Vogel
cba2a8b64b
Vier: Make it look more beautiful under Linux
2015-11-10 16:25:36 +01:00
rabuzarus
abf9ebd466
forumlist: small fix
2015-11-10 12:53:56 +01:00
rabuzarus
96b764425e
move forumlist addon to core
2015-11-09 15:56:20 +01:00
fabrixxm
df866253b0
aside bar as menu in mobile
2015-11-08 19:08:00 +01:00
fabrixxm
c700a6fb37
duepuntozero, vier: add unread messages per group
2015-11-08 18:02:04 +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
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
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
4b9fa3fb7e
some icons were added to the ShaShape iconset
2015-11-08 12:33:48 +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
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
Tobias Diekershoff
b3e3149e50
wrong filename
2015-11-07 16:30:31 +01:00
Tobias Diekershoff
f2013951a9
wrong filename
2015-11-07 16:28:31 +01:00
Tobias Diekershoff
0c6097fbcd
initial commit of the ShaShape iconset by Andi Stadler
2015-11-07 16:24:22 +01:00
fabrixxm
5f6ea6357d
Add 'Reload active themes' to admin
...
It will call 'uninstall()' and 'install()' on every active themes
2015-11-06 23:53:10 +01:00
Michael Vogel
0f563525bd
Optical adjustments for contacts/set "last_failure" when inaccessible
2015-11-06 09:15:20 +01:00
Michael Vogel
0f41f35041
The contact template now displays the address if available
2015-11-06 00:47:54 +01:00
Michael Vogel
5b2e1188c0
Vier: Network name, "ago" and the quote description are now smaller when mobile.
2015-11-04 00:07:05 +01:00
Michael Vogel
546fd6cbbe
Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2
2015-11-03 23:56:57 +01:00
Michael Vogel
3b11436b02
Merge pull request #1989 from rabuzarus/allfriends
...
template-rework: let common friends and allfriends use viewcontact_te…
2015-11-03 23:27:24 +01:00
Michael Vogel
451b07cfe7
Mobile should be better now
2015-11-03 23:11:36 +01:00
Michael Vogel
eff6f3a57d
On small computers the stylesheet changed to mobile by accident.
2015-11-03 19:14:28 +01:00
rabuzarus
e785759a8b
template-rework:make use of get_contact_details_by_url()
2015-11-03 14:31:15 +01:00
Michael Vogel
e3fdb33df0
Vier: Added the credits to the pages without left sidebar
2015-11-03 01:19:22 +01:00
Michael Vogel
1831066259
Vier is now a little bit more mobile ready.
2015-11-02 23:12:09 +01:00
rabuzarus
f196389580
Merge develop into allfriends
2015-11-02 14:31:20 +01:00
Michael Vogel
709aac0652
Only offer the choice to activate Diaspora and OStatus if the system is ready for it
2015-11-01 13:55:49 +01:00
Michael Vogel
6a53e3959f
Vier: The different styles are now working with the right menubar
2015-11-01 09:45:02 +01:00
Michael Vogel
2f47d63a29
Merge pull request #2000 from tobiasd/20151027-credits
...
a credits page
2015-10-31 22:34:30 +01:00
Tobias Diekershoff
c00847a79d
use section_title.tpl for page title
2015-10-30 18:05:45 +01:00
rabuzarus
f0f3360c4b
vier: include private forums in forum widget
2015-10-29 15:34:55 +01:00
Tobias Diekershoff
a48156aab6
display names listed in credits.txt from /credits
2015-10-29 08:48:41 +01:00
Tobias Diekershoff
dff1a73bd3
basic styling of the credits list
2015-10-29 08:48:41 +01:00
Michael Vogel
5a58f55a36
Set the maximum avatar size to 80 pixels
2015-10-28 00:18:56 +01:00
Michael Vogel
aee4522ad4
The contact page now shows the connection status.
2015-10-27 23:10:52 +01:00
rabuzarus
299c8b83ac
template-rework: let common friends and allfriends use viewcontact_template.tpl
2015-10-27 15:27:26 +01:00
Tobias Diekershoff
367699f785
Merge pull request #1987 from annando/1510-manage-enhancements
...
Some small optical and structural changes to the manage template
2015-10-27 09:01:35 +01:00
Tobias Diekershoff
11a7eb8d8f
Merge pull request #1985 from annando/1510-vier-optimize-touch
...
Vier: The usability with a touch device is improved
2015-10-27 08:59:47 +01:00
Tobias Diekershoff
4079084492
Merge pull request #1975 from rabuzarus/template_rework
...
Template rework for contact related pages
2015-10-27 08:59:03 +01:00
Michael Vogel
99ee45e627
The username is now a link
2015-10-26 23:11:42 +01:00
Michael Vogel
ac744b61f9
Some small optical and structural changes to the manage template
2015-10-26 08:16:37 +01:00
Michael Vogel
4f9ec8efac
Vier: The usability with a touch device is improved
2015-10-25 21:01:39 +01:00
rabuzarus
4c263aa4ac
Merge develop into manage
...
Conflicts:
view/global.css
2015-10-25 16:57:04 +01:00
Tobias Diekershoff
03ff349a94
Merge pull request #1982 from annando/1510-reduced-profile
...
Profile data are now reduced to only the most important fields
2015-10-25 16:54:24 +01:00
rabuzarus
bac61cf596
manage-selector: some cleanup and css work
2015-10-25 16:49:45 +01:00
Michael Vogel
78a8db55c6
Merge pull request #1981 from rabuzarus/poke
...
some work on poke template
2015-10-25 14:59:39 +01:00
rabuzarus
5b93bff6da
poke template: make use of global.css
2015-10-25 14:40:56 +01:00
rabuzarus
e0e6762ed8
some inital work to have profile pics on manage page
2015-10-25 14:00:08 +01:00
Michael Vogel
4631c13d08
Profile data are now reduced to only the most important fields
2015-10-25 09:15:36 +01:00
rabuzarus
8f92b6eea4
some work on poke template
2015-10-24 19:51:58 +02:00
rabuzarus
eb33698556
some minor changes in crepair.tpl
2015-10-24 16:01:55 +02:00
rabuzarus
ea2b3b2f76
move html from crepair.php to template
2015-10-24 15:57:46 +02:00
rabuzarus
442d59abc4
template rework: multi-row view for the other themes
2015-10-23 21:45:16 +02:00
rabuzarus
86f94570ef
template rework: delete unused templates
2015-10-23 16:49:12 +02:00
rabuzarus
b6cceda131
template rework: revert commit because plugin community home uses the css classes
2015-10-23 15:41:49 +02:00
rabuzarus
7c9df68964
template rework: revert #b2bb600 for vier (is needed for right sidebar)
2015-10-23 15:23:00 +02:00
rabuzarus
fad8ebc355
template rework: two row contact page for vier
2015-10-23 15:18:05 +02:00
rabuzarus
efb12aed20
template rework: little theme specific changes (frost, quattro)
2015-10-23 01:32:03 +02:00
rabuzarus
b2bb600f3a
template rework: delete unused css
2015-10-23 01:04:47 +02:00
rabuzarus
0c3979720f
template rework: rearrange sidebar widgets for contact related pages
2015-10-23 00:12:00 +02:00
rabuzarus
2aad62190f
template rework: use viewcontact_template.tpl also for directory
2015-10-22 22:48:49 +02:00
rabuzarus
f9c0c1d696
template rework: use viewcontact_template.tpl for contact dealing pages
2015-10-18 17:12:48 +02:00
rabuzarus
4c1c614fa6
Merge viewcontact into template_rework
2015-10-17 22:28:09 +02:00
rabuzarus
452a3011f7
Merge suggest into template_rework
2015-10-17 22:22:52 +02:00
rabuzarus
dbf1f9efcd
Merge dirfind into template_rework
2015-10-17 22:22:35 +02:00
rabuzarus
4b8ca578d1
dirfind: move pagination into template
2015-10-17 22:09:19 +02:00
rabuzarus
b9d9bf8ecd
directory: move pagination into template
2015-10-17 21:45:55 +02:00
rabuzarus
6d559bf8a9
viewcontact: use section_title.tpl as headding
2015-10-17 21:40:41 +02:00
rabuzarus
9176e739a4
sugest.php: themeable as whole page
2015-10-17 21:25:21 +02:00
rabuzarus
72896b0f6b
unify directory page
2015-10-17 19:45:57 +02:00
rabuzarus
20bb16859f
dirfind.php: move html to templates
2015-10-17 00:19:01 +02:00
rabuzarus
6ebb21a935
directory.php: move html to templates
2015-10-16 21:44:10 +02:00
Tobias Diekershoff
a961c29d05
Merge pull request #1962 from annando/1510-attend-vier
...
Vier: Some small changes in the template for events
2015-10-14 06:42:50 +02:00
Michael Vogel
66ea33623b
Vier: Some small changes in the template for events
2015-10-13 20:15:01 +02:00
Tobias Diekershoff
db14dc13c3
DE: update to the strings
2015-10-13 17:35:08 +02:00
Tobias Diekershoff
1df5a7212b
DE: translation of the attend strings THX to Abrax
2015-10-13 17:06:35 +02:00
Tobias Diekershoff
154c55b36e
Merge pull request #1957 from fabrixxm/duepuntozeroattend
...
attend functionality for duepuntozero
2015-10-12 21:16:40 +02:00
fabrixxm
fd8e8d005a
attend functionality for duepuntozero
2015-10-12 20:09:33 +02:00
fabrixxm
735755aa0e
Merge pull request #1956 from tobiasd/20151012-de
...
DE Update to the translation, thx Abrax
2015-10-12 19:04:51 +02:00
Tobias Diekershoff
5839242792
DE Update to the translation, thx Abrax
2015-10-12 18:08:11 +02:00
Tobias Diekershoff
da8c81a12e
cleanup forgotten lines
2015-10-12 15:58:34 +02:00
Tobias Diekershoff
3debdf0a91
attend functionality for quattro theme (part of #1953 )
2015-10-12 15:34:18 +02:00
Tobias Diekershoff
ce03ccc95c
Merge pull request #1929 from rabuzarus/event-attendance
...
port of reds event attendance feature
2015-10-12 15:10:03 +02:00
Michael Vogel
adba75600a
Vier: Support for the new IFTTT addon.
2015-10-11 23:36:23 +02:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
efbdb57f92
Reworked contact relations between Friendica and Diaspora
2015-10-10 11:06:18 +02:00
Tobias Diekershoff
26983bafff
Merge pull request #1944 from annando/1510-proxy-picture-size
...
Picture size and bugfix for contact names with "<" and ">"
2015-10-08 08:03:42 +02:00
Michael Vogel
61c3ce7a21
Bugfix: The contact names had to be escaped
2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f
Added resize possibility to proxy function
2015-10-07 08:25:10 +02:00
Tobias Diekershoff
b4ec07ab27
IT: update to the strings
2015-10-07 06:20:54 +02:00
Michael Vogel
607817d1b3
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
2015-10-05 17:38:57 +02:00
Michael Vogel
d3ac3f8490
Added the contact menu to the search as well.
2015-10-05 08:08:59 +02:00
Michael Vogel
72ecb9e67b
Bugfix: Repairing a contact was more like killing the contact ...
2015-10-04 19:39:55 +02:00
Tobias Diekershoff
9f68676db6
Merge pull request #1934 from annando/1510-better-notification
...
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Michael Vogel
4003b9cc5d
Let the notification look more like the follow dialog
2015-10-04 17:18:58 +02:00
Tobias Diekershoff
e1f3f2bc6c
Merge pull request #1933 from annando/1510-follow-more-data
...
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
Tobias Diekershoff
18e8d0de59
Merge pull request #1932 from annando/1510-vier-2
...
Small optical changes in "vier"
2015-10-04 17:01:25 +02:00
Michael Vogel
83ea4f7253
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
2015-10-04 15:55:24 +02:00
Michael Vogel
d0ae5ce326
Show more information when following a new contact
2015-10-04 14:41:39 +02:00
Michael Vogel
1d71dde7ef
Beautyfied code. Link to "follow" on community profiles
2015-10-04 14:40:02 +02:00
Michael Vogel
3b18c6cb0c
Small optical changes in "vier"
2015-10-04 12:24:00 +02:00
Tobias Diekershoff
01d38a353c
DE update to the translation
2015-10-04 09:23:58 +02:00
Tobias Diekershoff
05b2836d66
Merge pull request #1926 from annando/1510-permit-crawler
...
New option to permit crawlers
2015-10-04 08:53:32 +02:00
Michael Vogel
42ad8c2b25
New template for http status messages
2015-10-03 23:19:09 +02:00
Michael Vogel
3ae0deadb6
The right side now contains much stuff from diabook - but completely reworked.
2015-10-03 12:55:55 +02:00
Michael Vogel
47c855388e
Vier: Menu at the right side (inspired and copyied from diabook)
2015-10-01 08:19:35 +02:00
Tobias Diekershoff
d6beb7db1f
add a header to seperate the beginning of week settings
2015-10-01 06:19:57 +02:00
Michael Vogel
5fe357ee75
Rearrange the navigation bar on smaller windows
2015-09-30 21:59:55 +02:00
Michael Vogel
389b7de451
Setting for the first day of the week
2015-09-30 19:18:13 +02:00
Michael Vogel
68a6f0298e
The events moved from the profile to the navigation bar - for supported themes
2015-09-30 18:50:44 +02:00
rabuzarus
7cb4ea52fd
port of the event attendance feature of red matrix with example implementation for vier theme.
2015-09-30 16:58:02 +02:00
rabuzarus
f5c7006f30
rest of the consensus porting work and integration into friendica
...
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
Michael Vogel
6e981ed798
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
2015-09-29 10:35:50 +02:00
Michael Vogel
c33957a6e9
Internationalisation of events/Move events to the navigation bar
2015-09-27 14:00:15 +02:00
Tobias Diekershoff
28df4b2cd0
PL update to the strings
2015-09-24 22:09:39 +02:00
Michael Vogel
25fc2c9799
Some changes to stay compatible to Diaspora
2015-09-19 14:00:33 +02:00
Tobias Diekershoff
976a2be1f7
Merge pull request #1892 from annando/1509-vier-attachements
...
Now attachments of the type "application" are displayed as well.
2015-09-18 21:11:57 +02:00
Michael Vogel
6be65f4eae
Now attachments of the type "application" are displayed as well.
2015-09-18 21:09:31 +02:00
Tobias Diekershoff
dbc9d87156
DE update to the strings
2015-09-17 14:24:07 +02:00
Michael Vogel
5ac38b7f99
There is now only one central parameter for the global directory.
2015-09-15 22:29:02 +02:00
Tobias Diekershoff
8504cf4f05
Merge pull request #1880 from annando/1509-performance
...
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel
c6d9b2da23
New setting for requery days
2015-09-05 10:54:39 +02:00
Tobias Diekershoff
4db21f85c4
DE, ES, IT: update to the translations
2015-09-01 15:12:09 +02:00
Tobias Diekershoff
32c063b9a5
IT update to the translations
2015-08-31 19:02:12 +02:00
Tobias Diekershoff
3665ab3de0
FR update to the translations
2015-08-31 19:01:56 +02:00
Tobias Diekershoff
fe5a5c72f5
ES update to the translations
2015-08-31 19:01:42 +02:00
Tobias Diekershoff
af48217465
Merge pull request #1870 from annando/1508-soapbox
...
Soapbox-Improvements
2015-08-31 06:53:54 +02:00
Michael Vogel
56ae056f1d
The "manage" option list is now larger.
2015-08-30 22:45:48 +02:00
Michael Vogel
cc3419f101
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
...
Conflicts:
mod/dfrn_notify.php
2015-08-30 10:44:29 +02:00
Tobias Diekershoff
9aa1e22047
CS update to the strings
2015-08-30 07:24:39 +02:00
Michael Vogel
31fffcf281
Accidentally removed a file
2015-08-29 17:09:25 +02:00
Michael Vogel
82e682ef45
The click behaviour of the top menu bar is now changed completely
2015-08-29 10:14:41 +02:00
Michael Vogel
e25457ab68
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
2015-08-28 14:16:52 +02:00
Michael Vogel
319df2ed66
The menu bar isn't clickable anymore
2015-08-28 11:36:43 +02:00
Michael Vogel
14af9cd2e8
Remove the unneeded menu buttons-
2015-08-27 00:50:04 +02:00
Michael Vogel
92fbf1bcbd
Vier: Use CSS for popup menu
2015-08-27 00:02:06 +02:00
Tobias Diekershoff
7da830c9f6
DE update to the strings
2015-08-26 16:40:31 +02:00
Michael Vogel
6942b16ef5
See issue 1855. OOhembed is removed.
2015-08-25 19:50:23 +02:00
Michael Vogel
b1dddd2936
Only offer forum search in local mode.
2015-08-25 05:54:50 +02:00
Michael Vogel
d1647222d3
Vier: The "register" page now looks better.
2015-08-24 19:03:03 +02:00
Tobias Diekershoff
cc145f0e25
Merge pull request #1850 from tobiasd/20150824-de
...
DE updated translation
2015-08-24 14:27:13 +02:00
Tobias Diekershoff
26c5c7991a
Merge pull request #1849 from fabrixxm/issue-1841
...
filebrowser: link image to original picture, show error messages
2015-08-24 14:26:09 +02:00
Tobias Diekershoff
489e90281a
DE updated translation
2015-08-24 14:21:22 +02:00
fabrixxm
cbabac298d
filebrowser: link image to original picture, show error messages
2015-08-24 13:54:41 +02:00
Michael Vogel
3bca2db11b
Don't show search options in side bar.
2015-08-24 12:12:14 +02:00
Michael Vogel
3ff196f00d
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
2015-08-24 11:55:29 +02:00
Tobias Diekershoff
fc18123082
Merge pull request #1837 from fabrixxm/feature-1796
...
add support for oneline,in-text code tag
2015-08-23 17:27:45 +02:00
fabrixxm
2d75e1f422
add support for oneline,in-text code tag
2015-08-20 15:08:55 +02:00
fabrixxm
81d1dfc006
add 'reload active plugins' button in admin/plugins
2015-08-20 15:01:15 +02:00
Michael Vogel
e6b85c822d
frost-mobile has now a link to the original post. See issue 1793
2015-08-18 20:30:01 +02:00
Michael Vogel
6ae34f4802
Merge pull request #1828 from tobiasd/20150816-fix1621
...
add the profile url to the settings pages as alternative to the webfi…
2015-08-17 21:51:03 +02:00
Tobias Diekershoff
b67adebd9c
DE update to the strings
2015-08-17 12:02:03 +02:00
Tobias Diekershoff
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
Tobias Diekershoff
eea258f74c
add the profile url to the settings pages as alternative to the webfinger. See issue 1621
2015-08-16 22:39:08 +02:00
Michael Vogel
c2a1cf958d
The addon "statistics_json" becomes the system setting "nodeinfo"
2015-08-16 21:45:51 +02:00
Tobias Diekershoff
4ca515ab33
Merge pull request #1823 from annando/issue-1348
...
The login form in the aside section should look now better
2015-08-15 07:19:05 +02:00
Michael Vogel
72c8fff909
Improved register link and open-id input.
2015-08-15 07:08:32 +02:00
Michael Vogel
efec7e973e
This hopefully will solve issue 1348
2015-08-14 23:32:10 +02:00
Tobias Diekershoff
bb4e339d8f
DE update to the strings
2015-08-14 13:03:55 +02:00
Michael Vogel
887372a0d7
Bugfix: Conversations with Diaspora now work reliable
2015-08-13 22:49:57 +02:00
Tobias Diekershoff
5013e5daf1
use to link to queue inspector
2015-08-12 19:58:53 +02:00
Tobias Diekershoff
f439ac47c4
admin panel: inspect queue
2015-08-12 15:44:59 +02:00
Tobias Diekershoff
6b93325f70
make Inspect Queue link visible in admin adide menu
2015-08-12 15:44:03 +02:00
Tobias Diekershoff
9d0786531d
Merge pull request #1810 from annando/issue-1739
...
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel
a0f69dc92c
Contact requests now contain more information.
2015-08-12 08:07:21 +02:00
Michael Vogel
e1088210a6
CSS improved
2015-08-11 22:47:37 +02:00
Tobias Diekershoff
6cfe7b698e
Merge pull request #1803 from annando/1508-accessibility
...
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel
ea14f7e716
Duepontozero now has accesskeys as well.
2015-08-09 12:19:15 +02:00
Michael Vogel
d500ea4324
Some more accesskeys for Quattro
2015-08-09 09:55:51 +02:00
Michael Vogel
d65d74d460
Added the changes in quattro as well
2015-08-09 09:28:10 +02:00
Michael Vogel
811e4b6ba1
Documentation for accesskeys added
2015-08-09 09:16:45 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5
Some steps for a better screen reader compatibility
2015-08-06 08:13:15 +02:00
Tobias Diekershoff
26ec1fbf34
FR: update to the translations
2015-08-05 07:11:39 +02:00
Tobias Diekershoff
43b2e69421
DE: update of the translation
2015-08-04 08:06:49 +02:00
Tobias Diekershoff
cd8be48ca7
Merge pull request #1791 from annando/1507-new-poco
...
Improved Local Directory
2015-08-02 10:31:34 +02:00
rabuzarus
bef827f1cc
small fixes for filebrowser
2015-08-01 21:20:13 +02:00
Fabrixxm
b7aa259c67
hide buglink
2015-07-30 14:19:50 +02:00
Fabrixxm
f5657e283c
fix folder links in filebrowser dialog
2015-07-29 11:55:26 +02:00
Fabrixxm
52f9465578
filebrowser fixs, use it in comment textareas
...
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm
70b7de39a7
Upload/Browse popup for files and images
...
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
9717fa82fe
New field "created" in gcontacts. New option for timeframe when polling global contacts
2015-07-21 00:05:44 +02:00
Michael Vogel
f3c83fb514
Automatically updating the searched contacts while searching it.
2015-07-19 18:02:24 +02:00
Michael Vogel
0bede65a6b
Use local search
2015-07-19 13:23:01 +02:00
Tobias Diekershoff
8bfbb935c7
add missing icons to quattros event view
2015-07-19 10:56:40 +02:00
Michael Vogel
2a5fb7b175
Option to discover contacts from remote users (fallback option)
2015-07-19 09:41:36 +02:00
Michael Vogel
a0734ceede
Merge remote-tracking branch 'upstream/develop' into 1507-new-poco
2015-07-18 22:37:39 +02:00
Michael Vogel
cf3214c904
Query other servers periodically for their known contacts
2015-07-18 22:26:06 +02:00
Tobias Diekershoff
9bb805f3dc
show profile url in contact-edit overview listing
2015-07-18 10:57:31 +02:00
Michael Vogel
f1e7369283
Poco: Option to activate and deactivate detection of last activity.
2015-07-18 00:48:42 +02:00
Tobias Diekershoff
bbd2e4abc1
make the 'noshare' checkbox checked by default for photo upload
2015-07-17 17:05:55 +02:00
Tobias Diekershoff
ba790def22
NL update to the strings
2015-07-14 16:31:45 +02:00
Tobias Diekershoff
9e138a42f2
Merge pull request #1758 from annando/1507-salmon
...
OStatus Salmon improvements (Follow, Unfollow works)
2015-07-14 16:24:54 +02:00
Michael Vogel
9ebaa45670
Removed unused template
2015-07-13 23:56:45 +02:00
Tobias Diekershoff
a54dd8a9db
DE: update to the strings
2015-07-13 08:14:00 +02:00
Tobias Diekershoff
1efda90498
Merge pull request #1755 from annando/1507-template-update
...
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel
5f86d3d325
removed the picture width, since it is already in the style sheet.
2015-07-12 20:31:49 +02:00
Michael Vogel
6a646d68c5
Updated templates for "vier" (See issue 1733)
2015-07-12 20:27:54 +02:00
Michael Vogel
e22ce8403e
Merge pull request #1752 from tobiasd/20150712-issue1747
...
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus
2c39387e44
fix for saving searches
2015-07-12 17:43:50 +02:00
Tobias Diekershoff
d920cf25b0
dont use an empty li, but make a new list for visual separation
2015-07-12 16:16:54 +02:00
Michael Vogel
bc6e5a4f2d
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
2015-07-06 17:35:48 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +02:00
Tobias Diekershoff
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
Tobias Diekershoff
b8f99f459b
DE update to the strings
2015-06-30 09:45:05 +02:00
Tobias Diekershoff
d4fa6ccfe8
IT update to the strings
2015-06-30 09:44:53 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
Michael Vogel
b9c42c37d1
Vier: Colors for notifications changed
2015-06-29 08:00:52 +02:00
