Wykres commitów

407 Commity (cd92a0dc34a8b5400311df0630d9933876f4d4db)

Autor SHA1 Wiadomość Data
Michael Vogel 49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Ben Roberts 864cf0f70d update MF2 and vcard data for issue #2629 2016-06-21 10:23:43 -04:00
rabuzarus 71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
rabuzarus 7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
rabuzarus 7dc5fc8b9f Merge develop into 1206-events-template
Conflicts:
	view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus 0148d0e5d2 frio - event - correct some js 2016-06-17 11:18:54 +02:00
rabuzarus c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus 0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
Michael Vogel 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
rabuzarus 3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
Tobias Diekershoff e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
Michael Vogel aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus 26336a60e9 content_wrapper.tpl respects content with no title 2016-06-07 16:38:22 +02:00
rabuzarus 71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
Michael Vogel 4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
Michael Vogel e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
Tobias Diekershoff 2d280f55ac Merge pull request #2544 from annando/issue-1769
Issue 1769: Some enhancements for sending wall mails
2016-05-30 14:35:04 +02:00
Michael Vogel 0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
Michael Vogel 98f7c73d10 Frio: Hovercard is now a core function 2016-05-29 15:28:31 +02:00
Fabrixxm 6734aa5c28 Make user table in admin sortable via table headers
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
2016-05-16 14:38:00 +02:00
Tobias Diekershoff d6a124ee2b Merge pull request #2511 from rabuzarus/1205_photo_live_update
1205 photo live update
2016-05-13 07:57:13 +02:00
rabuzarus 6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
rabuzarus d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
rabuzarus 7e199c72ac login: use ARIA instead of <fieldset> tag 2016-04-25 23:40:07 +02:00
Michael Vogel ee72f1e4bd Merge pull request #2468 from tobiasd/2242-and-htconfig
stuff for the installer and htconfig template
2016-04-21 06:41:02 +02:00
Tobias Diekershoff caa541f939 make doxygen a bit more happy 2016-04-20 16:08:17 +02:00
Tobias Diekershoff 6601582a12 make doxygen a bit more happy 2016-04-20 16:06:39 +02:00
rabuzarus 7ee9c536ee fix: contact edit poll_interval wasn't submitted 2016-04-20 15:37:34 +02:00
Tobias Diekershoff 7c6ebae5c0 reorganize the htconfig template 2016-04-20 14:30:22 +02:00
Tobias Diekershoff d3293dfcf2 during installation choose the highest RINO version possible 2016-04-20 14:17:48 +02:00
rabuzarus ed6ada0da5 rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-04-15 02:25:58 +02:00
rabuzarus 98b62b80f3 rework autocomplete: seperate bbcode completion 2016-04-14 23:59:29 +02:00
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
Tobias Diekershoff 5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
Tobias Diekershoff 1ee405c9c3 added aria describedby elements refering to field help to the input templates 2016-04-04 08:10:27 +02:00
Michael Vogel 3f2a23d48c Unused files are removed 2016-03-15 07:05:10 +01:00
Michael Vogel a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Michael Vogel bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
Michael Vogel b12dbe8831 The worker settings are now available in the admin settings 2016-03-11 23:28:11 +01:00
Michael Vogel 918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 21:20:00 +01:00
fabrixxm d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile
polishing of the contact-edit page
2016-03-06 19:56:59 +01:00
Michael Vogel bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel 6468fbb905 Retraction could work now as well. 2016-03-06 01:37:47 +01:00
Roland Haeder 08abdfda68
<form> and <html> or <head> are not self-closing tags.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:49:56 +01:00
Tobias Diekershoff 09060c0ed3 adding some colors to the Federation Statistics page of the admin panel 2016-02-29 17:24:34 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00