nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
21921 commits 2 branches 55 tags 148 MiB
Commit graph

774 commits

Author SHA1 Message Date
Andreas Neustifter b26da6096b [frio] Restyle album edit header. (#5426) 2018-07-20 15:23:51 -04:00
Andreas Neustifter 24fc070c5c [frio] Restyle photo upload (#5427) 
* Better wording in photo upload.

* [frio] Restyle photo uploader to conform to frio style.
 2018-07-20 15:23:12 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
Hypolite Petovan 762a786611 Replace direct accesses to App->config by Config::get/set calls 2018-07-16 19:38:16 -04:00
Hypolite Petovan e952d6677b Rename App->path to App->urlpath 2018-07-16 19:38:13 -04:00
Michael Vogel d7dc1f6d27
Merge pull request #5370 from MrPetovan/develop 
[ImgBot] optimizes images
 2018-07-15 13:37:23 +02:00
miqrogroove b5fe1c60a9 Fix Broken Profile Links (#5286) 
* Expose the block_public setting to head.tpl

* Do not include hovercard.js if block_public
 2018-07-14 16:31:46 -04:00
Jeroen De Meerleer 678efab1c9 Add worker queue details (#5375) 
* Added Worker queue page

* Added worker queue template

* Added translation strings

* Added en-US translation

* #TGWHT: Thank god we have Typo

* Where donkey == true

* Added in to menu correctly

* Updated link in summary page

* Updated link on summary page for frio theme

* Updated q() to dba::select()

* Revert "Added translation strings"

This reverts commit f1f3694a2412f69c39559650759b6483013f0f17.

* Revert "Added en-US translation"

This reverts commit 61777489e3add56e81c4f976599d8a2e025265cb.
 2018-07-14 14:01:17 -04:00
Tobias Diekershoff 80ac7da01d admins can mark their nodes for explicit content (#5373) 
* added field explicidContent to the metadata in the nodeinfo

* admins can mark their nodes for explicit content

* booleans shall be small
 2018-07-14 12:08:06 -04:00
Hypolite Petovan 6cf50a14fa
Merge pull request #16 from MrPetovan/imgbot 
[ImgBot] optimizes images
 2018-07-14 02:22:52 -04:00
ImgBotApp c50cc25902
[ImgBot] optimizes images 
*Total -- 7,020.51kb -> 6,174.86kb (12.05%)

/images/icons/10/edit.png -- 2.94kb -> 0.37kb (87.38%)
/images/icons/10/add.png -- 2.88kb -> 0.37kb (87.2%)
/images/icons/10/delete.png -- 2.95kb -> 0.38kb (87.14%)
/images/icons/10/gear.png -- 2.97kb -> 0.40kb (86.49%)
/images/icons/16/edit.png -- 3.06kb -> 0.49kb (83.99%)
/images/icons/10/menu.png -- 2.95kb -> 0.47kb (83.99%)
/images/icons/16/add.png -- 3.00kb -> 0.48kb (83.83%)
/images/icons/16/delete.png -- 3.07kb -> 0.50kb (83.67%)
/images/search_18.png -- 3.22kb -> 0.57kb (82.25%)
/images/icons/16/gear.png -- 3.12kb -> 0.56kb (82.18%)
/images/icons/22/edit.png -- 3.17kb -> 0.61kb (80.72%)
/images/icons/22/add.png -- 3.13kb -> 0.62kb (80.16%)
/images/icons/22/delete.png -- 3.22kb -> 0.65kb (79.81%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png -- 3.19kb -> 0.66kb (79.49%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png -- 3.55kb -> 0.76kb (78.6%)
/images/icons/10/star.png -- 3.15kb -> 0.68kb (78.38%)
/images/icons/22/gear.png -- 3.30kb -> 0.74kb (77.72%)
/images/icons/16/menu.png -- 3.19kb -> 0.72kb (77.51%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png -- 2.77kb -> 0.68kb (75.61%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png -- 2.90kb -> 0.71kb (75.5%)
/images/icons/22/menu.png -- 3.28kb -> 0.80kb (75.45%)
/images/icons/16/star.png -- 3.42kb -> 0.95kb (72.33%)
/images/blank.png -- 1.33kb -> 0.39kb (70.42%)
/images/icons/48/add.png -- 3.85kb -> 1.14kb (70.36%)
/images/icons/22/star.png -- 3.69kb -> 1.22kb (66.93%)
/view/theme/frio/img/select_arrow.png -- 0.95kb -> 0.31kb (66.87%)
/images/icons/48/edit.png -- 3.86kb -> 1.30kb (66.39%)
/images/icons/48/delete.png -- 3.90kb -> 1.32kb (66.3%)
/images/diaspora-logo.png -- 8.52kb -> 2.88kb (66.18%)
/view/theme/duepuntozero/deriv/imggreenzero/head.jpg -- 1.05kb -> 0.36kb (65.96%)
/view/theme/frio/img/mime/file.png -- 1.06kb -> 0.37kb (64.94%)
/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg -- 1.08kb -> 0.38kb (64.65%)
/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg -- 1.08kb -> 0.38kb (64.65%)
/view/theme/frio/img/mime/word.png -- 1.05kb -> 0.37kb (64.62%)
/view/theme/frio/img/mime/excel.png -- 1.05kb -> 0.37kb (64.6%)
/view/theme/frio/img/mime/zip.png -- 1.09kb -> 0.39kb (64.33%)
/images/facebook.png -- 4.28kb -> 1.57kb (63.28%)
/images/icons/48/gear.png -- 4.13kb -> 1.53kb (62.89%)
/view/theme/frio/img/mime/powerpoint.png -- 1.11kb -> 0.43kb (61.2%)
/view/theme/frio/img/mime/video.png -- 1.13kb -> 0.46kb (59.39%)
/view/theme/frio/img/icon_search16x16.png -- 1.21kb -> 0.50kb (58.89%)
/images/icons/play.png -- 6.14kb -> 2.53kb (58.84%)
/view/theme/frio/img/mime/audio.png -- 1.10kb -> 0.46kb (58.36%)
/images/icons/text.png -- 6.03kb -> 2.52kb (58.25%)
/images/icons/video.png -- 6.01kb -> 2.52kb (58.1%)
/view/theme/frio/img/mime/image.png -- 1.18kb -> 0.52kb (55.47%)
/images/icons/48/menu.png -- 4.50kb -> 2.02kb (55.02%)
/images/icons/edit.png -- 8.10kb -> 3.71kb (54.19%)
/images/icons/lock.png -- 8.01kb -> 3.75kb (53.22%)
/images/icons/delete.png -- 7.72kb -> 3.62kb (53.06%)
/images/icons/48/star.png -- 4.66kb -> 2.20kb (52.91%)
/images/icons/add.png -- 8.48kb -> 4.02kb (52.6%)
/images/mail.png -- 10.30kb -> 4.95kb (51.93%)
/images/icons/unlock.png -- 8.20kb -> 3.95kb (51.79%)
/images/icons/audio.png -- 7.79kb -> 3.77kb (51.56%)
/images/icons/plugin.png -- 9.23kb -> 4.48kb (51.46%)
/images/icons/zip.png -- 9.60kb -> 4.71kb (50.96%)
/doc/img/editor_frost.png -- 3.70kb -> 1.84kb (50.37%)
/view/theme/frio/img/mime/pdf.png -- 1.23kb -> 0.62kb (49.72%)
/images/icons/gear.png -- 10.49kb -> 5.31kb (49.38%)
/view/theme/frio/img/mime/indesign.png -- 1.30kb -> 0.67kb (48.76%)
/doc/img/frost.png -- 1.96kb -> 1.01kb (48.68%)
/view/theme/frio/img/mime/illustrator.png -- 1.17kb -> 0.61kb (47.96%)
/view/theme/frio/img/mime/photoshop.png -- 1.21kb -> 0.64kb (47.29%)
/images/icons/image.png -- 13.66kb -> 7.22kb (47.17%)
/doc/img/diabook.png -- 3.22kb -> 1.74kb (46.03%)
/images/appnet.png -- 9.21kb -> 5.03kb (45.42%)
/images/blogger.png -- 9.07kb -> 4.99kb (44.95%)
/view/theme/frio/img/placeholder-postform-arrow.png -- 1.82kb -> 1.06kb (41.81%)
/doc/img/posts_define.png -- 3.04kb -> 1.78kb (41.44%)
/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png -- 8.61kb -> 5.10kb (40.72%)
/images/tumblr.png -- 5.92kb -> 3.54kb (40.23%)
/images/wordpress.png -- 20.29kb -> 12.24kb (39.66%)
/images/icons/link.png -- 7.28kb -> 4.43kb (39.21%)
/images/dreamwidth.png -- 7.36kb -> 4.48kb (39.08%)
/images/libertree.png -- 8.61kb -> 5.33kb (38.12%)
/images/googleplus.png -- 8.74kb -> 5.70kb (34.82%)
/doc/img/camera.png -- 0.87kb -> 0.58kb (33.41%)
/doc/img/paper_clip.png -- 0.65kb -> 0.44kb (33.13%)
/doc/img/friendica_rich_editor.png -- 9.65kb -> 6.50kb (32.68%)
/images/icons/menu.png -- 14.44kb -> 9.79kb (32.21%)
/images/gnusocial.png -- 17.53kb -> 12.05kb (31.26%)
/doc/img/friendica_editor.png -- 7.85kb -> 5.47kb (30.32%)
/view/theme/smoothly/images/photo-menu.jpg -- 2.74kb -> 1.92kb (29.99%)
/images/twitter.png -- 13.04kb -> 9.41kb (27.83%)
/images/icons/star.png -- 9.09kb -> 6.66kb (26.73%)
/view/theme/vier/screenshot.png -- 190.75kb -> 141.23kb (25.96%)
/doc/img/post_mark.png -- 0.72kb -> 0.55kb (24.22%)
/view/theme/vier/icons.png -- 19.84kb -> 15.16kb (23.58%)
/view/theme/duepuntozero/bbedit.png -- 2.09kb -> 1.61kb (23.36%)
/view/theme/quattro/icons/bbedit.png -- 2.09kb -> 1.61kb (23.36%)
/view/theme/quattro/showmore-bg.jpg -- 1.92kb -> 1.48kb (22.62%)
/images/screenshots/friendica-frio-red-profle-1.png -- 74.57kb -> 57.72kb (22.59%)
/images/person-48.jpg -- 2.12kb -> 1.66kb (21.69%)
/doc/img/post_tag.png -- 0.60kb -> 0.47kb (21.24%)
/view/theme/frio/img/screenshots/screenshot-mobile.png -- 45.25kb -> 35.72kb (21.06%)
/view/theme/smoothly/images/icons.png -- 19.29kb -> 15.25kb (20.96%)
/images/icons/notify_on.png -- 3.58kb -> 2.84kb (20.68%)
/spec/dfrn-snap2.jpg -- 240.94kb -> 192.52kb (20.1%)
/doc/img/video.png -- 0.61kb -> 0.49kb (20.03%)
/images/icons/info.png -- 4.19kb -> 3.38kb (19.24%)
/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg -- 1.24kb -> 1.02kb (17.42%)
/images/screenshots/friendica-frio-red-profle-2.png -- 153.60kb -> 128.16kb (16.56%)
/doc/img/post_link.png -- 0.56kb -> 0.47kb (15.56%)
/images/icons.png -- 13.48kb -> 11.42kb (15.32%)
/view/theme/smoothly/images/power.png -- 3.05kb -> 2.59kb (15.28%)
/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png -- 12.03kb -> 10.22kb (15%)
/images/person-80.jpg -- 3.03kb -> 2.61kb (13.99%)
/view/theme/frio/img/screenshots/screenshot-jot-modal.png -- 108.30kb -> 93.19kb (13.96%)
/images/icons/notice.png -- 3.61kb -> 3.11kb (13.92%)
/doc/img/editor_vier.png -- 2.63kb -> 2.27kb (13.8%)
/images/screenshots/friendica-frio-green-profle-1.png -- 158.43kb -> 136.58kb (13.79%)
/images/screenshots/friendica-frio-brown-profile-2.png -- 891.01kb -> 768.46kb (13.75%)
/doc/img/acl_win.png -- 53.89kb -> 46.57kb (13.58%)
/view/theme/smoothly/images/next.png -- 0.87kb -> 0.75kb (13.58%)
/doc/img/dispy.png -- 3.61kb -> 3.13kb (13.32%)
/images/icons/notify_off.png -- 4.24kb -> 3.68kb (13.25%)
/doc/img/darkbubble.png -- 2.43kb -> 2.11kb (13.03%)
/images/screenshots/friendica-frio-red-profle-3.png -- 570.89kb -> 497.47kb (12.86%)
/images/screenshots/friendica-frio-brown-profile-1.png -- 526.17kb -> 461.66kb (12.26%)
/view/theme/frio/screenshot.png -- 133.28kb -> 117.52kb (11.83%)
/view/theme/frio/img/screenshots/screenshot.png -- 133.28kb -> 117.52kb (11.83%)
/images/icons/feed.png -- 8.80kb -> 7.78kb (11.58%)
/images/screenshots/friendica-frio-green-profle-2.png -- 460.00kb -> 408.47kb (11.2%)
/images/icons/user.png -- 6.76kb -> 6.04kb (10.69%)
/view/theme/smoothly/images/prev.png -- 0.83kb -> 0.75kb (9.5%)
/images/icons/48/feed.png -- 2.63kb -> 2.39kb (9.03%)
/images/icons/48/user.png -- 2.22kb -> 2.03kb (8.55%)
/view/theme/duepuntozero/editicons.png -- 6.15kb -> 5.67kb (7.81%)
/images/content-types.png -- 3.80kb -> 3.52kb (7.43%)
/doc/img/post_categorize.png -- 0.48kb -> 0.44kb (7.38%)
/images/icons/16/play.png -- 0.50kb -> 0.46kb (7.09%)
/doc/img/editor_zero.png -- 2.60kb -> 2.42kb (7.05%)
/images/default-profile-mm.jpg -- 0.31kb -> 0.29kb (6.52%)
/images/screenshots/friendica-frio-mobile-profle-2.png -- 50.47kb -> 47.29kb (6.3%)
/doc/img/post_thumbs_down.png -- 0.51kb -> 0.48kb (6.14%)
/view/theme/duepuntozero/deriv/imggreenzero/border.jpg -- 0.33kb -> 0.31kb (6.14%)
/view/theme/duepuntozero/border.jpg -- 0.33kb -> 0.31kb (6.14%)
/images/default-profile-sm.jpg -- 0.34kb -> 0.32kb (6.07%)
/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg -- 0.35kb -> 0.33kb (5.92%)
/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg -- 0.36kb -> 0.33kb (5.77%)
/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg -- 0.36kb -> 0.33kb (5.77%)
/view/theme/duepuntozero/head.jpg -- 0.37kb -> 0.35kb (5.48%)
/view/theme/smoothly/images/menu-user-pin.jpg -- 0.38kb -> 0.36kb (5.45%)
/images/plugin.png -- 2.00kb -> 1.89kb (5.43%)
/images/show_all_off.png -- 0.53kb -> 0.50kb (5.38%)
/images/person-175.jpg -- 5.76kb -> 5.45kb (5.36%)
/doc/img/post_share.png -- 0.43kb -> 0.41kb (4.95%)
/spec/dfrn2_contact_request.png -- 317.37kb -> 301.69kb (4.94%)
/doc/img/post_thumbs_up.png -- 0.50kb -> 0.47kb (4.72%)
/view/theme/duepuntozero/photo-menu.jpg -- 0.45kb -> 0.43kb (4.58%)
/images/default-profile.jpg -- 0.48kb -> 0.46kb (4.29%)
/view/theme/duepuntozero/screenshot.jpg -- 70.86kb -> 67.88kb (4.2%)
/images/onoff.jpg -- 0.49kb -> 0.47kb (4.18%)
/spec/dfrn2_contact_confirmation.png -- 245.40kb -> 235.22kb (4.15%)
/view/theme/smoothly/screenshot.png -- 131.94kb -> 126.54kb (4.09%)
/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg -- 0.51kb -> 0.49kb (4.03%)
/doc/img/darkzero.png -- 2.80kb -> 2.69kb (4.01%)
/view/theme/quattro/screenshot.jpg -- 67.98kb -> 65.57kb (3.54%)
/images/icons/10/play.png -- 0.41kb -> 0.40kb (3.33%)
/doc/img/editor_darkbubble.png -- 2.49kb -> 2.40kb (3.3%)
/view/theme/quattro/icons/contacts3.png -- 0.55kb -> 0.53kb (3.04%)
/images/friendica-256.jpg -- 16.73kb -> 16.25kb (2.87%)
/view/theme/quattro/icons/men.png -- 0.38kb -> 0.37kb (2.79%)
/images/icons/22/image.png -- 0.89kb -> 0.87kb (2.73%)
/view/theme/frio/img/friendica-32.png -- 0.62kb -> 0.61kb (2.5%)
/images/icons/48/text.png -- 0.95kb -> 0.93kb (2.47%)
/images/screenshots/friendica-frio-mobile-profle-1.png -- 47.24kb -> 46.25kb (2.11%)
/view/theme/smoothly/images/rarrow.gif -- 0.99kb -> 0.97kb (2.07%)
/images/icons/48/video.png -- 1.00kb -> 0.98kb (2.05%)
/images/icons/48/notify_on.png -- 1.47kb -> 1.44kb (1.99%)
/images/icons/48/image.png -- 2.18kb -> 2.13kb (1.93%)
/view/theme/frio/img/screenshots/screenshot-scheme-red.png -- 750.10kb -> 736.91kb (1.76%)
/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png -- 238.98kb -> 235.05kb (1.65%)
/images/icons/48/lock.png -- 1.31kb -> 1.29kb (1.64%)
/images/icons/10/plugin.png -- 0.46kb -> 0.45kb (1.49%)
/images/icons/48/play.png -- 0.99kb -> 0.98kb (1.47%)
/view/theme/frio/img/screenshots/screenshot-settings.png -- 50.67kb -> 49.96kb (1.41%)
/images/icons/48/zip.png -- 1.62kb -> 1.60kb (1.39%)
/doc/img/globe.png -- 0.79kb -> 0.78kb (1.24%)
/images/icons/48/audio.png -- 1.28kb -> 1.26kb (1.22%)
/images/icons/48/plugin.png -- 1.62kb -> 1.60kb (1.2%)
/images/icons/group.png -- 7.10kb -> 7.02kb (1.13%)
/images/friendica-128.jpg -- 8.17kb -> 8.08kb (1.11%)
/images/icons/10/audio.png -- 0.46kb -> 0.45kb (1.06%)
/images/icons/22/notify_on.png -- 0.70kb -> 0.70kb (0.83%)
/doc/img/editor_frio.png -- 1.43kb -> 1.42kb (0.68%)
/images/screenshots/friendica-frio-default-profile-1.png -- 666.68kb -> 662.45kb (0.63%)
/images/icons/16/image.png -- 0.65kb -> 0.65kb (0.45%)
/images/icons/48/group.png -- 2.34kb -> 2.33kb (0.38%)
 2018-07-13 14:38:11 +00:00
Tobias Diekershoff 30cef1a739 some plugins left over (#5369) 
* tinymce is not used anymore, we can delete the cuson CSS file

* mv the plugins_details template to addon_details

* renamed template called from admin panel

* some CSS classes that should be addon where still plugin

* Insert a warning into the generated quattro CSS files
 2018-07-12 13:18:45 -04:00
hoergen 47582cd5ee updated wall-spacer and color of preview (#5357) 
* Update wall_thread.tpl

named an unnamed style definition to can address it via css

* Update style.css

Added div wall-spacer definition

* Update wall_thread.tpl

removed wall-spacer definition. moved to main css

* Update style.css

* Update wall_thread.tpl

* Update plusminus.css

wall-spacer and color of preview changed

* Update plusminus.css

* spaces

spaces

* Update style.css

* Update style.css

removed tabs and spaces
 2018-07-11 14:33:44 -04:00
Andreas Neustifter dd00a943f2 Only make changes for frio. (#5347) 2018-07-11 11:28:38 -04:00
hoergen 39abfb547d Update wall_thread.tpl (#5352) 
* Update wall_thread.tpl

named an unnamed style definition to can address it via css

* Update style.css

Added div wall-spacer definition

* Update wall_thread.tpl

removed wall-spacer definition. moved to main css

* Update style.css

* Update wall_thread.tpl
 2018-07-10 09:31:29 -04:00
Michael Vogel 0360f7197a Several more warnings ... (#5340) 
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
 2018-07-10 08:27:56 -04:00
Andreas Neustifter 32ef5623ab [frio] Improve Group Editing (#5349) 
* Improve group-editing and edit-navigation.

Use icons next to groups and header for navigation to editing groups and adding new groups.
Also use icon from group-sidebar for editing groups.

* Unify look&feel of contact search bars.

* Remove nogroup page and replace with /group/none.

* Make sure proper items are selected in aside.

* Use icon instead of link for 'View Contacs' on profile page.

* Fix none-working /group/none.

* Fix highlighting for everyone in group aside.
 2018-07-09 18:36:50 -04:00
Andreas Neustifter 09b7e217c7 [Suggestion] Move New User Tip Link (#5342) 
* Move new member tips to navigation bar.

The link looks so forlorn when its just somewhere in there. Put it in the nav bar.

* Style new member hints link propery.

* Make changes requested by @MrPetovan.
 2018-07-09 18:20:57 -04:00
hoergen eb5edad07a
Add files via upload 
frio: new scheme Plusminus aims to minimize empty design spaces
 2018-06-30 13:39:11 +02:00
Roland Häder 8ad523fbc8
Continued a bit: 
- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-06-20 22:19:54 +02:00
rabuzarus 0a97a3f822 Bugfix: hide savedsearch butten and subthread button for non local_users 2018-06-19 18:27:54 +02:00
rabuzarus a2fc1be187 fix scroll position in stream while ajax update 2018-06-16 13:05:33 +02:00
rabuzarus 2b69571cbf Frio: add addon_hooks to head.tpl 2018-06-15 22:55:00 +02:00
Hypolite Petovan f0c2b77157
Merge pull request #5215 from rabuzarus/20180614_-_frio_contact_suggestion_template 
Frio: provide a template for received contact suggestions
 2018-06-14 13:56:30 -04:00
rabuzarus 02344ce78c Frio: background color for fsuggest module 2018-06-14 18:57:30 +02:00
rabuzarus aaeb85c944 Frio: scroll to the contact request in notifications module 2018-06-14 18:49:53 +02:00
rabuzarus b8186ba98b Frio: provide a template for received contact suggestions 2018-06-14 17:05:23 +02:00
rabuzarus 0db6002e3c Frio: fix contact filtering on contacts page 2018-06-13 23:04:07 +02:00
rabuzarus 9c9b82ba59 Frio: move tos link to a another place in the nave menu 2018-05-27 09:55:05 +02:00
rabuzarus 58f9498c7e Frio: tos page background for frio 2018-05-27 09:48:27 +02:00
rabuzarus 0d7d688649 frio - add "info about the instance" link into the navbar for non-authed users 2018-05-22 12:44:35 +02:00
Hypolite Petovan c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Michael c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff f285d9c7eb add link to TOS in frios registration template if enabled 2018-05-16 13:41:56 +02:00
Tobias Diekershoff eec0826750 added link to the TOS page if it is activated 2018-05-16 11:57:06 +02:00
Hypolite Petovan 2975d1a0be
Merge pull request #4959 from koyuawsmbrtn/develop 
Added dark scheme to frio
 2018-04-30 10:30:01 -04:00
Koyu Berteon 90b24251d2 Renamed files as requested 2018-04-30 15:38:46 +02:00
Koyu Berteon 125c3e7cab Corrected time 2018-04-30 15:34:23 +02:00
Koyu Berteon 01bd3a3a7b Fixed identation in dark.php 2018-04-30 15:27:40 +02:00
Koyu Berteon 72cab9bb93 Added dark scheme to frio 2018-04-30 15:25:31 +02:00
rabuzarus 0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Hypolite Petovan fde3d6f870 Replace current_theme() and current_theme_url() calls 2018-04-28 18:37:25 -04:00
Hypolite Petovan 3213715b60 Fix formatting in frio_boot.php 2018-04-28 18:36:32 -04:00
Andreas Neustifter babb45efd8 Fix login page layout without OpenId. 
When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.
 2018-04-27 20:00:46 +00:00
rabuzarus a19784d209
Merge pull request #4890 from astifter/reorganize_login 
Reorganize Login to Fix #4878
 2018-04-27 19:56:25 +02:00
Hypolite Petovan 2d6dafc057 [frio] Improve background styles' description 2018-04-26 07:50:05 -04:00
Hypolite Petovan 1ce999a4ab [frio] Fix quoting style in php/Image 2018-04-26 07:46:59 -04:00
Hypolite Petovan 7feeb0af78 Add backward-compatibility for config variables after schema rename 2018-04-26 04:22:04 -04:00
rabuzarus 3fb993f37b frio - fix help toc aside 2018-04-25 23:30:56 +02:00
Hypolite Petovan 86e4690b5f [frio] Add background-repeat attribute to background image options 
- Update background image options names and labels
- Add background image option label tag
 2018-04-24 20:42:23 -04:00
Hypolite Petovan 4307a87d6a [frio] Rename "Default" color scheme as "Custom" 
- Capitalize scheme name
 2018-04-24 20:40:29 -04:00
Hypolite Petovan 0f82c3348d [frio] Rename bgcolor to background-color 2018-04-24 20:39:34 -04:00
Hypolite Petovan 3bfa6facfc [frio] Fix typo schema -> scheme 2018-04-24 20:26:14 -04:00
Hypolite Petovan eb9b832c3a [frio] Normalize quoting style in PHP files 2018-04-24 20:12:43 -04:00
Hypolite Petovan b65c8c55a4 [frio] Fix formatting in PHP files 2018-04-24 20:05:20 -04:00
Andreas Neustifter d06a174f0c Make register-link less obtrusive. 2018-04-24 21:18:31 +00:00
Andreas Neustifter 1a69265da4 Fix missing background tiles. 2018-04-24 21:16:15 +00:00
rabuzarus ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
Andreas Neustifter 6a1ce9c9c0 Fix login dialog layout for frio. 
Rearrange login dialog distinguish better between logging und registering.
 2018-04-23 20:29:55 +00:00
Andreas Neustifter fe74a3d697 Remove empty help spans from templates. 
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
 2018-04-23 20:29:55 +00:00
Hypolite Petovan a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
rabuzarus 763b061a2b frio - Bugfix - there was a wrong user count in admin-users template 2018-04-23 00:26:00 +02:00
rabuzarus 04bdba0d78 frio - some work on the admin contactblock template to be more consistant with other setting pages 2018-04-22 23:06:06 +02:00
Friendica 390983a331 Haromonize Find People Widget. 
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
 2018-04-22 20:44:22 +00:00
rabuzarus 5a82ee04bc frio - some work on the admin users template to be more consistant with other setting pages 2018-04-22 20:23:24 +02:00
rabuzarus 7e41f62809 frio - add missing page styles for user setting pages 2018-04-21 16:22:11 +02:00
Hypolite Petovan afced187bc
Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory 
frio - fix default template if friendica is installed into a subdirectory
 2018-04-21 10:10:32 -04:00
rabuzarus 8f6e018958 frio - remove $baseurl variable from default template because we don't need it anymore 2018-04-21 16:04:11 +02:00
rabuzarus a65e93faea frio - fix default template if friendica is installed into a subdirectory 2018-04-21 15:43:11 +02:00
rabuzarus 54c3efccab frio - don't show the "insert image" button in modals (because it doesn't work at the current state) 2018-04-21 14:27:57 +02:00
rabuzarus 4285cd5dc7 frio - fix image upload for prv messages 2018-04-21 14:05:40 +02:00
fabrixxm f976361935 Frio admin/users template: show account type in user details 2018-04-20 14:30:04 +02:00
fabrixxm 23e5225b20 Frio admn/users: use icons for page flags and account type in table 
to have more space
 2018-04-20 14:11:34 +02:00
fabrixxm 516eb2b9ea Frio admin/users template: fix users avatars, table cols width to have more space 2018-04-20 14:07:11 +02:00
fabrixxm abd7b2666c Frio: admin/users template 
- replace last a href=# with button
- use smallest breakpoint for panels footers
 2018-04-19 19:00:16 +02:00
fabrixxm e909beee04 Frio: admin/users template 
- move checkboxes on first column
- move select/deselect all as button group on panel footer
- use existing jquery in mod_admin.js for select/deselect all functionality
- add page content wrapper, without padding
- fix user avatar size in "pending deletion" table
 2018-04-19 18:17:46 +02:00
fabrixxm 20a2918bda Frio: admin/user template fixes 
- small fixes to html
- move js and css to extern files
- move checkboxes to first column
 2018-04-18 21:43:33 +02:00
fabrixxm 362654abf0 Fix indentation 2018-04-18 19:44:10 +02:00
fabrixxm 1017e244ca Frio: add template for admin/users 2018-04-18 17:52:34 +02:00
Tobias Diekershoff 00311af79b added missiing information to theme templates 2018-04-12 10:33:28 +02:00
Hypolite Petovan 60f3a6aac0 [frio] Add color to group membership action buttons 2018-04-06 23:55:29 -04:00
Hypolite Petovan 59d42e9681
Merge pull request #4762 from annando/frio-accessibility 
Some more accessibility for "Frio"
 2018-04-06 17:07:25 -04:00
Michael ed316b38ee Some more accessibility for "Frio" 2018-04-06 20:42:38 +00:00
Michael Vogel 05cff59f70
Merge pull request #4722 from MrPetovan/task/add-content_filter-hook 
Add content_filter hook
 2018-04-06 06:42:52 +02:00
Michael 3792012723 Improved accessibility for "Frio" 2018-04-05 21:50:34 +00:00
Hypolite Petovan 180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
rabuzarus 34204ca580 update javascript cropper library 2018-03-29 17:57:06 +02:00
Michael 8bdd417b04 Asynchronous Javascript is deactivated 2018-03-27 05:45:56 +00:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Andi e473be01db frio: removed "Illegal string offset" Warnings 2018-03-21 23:53:41 +01:00
Michael 858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Hypolite Petovan 15099a97d5 [frio] Add asynchronous javascript assets loading 2018-03-07 08:08:37 -05:00
Hypolite Petovan 274ce95d13 Move Composer assets to view/ 2018-03-07 08:07:36 -05:00
Michael 9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00
Hypolite Petovan f0268c6142 Fix indentation in frio/css/style.css 2018-02-18 08:13:59 -05:00
Hypolite Petovan 96078a1fca [frio] Make settings/addon look like settings/display 2018-02-18 08:13:59 -05:00
Hypolite Petovan 7a38fbf84b [Scrutinizer] Fix undeclared variables part 7: mod/ and view/ 
- Remove unused function `salmon_return()`
 2018-02-14 00:07:26 -05:00
rabuzarus 02ef222fe1 fix undeclared variables or wrong variable names (/view) 2018-02-12 16:50:05 +01:00
rabuzarus 9a4d19e284 move membersince addon to core 2018-02-09 20:44:45 +01:00
Hypolite Petovan b5a88c5b12
Merge pull request #4422 from rabuzarus/20180208_-_frio_rename_transparency_in_opacity 
frio: renaming background transparency into background opacity
 2018-02-08 12:55:16 -05:00
rabuzarus 143af5a6d5 frio: renaming background transparency into background opacity 2018-02-08 18:47:06 +01:00
rabuzarus d59cd7dfa4 frio: disable nav login button on home and login module 2018-02-08 18:36:39 +01:00
rabuzarus 764a9be90a Frio: add admin summary template 2018-02-07 16:14:12 +01:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src 
Move include/bbcode to src/ part 1 : Everything but bbcode()
 2018-02-07 07:18:39 +01:00
rabuzarus d6a751bfd1 Frio: better styling for the admin addons/themes selection page 2018-02-06 16:13:19 +01:00
Hypolite Petovan 010cf3b1e8 Update references to BBCode methods 
- Resolve name conflicts with Util\Network
 2018-02-04 19:26:22 -05:00
Hypolite Petovan 1e99cea033 [frio] Fix spacing in field_input.tpl 2018-02-03 09:51:23 -05:00
Tobias Diekershoff c28b62b302 lets print out the internets 2018-01-31 11:31:47 +01:00
Tobias Diekershoff 7ef77b926a Admin menu reorganisation 
The aside menu in the admin panel is now handled in one array, which also
holds the submenu items. Also the sections of the menu are now a bit more
structured and separated from each other.
 2018-01-30 13:37:00 +01:00
Hypolite Petovan cd392db078 Move js/ folder under view/ 
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
 2018-01-28 16:17:36 -05:00
Hypolite Petovan a05eeeb49c Remove jQuery Migrate file 
- Remove script references
 2018-01-28 15:54:20 -05:00
Hypolite Petovan 19e197ef51 Forgot a path element in perfect-scrollbar paths 2018-01-27 21:09:49 -05:00
Hypolite Petovan e54cdb1f72 Fix wrong path to perfect-scrollbar library files 2018-01-27 19:06:20 -05:00
Hypolite Petovan 341d2fae12 Updated references to perfect-scrollbar 2018-01-27 18:04:02 -05:00
Hypolite Petovan e34bc8761e Update references to fullcalendar and moment 2018-01-27 15:51:08 -05:00
Hypolite Petovan 9b0fc558f7 Update references to jgrowl 2018-01-27 11:52:06 -05:00
Hypolite Petovan 9d78010e7f Update references to jquery.datetimepicker 2018-01-27 08:09:30 -05:00
Adam Magness 21f593bf4b Adjust for templates 
Use new t() for template button text
 2018-01-22 22:20:35 -05:00
Adam Magness 27d5a7112a Theme t() uses 
Updatee t() calls in themes
 2018-01-22 18:38:34 -05:00
Adam Magness f0725ae384 Hopefully all t() 
hopefully the last of the t()
 2018-01-22 18:03:26 -05:00
Adam Magness ead9d86236 More t() 
Update more t() calls
 2018-01-22 18:03:26 -05:00
Hypolite Petovan 1b2334745a Fix limit and search parameters in frio_acl_lookup 2018-01-21 12:39:47 -05:00
Hypolite Petovan d3fa7ae5ae Fix contact autocomplete template repeated picture 
- Use <template> to prevent wrong src lookup
 2018-01-21 11:48:16 -05:00
Adam Magness b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Hypolite Petovan 4ed86adfab [frio] Add max-width: 100% for video tags 2018-01-19 20:14:26 -05:00
Hypolite Petovan b432a17538 Update references to jquery 2018-01-18 11:27:14 -05:00
Hypolite Petovan 9ee1b14b2b Update references to colorbox css and js files 
- Remove commented out references to other css/js files
 2018-01-18 11:27:14 -05:00
Hypolite Petovan 0d9595d80a Update all references to webtoolkit.base64 2018-01-17 21:23:51 -05:00
Michael Vogel a13ad278ef
Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git 
Remove vendor from git
 2018-01-18 01:02:55 +01:00
fabrixxm f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
fabrixxm fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm 2c8bbea65d frio: tweak login template, fix style 
move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile
 2018-01-17 16:01:34 +01:00
fabrixxm 9862194914 Frio: fix home page 
Add home.tpl, fix style with custom home.html, fix style with custom page content from addon
 2018-01-17 13:29:04 +01:00
Hypolite Petovan 6fe64a5ac6 Fix references to text_highlighter css 2018-01-16 23:48:07 -05:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Adam Magness 6cf6029ff5 Rename functions and calls 
Rename functions and update calls
 2018-01-15 09:50:06 -05:00
Adam Magness 2ef8d72b60 Missing use 
missing use statement for profile
 2018-01-14 21:29:19 -05:00
Adam Magness 4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -05:00
fabrixxm 5392f9eb8b spaces to tabs 2018-01-14 21:53:37 +01:00
fabrixxm de227e305e Frio: add input for login backround image in admin settings 2018-01-14 19:19:24 +01:00
fabrixxm 1064da1052 New home/login page style 2018-01-14 18:45:00 +01:00
Hypolite Petovan 2f2ded4e55 [frio] Set videowidth to 622px 2018-01-10 19:25:08 -05:00
rabuzarus eb031e7ee2 rename the "save" button to 'follow' when searching for tags 2018-01-10 16:08:39 +01:00
Hypolite Petovan c157e7ffa4 Improve connectors settings display 
- Move settings templates to subfolder
- Add accordion display to "General Theme Settings" in frio
- Replace hand-written template with form field includes
- Simplify sprintf(t()) structures
 2018-01-05 02:17:36 -05:00
Hypolite Petovan 9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
rabuzarus ebb60ddd58 bugfix: -frio- save search button should be only visible if the feature is enabled 2018-01-02 15:48:11 +01:00
Hypolite Petovan 54d598ce7c Fix formatting and PHP Notice in frio theme 
- Fix undefined variable $a->install in frio/style
- Removed unused $args assignments in frio/theme
- Removed unused $sql_extra2 variable in frio_acl_lookup()
 2018-01-02 08:09:49 -05:00
Hypolite Petovan 190a765731 Fix Notice and formatting in frio 2017-12-29 21:55:13 -05:00
rabuzarus 0787f093d6 frio: remove shome whitespace 2017-12-15 18:16:07 +01:00
rabuzarus 85f558d8fb frio: fix some contact list issues 2017-12-15 18:09:04 +01:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Michael Vogel e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
Adam Magness 48367220b8 Templete adjustment 
based on errors that were showing up in the debugger console on chrome
 2017-12-07 09:35:24 -05:00
Hypolite Petovan 52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Hypolite Petovan 75181322ba Improve page contacblock for frio theme 2017-12-01 22:33:04 -05:00
Hypolite Petovan ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan dc09319695 Add admin/contactblock page 
- Add page template
 2017-12-01 00:43:39 -05:00
Hypolite Petovan 16d0c30328 Move admin templates to dedicated sub-folder 2017-12-01 00:40:55 -05:00
Hypolite Petovan 052ba729d7 Improved translation functions 
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
 2017-12-01 00:35:40 -05:00
Adam Magness 54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Hypolite Petovan 3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
Michael cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
rabuzarus 4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael 3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
rabuzarus 59ae5633ec tag-cloud: some polishing + remove authors (we don't use it at the moment) 2017-11-22 23:18:01 +01:00
rabuzarus d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Hypolite Petovan 2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael 2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael 7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
rabuzarus 578dc6f967 frio: sanitize $schema only if the variable is initialized 2017-10-24 14:44:31 +02:00
rabuzarus 2687a42e3c frio: sanitise $schema 2017-10-23 22:14:35 +02:00
rabuzarus 7e273ba51b frio: fix wrong slider position in the theme_settings 2017-10-23 21:15:46 +02:00
rabuzarus 6a8969452a frio: add the possibility for the admin to change the colors for non personal pages 2017-10-23 20:26:31 +02:00
rabuzarus 1585918f29 frio: set a dummy img for background image if no img was set (Otherwise the empty value would be replaced in the browser with a path to the theme and the css would be loaded a second time) 2017-10-23 15:25:09 +02:00
rabuzarus 9be6dfadba frio: use cached css if no settings (or file) have changed 2017-10-23 15:16:23 +02:00
Michael Vogel 2c55d9f3ce Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations 
fix some HTML violations in frio
 2017-10-22 07:48:06 +02:00
Michael Vogel 2a5dd1e857 Merge pull request #3815 from rabuzarus/20171019_-_fix_more_posted_date_widget 
fix some more HTML violations in posted_date_widget.tpl
 2017-10-21 08:14:52 +02:00
rabuzarus f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
rabuzarus 8167e75e6a fix some more HTML violations in posted_date_widget.tpl 2017-10-19 16:34:08 +02:00
rabuzarus 184bfc722d fix #3812 - some brocken parts in the display of events (default template) 2017-10-19 14:16:39 +02:00
rabuzarus dd8ff1f097 remove unused 'aria-labelledby' in frios modal 2017-10-18 23:38:51 +02:00
rabuzarus a6e8734a37 Bugfix: fix some duplicate ID 2017-10-18 23:22:05 +02:00
rabuzarus 7ddc5339fd frio: fix event seperator 2017-10-18 20:44:29 +02:00
rabuzarus e5ce73b1f8 frio: fix margin and title for events 2017-10-18 20:18:50 +02:00
Michael Vogel d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Tobias Diekershoff cadc8aa6e8 Merge pull request #3787 from rabuzarus/20171013_-_format_event_in_stream 
event items are now more themeable in the networkstream
 2017-10-16 11:29:43 +02:00
rabuzarus c1699364ae reload the acl if a new event edit or copy modal is opened 2017-10-15 22:34:31 +02:00
rabuzarus 74d813042f extend checkbox template for customized attributes 2017-10-15 18:45:49 +02:00
rabuzarus 204c134ab8 Buxfix: fix image floating in frios nav-short-info 2017-10-15 17:54:35 +02:00
rabuzarus 4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
rabuzarus dcbf4d6d11 fix event html construction (fixes #2646) 2017-10-13 20:03:47 +02:00
rabuzarus 553428d1b1 event items are now more themeable in the networkstream. 
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
 2017-10-13 19:42:27 +02:00