1
1
Fork 0
Commit graph

3774 commits

Author SHA1 Message Date
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
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
75f0053550 forgot the template 2016-01-16 13:57:40 +01:00
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
629c69d9dd only show the reload link if plugins are found 2016-01-15 19:35:45 +01:00
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
5099f43c42 only show platforms with counts > 0 2016-01-15 18:19:22 +01:00
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
0d5fed5b3b beautification of HTML code 2016-01-15 18:19:21 +01:00
0a5c9e96a8 moved viewing of friendica logs into a separate subpage, thus created a new template 2016-01-15 18:19:21 +01:00
ddb17d36a2 added PHP logging hint fields to the template 2016-01-15 18:19:21 +01:00
c1aa668fef add log viewer to the aside menu of the admin panel 2016-01-15 18:19:21 +01:00
4af584cec2 small fix for the ShaShape font 2016-01-15 18:19:20 +01:00
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 83e54f70d3, reversing
changes made to ecf576bdd0.
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
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
ab5d0aa5e6 DE update to the strings 2015-12-31 07:32:15 +01:00
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
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
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
9640eb7c81 IT update to the strings 2015-12-14 16:56:40 +01:00
053b69eee4 FR update to the strings 2015-12-14 16:30:28 +01:00
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
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
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
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
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
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
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
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
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
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