Commit graph

2820 commits

Author SHA1 Message Date
daniel
f718efcc95
Frontend ui refactor (#379)
* Make followers list flush on mobile

* Make followers list flush on mobile

* Add message for no saved posts

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* add MySQL version req to README.md

* adding back example file, deleted accidentally

* and remove extra empty line, no need to cause a change in the repo

* make clear which version of MySQL is supported

* Unsquish tag-page avatars

Fix #374

* Fix usernames escaping div and make images link to users

* Fix Nginx config
2018-08-14 15:12:44 -06:00
Daniel Supernault
7192c11355
Update StatusController, add AP discovery 2018-08-13 22:23:40 -06:00
Daniel Supernault
230f935262
Update settings view 2018-08-12 20:50:08 -06:00
Daniel Supernault
00aaf9bf35
Update settings sidebar view 2018-08-12 20:46:16 -06:00
daniel
c2f9c02f9b
Merge pull request #294 from hellcp/patch-24
Adapt profile changes to discover
2018-08-10 19:32:00 -06:00
Stasiek Michalski
d3daa9b084
Merge branch 'frontend-ui-refactor' into patch-23 2018-08-10 21:16:24 +02:00
Daniel Supernault
d654ce93d4
Add favicon 2018-08-10 13:06:12 -06:00
Tim Speckhals
ef2c6f5384
Translate 'Direct Messages' 2018-08-10 19:06:25 +02:00
Daniel Supernault
6a12f59df1
Update settings sidebar view 2018-08-10 03:22:36 -06:00
Daniel Supernault
f4f7909a06
Update web routes 2018-08-10 03:10:05 -06:00
Daniel Supernault
5d3b66f778
Update site sidebar 2018-08-10 00:56:38 -06:00
Daniel Supernault
1383feca0d
Update hashtag view 2018-08-10 00:26:51 -06:00
Daniel Supernault
56c10155d4
Update settings sidebar view 2018-08-09 23:48:18 -06:00
Daniel Supernault
6a834fdd5c
Update activity view 2018-08-09 23:29:48 -06:00
Daniel Supernault
ca1783e0f6
Update navmenu i18n 2018-08-09 23:09:48 -06:00
Daniel Supernault
f30542ffff
Add noindex to profile follower/following pages 2018-08-09 22:55:15 -06:00
Daniel Supernault
67eef91d2d
Update 404 view 2018-08-09 22:53:53 -06:00
Daniel Supernault
32828b9ea9
Update navbar view 2018-08-09 22:50:38 -06:00
Daniel Supernault
483af424d6
Update app master view 2018-08-09 22:38:46 -06:00
Daniel Supernault
08a14877d4
Update status view 2018-08-09 22:29:56 -06:00
Daniel Supernault
a298ed6178
Update status form view 🎉 2018-08-09 22:24:42 -06:00
Daniel Supernault
f17f2e4ceb
Update status template view 2018-08-09 22:19:52 -06:00
Daniel Supernault
d8d592b757
Update custom sass 2018-08-09 22:02:31 -06:00
Daniel Supernault
55e033fdec
Update timeline component, add lazy loading 2018-08-09 22:01:35 -06:00
Daniel Supernault
95fdf03d36
Update typeahead.js lib 2018-08-09 22:00:41 -06:00
Daniel Supernault
7c3c537572
Update statusform component 2018-08-09 22:00:10 -06:00
Daniel Supernault
594d653980
Update bloodhound.js lib 2018-08-09 21:57:54 -06:00
Daniel Supernault
dbfc401987
Update likebutton component 2018-08-09 21:57:06 -06:00
Daniel Supernault
03f4c23024
Update commentform component 2018-08-09 21:54:12 -06:00
Daniel Supernault
5a9fb29c17
Update bootstrap.js 2018-08-09 21:50:09 -06:00
Daniel Supernault
0ce5ca82bc
Add FollowSuggestions vue component 2018-08-09 21:49:15 -06:00
Daniel Supernault
9e9a96ce95
Add timeline template view 2018-08-09 21:42:06 -06:00
Daniel Supernault
a22a5c2922
Add show all comments view 2018-08-09 20:03:33 -06:00
Daniel Supernault
bc55b276f0
Update notifications view 2018-08-09 20:00:04 -06:00
Daniel Supernault
483dca7788
Add following activity view 2018-08-09 19:58:47 -06:00
daniel
6af6e3d5c6
Merge pull request #310 from OpenAlgeria/dev
French Translate update
2018-08-09 15:44:00 -06:00
daniel
d2a2a2d260
Merge pull request #306 from Quenty31/dev
[i18n] Update Occitan translation
2018-08-09 15:40:15 -06:00
daniel
ed7b85faee
Merge pull request #305 from fediverse-pl/dev
i18n: Update Polish translation
2018-08-09 15:39:42 -06:00
daniel
c113b90321
Merge pull request #296 from xmgz/dev
update galician
2018-08-09 15:36:21 -06:00
daniel
921ff1ae61
Merge branch 'frontend-ui-refactor' into gdpr-privacy-policy 2018-08-09 15:33:41 -06:00
daniel
f46b23aa94
Merge pull request #347 from lamby/dont-double-escape-caption-in-atom-feed
Don't double-escape caption in Atom feed.
2018-08-09 15:30:36 -06:00
Chris Lamb
e527e888b5 Don't double-escape caption in Atom feed.
This avoids ugly literal "I don&amp;#039;t know" in feed readers, etc.
2018-08-08 22:36:45 +02:00
Daniel Supernault
4ba9e2cd6c Add infinite scroll to profiles, and support private profiles 2018-07-24 22:33:55 -06:00
Daniel Supernault
b29ca1823d Update settings template 2018-07-23 23:09:45 -06:00
Daniel Supernault
dbce506655 Update footer 2018-07-23 21:22:01 -06:00
Daniel Supernault
5ec4b8f8d2 Add Laravel Passport vue components 2018-07-12 16:00:34 -06:00
Daniel Supernault
04b22b29d7 Update navbar logo 2018-07-02 21:15:28 -06:00
OpenAlgeria
9554387dd4
Create navmenu.php 2018-06-23 15:14:13 +02:00
OpenAlgeria
6f1b42508f
Update notification.php 2018-06-23 15:11:02 +02:00
OpenAlgeria
37f9ae41c7
Update notification.php 2018-06-23 15:08:22 +02:00
Daniel Supernault
b7fcc6a45b Update settings page 2018-06-21 18:54:18 -06:00
Quentí
037f76398b
Create timeline.php 2018-06-19 22:19:38 +02:00
Quentí
74f250b5e7
Update profile.php 2018-06-19 22:18:48 +02:00
Quentí
65b015c3a6
Update 2018-06-19 22:01:00 +02:00
Quentí
7025312180
Creacion 2018-06-19 21:59:04 +02:00
Marcin Mikołajczak
a28627f87b i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-19 20:42:35 +02:00
Daniel Supernault
bc5356420a Update logo
Fixes #295
2018-06-18 14:21:21 -06:00
Xosé M
f488156937 backup 2018-06-18 16:20:00 +02:00
Xosé M
27ad80d9a8 navmenu 2018-06-18 16:03:48 +02:00
Stasiek Michalski
dc799ca917
Adapt profile changes to tags too 2018-06-18 15:53:12 +02:00
Stasiek Michalski
87a0e036d3
Adapt tiling from user profiles 2018-06-18 15:46:26 +02:00
Stasiek Michalski
b7dfe762f7
Merge branch 'frontend-ui-refactor' into patch-23 2018-06-18 12:55:21 +02:00
Daniel Supernault
3c63e20343 Update logo 2018-06-18 00:37:06 -06:00
Daniel Supernault
f7cd91110d Update compiled assets 2018-06-17 23:28:34 -06:00
Daniel Supernault
aeb2a1679d Add new logo 2018-06-17 22:53:55 -06:00
daniel
154cd4815d
Merge pull request #273 from hellcp/patch-22
Make mobile cards flush
2018-06-17 21:48:19 -06:00
daniel
0bf32c63d5
Merge pull request #272 from hellcp/patch-21
Make icons in status more consistent
2018-06-17 21:47:16 -06:00
Daniel Supernault
4d686b8074 Update commentform
Closes #284
2018-06-17 21:45:01 -06:00
daniel
2d6bb19a84
Merge pull request #260 from j1t/dev
Hebrew Translation Update
2018-06-16 15:30:27 -06:00
daniel
d5d5559ed1
Merge pull request #247 from m4sk1n/nicertypography
Nicer typography
2018-06-16 15:26:37 -06:00
daniel
12398a6db6
Merge pull request #255 from timmyrs/dev
Update German Translation
2018-06-16 15:23:37 -06:00
Stasiek Michalski
bbda58df6a
Make public timeline wider on sm breakpoint 2018-06-16 10:12:07 +02:00
Stasiek Michalski
7df166fe58
Make column wider on sm breakpoint 2018-06-16 10:11:22 +02:00
Stasiek Michalski
c222b747f2
Fix margin in mobile view 2018-06-16 10:10:12 +02:00
Stasiek Michalski
e27918e4b2
Fix to correct breakpoint 2018-06-15 13:04:23 +02:00
Stasiek Michalski
3f2aa0a327
Remove borders from profile view 2018-06-15 12:54:57 +02:00
Stasiek Michalski
6f44e2d8bc
Make profile view tiled 2018-06-15 12:46:54 +02:00
Stasiek Michalski
66b81b932b
Make template card flush for mobile users 2018-06-15 08:38:17 +02:00
Stasiek Michalski
88ba4ed318
Make uploading card flush for mobile users 2018-06-15 08:37:40 +02:00
Stasiek Michalski
2c07d2fb70
Don't show loading for non-js users 2018-06-15 08:36:49 +02:00
Stasiek Michalski
58685f3b0e
Make cards flush on mobile 2018-06-15 08:34:08 +02:00
Stasiek Michalski
b44ff216d0
Merge branch 'frontend-ui-refactor' into patch-20 2018-06-15 08:32:27 +02:00
Stasiek Michalski
34e3839141
Fix #369 in status template 2018-06-15 08:16:44 +02:00
Stasiek Michalski
3adcedc1a6
Fix #269 2018-06-15 08:05:37 +02:00
Daniel Supernault
aa32b8020c Update status template 2018-06-14 01:42:47 -06:00
Daniel Supernault
b3dd0a1a9d Update nav 2018-06-13 23:37:45 -06:00
Daniel Supernault
0be5a9ec5d Update compiled assets 2018-06-13 23:36:21 -06:00
Daniel Supernault
a415b421cb Add Email Verification 2018-06-13 23:30:43 -06:00
Daniel Supernault
47df007a7e Add Photo Filters and Photo Albums 2018-06-13 20:57:16 -06:00
Daniel Supernault
231884c770 Update view entity encoding 2018-06-13 18:54:27 -06:00
Marcin Mikołajczak
dc23e04d68
Last update date 2018-06-12 11:30:13 +02:00
j1t
0e25dd449a
Create navmenu.php 2018-06-12 09:00:46 +00:00
j1t
668e0bd24b
Update notification.php 2018-06-12 08:56:43 +00:00
Marcin Mikołajczak
d5ddf67b7d Added the law requirements for the EU/EEA
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-12 10:56:24 +02:00
Tim Speckhals
92c4e24666 Update German Translation 2018-06-11 12:38:23 +02:00
Marcin Mikołajczak
ca304e3cd6
Merge branch 'dev' into nicertypography 2018-06-10 22:14:35 +02:00
Marcin Mikołajczak
994aed0752 Add info about max bio length, make names length customizable
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-10 20:40:34 +02:00
Daniel Supernault
25bf33e64a Update CW 2018-06-09 20:34:52 -06:00
Daniel Supernault
39c2adb656 Hide CW until its fully implemented 2018-06-09 17:44:30 -06:00
Daniel Supernault
016c1c7b7c Update fediverse page 2018-06-09 17:37:42 -06:00
Daniel Supernault
40872a4159 Update status template 2018-06-09 17:36:45 -06:00
Daniel Supernault
b63b8353ad Add pagination to notifications 2018-06-09 17:36:27 -06:00
Daniel Supernault
a39f9600b9 Add avatar to nav dropdown 2018-06-09 17:35:21 -06:00
Daniel Supernault
b677d0ced6 Update footer 2018-06-09 17:35:03 -06:00
Daniel Supernault
b6706b626a Replace line-icons with font awesome icons 2018-06-09 17:34:53 -06:00
Daniel Supernault
0b85810a33 Update master layout, remove line-icons 2018-06-09 17:32:44 -06:00
Daniel Supernault
63343ae503 Add basic CW/NSFW support 2018-06-09 16:29:36 -06:00
Daniel Supernault
0e316aabdc Add activity.js, infinite scroll for notifications 2018-06-09 14:42:35 -06:00
Stasiek Michalski
de0bb212a5
Make card so it wouldn't be rounded on mobile 2018-06-09 21:47:40 +02:00
Stasiek Michalski
b5e8b9c203
Fix #244 and rounded corners in xs viewpoint 2018-06-09 21:46:29 +02:00
Marcin Mikołajczak
28d12a1e12 Nicer typography
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-09 09:19:42 -07:00
daniel
bccd01b2dc
Merge pull request #239 from m4sk1n/fix-titles
Fix following/ers page titles
2018-06-08 22:47:13 -06:00
Daniel Supernault
10bf0a7821 Update footer 2018-06-08 22:46:21 -06:00
daniel
a66a55cf9e
Merge pull request #237 from trwnh/patch-2
Footer reorganization
2018-06-08 22:44:36 -06:00
Daniel Supernault
5b8a4dfefd Update nav menu
Closes #60
2018-06-08 22:39:06 -06:00
Daniel Supernault
9c072482a5 Fix go tags 2018-06-08 21:34:49 -06:00
Daniel Supernault
7139b5f380 Add mention notifications 2018-06-08 21:33:57 -06:00
Daniel Supernault
33ff1f7829 Add mention model/migration/translation 2018-06-08 21:05:13 -06:00
Marcin Mikołajczak
1a4748d96e fix following/ers page titles
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-08 16:34:32 -07:00
trwnh
7dd5080168
"Powered by PixelFed"
Copyright status isn't really appropriate since PF isn't a commercial project and can be self-hosted across many instances
2018-06-07 19:40:36 -05:00
trwnh
5c6e6cbd7b
Reorder footer
Organization more closely matches site routes menu
2018-06-07 18:27:03 -05:00
trwnh
dcc01d8191
Link footer to pixelfed.org
Clicking pixelfed.org should load pixelfed.org
2018-06-07 17:47:08 -05:00
Daniel Supernault
1d5226c3c6 Update compiled assets 2018-06-06 23:55:17 -06:00
daniel
2cf44735bf
Merge branch 'frontend-ui-refactor' into patch-19 2018-06-06 23:50:55 -06:00
daniel
d4291c5513
Merge pull request #227 from hellcp/patch-18
Make profiles more consistent
2018-06-06 23:47:29 -06:00
daniel
f7d15127d1
Merge pull request #225 from hellcp/patch-17
Add titles to icons
2018-06-06 23:46:36 -06:00
daniel
ac3303d8ad
Merge pull request #219 from hellcp/patch-15
Fix squashed avatars and long images in timelines
2018-06-06 23:40:03 -06:00
Daniel Supernault
7a7c87d87d Add laravel-backup 2018-06-06 22:40:16 -06:00
Stasiek Michalski
bec5a8d919
Make notification images not stretch 2018-06-06 20:43:50 +02:00
Stasiek Michalski
410f9dab34
Make notification image a background-image 2018-06-06 20:42:24 +02:00
Stasiek Michalski
454f28911c
Add border to the bottom 2018-06-06 16:52:27 +02:00
Stasiek Michalski
f0d5024aa6
Remove border from topbar nav 2018-06-06 16:51:24 +02:00
Stasiek Michalski
76ed490854
Add titles to statuses 2018-06-06 16:09:24 +02:00
Stasiek Michalski
1da425b340
Add titles to posts 2018-06-06 16:07:43 +02:00
Stasiek Michalski
c4b8f3dc79
Add titles to icons 2018-06-06 16:03:35 +02:00
Stasiek Michalski
28535a6416
Fix squashed avatars and long images in timelines 2018-06-06 07:02:28 +02:00
Stasiek Michalski
99975da140
Add classes for limiting height on breakpoints 2018-06-06 06:58:39 +02:00
Daniel Supernault
f9bc974e54 Update activity blade template 2018-06-05 22:17:14 -06:00
Daniel Supernault
34ae2a96be Fix icon size 2018-06-05 22:08:30 -06:00
Daniel Supernault
e45ab15352 Update font awesome sass 2018-06-05 20:58:53 -06:00
Daniel Supernault
40b1f61611 Hide page status loader until its finished 2018-06-05 20:02:09 -06:00
trwnh
1e5941285d
Fix missing bootstrap prefix in activity page
Fixes #210 - same issue as #163 but on a different page
2018-06-05 06:24:22 -05:00
Daniel Supernault
a817875064 Add basic language picker 2018-06-05 01:49:05 -06:00
Daniel Supernault
be2f3873e9 Update compiled assets 2018-06-05 01:48:19 -06:00
daniel
ba9cd33301
Merge pull request #208 from hellcp/patch-14
Show messages about loading pages
2018-06-05 01:17:07 -06:00
daniel
1c97b61252
Merge pull request #206 from j1t/patch-1
Update notification.php - Hebrew
2018-06-05 00:42:45 -06:00
Stasiek Michalski
cdc19d4419
Add JS for page messages 2018-06-05 08:38:48 +02:00
Stasiek Michalski
fca898e766
Add css for loading page routine 2018-06-05 08:37:12 +02:00
Stasiek Michalski
0381ac249e
Add infinite scroll messages to public timeline 2018-06-05 08:29:38 +02:00
Stasiek Michalski
fc3a52b224
Add HTML required for infinite scroll messages 2018-06-05 08:27:18 +02:00
j1t
593f17ad33
Update notification.php 2018-06-05 06:12:38 +00:00
Tim Speckhals
5807ebb9d3
Update German Translation 2018-06-05 07:51:23 +02:00
Daniel Supernault
e9627c4c4c Update ProfileController 2018-06-04 23:25:34 -06:00
daniel
70082078d8
Merge pull request #197 from hellcp/patch-13
Fixes to look of status view
2018-06-04 23:00:59 -06:00
daniel
17bdf9c0be
Merge pull request #185 from OpenAlgeria/patch-3
Update French language profile.php
2018-06-04 22:59:47 -06:00
daniel
2e4fb02258
Merge pull request #184 from OpenAlgeria/patch-2
Update French language notification.php
2018-06-04 22:58:55 -06:00
daniel
10e54dc4d8
Merge pull request #183 from OpenAlgeria/patch-1
Update  French language timeline.php
2018-06-04 22:57:37 -06:00
daniel
e88e362d19
Merge pull request #180 from hellcp/patch-11
New new user profile look
2018-06-04 22:56:11 -06:00
Stasiek Michalski
0fd6316806
Merge branch 'frontend-ui-refactor' into patch-13 2018-06-05 06:53:52 +02:00
daniel
91d01a2634
Merge pull request #173 from hellcp/patch-9
Add breakpoined border to status view
2018-06-04 22:50:17 -06:00
daniel
da8dfe4410
Merge pull request #166 from iah/dev
Fixed typos.
2018-06-04 22:43:36 -06:00
daniel
38e8e2b103
Merge pull request #147 from jaranta/dev
Add Finnish translations
2018-06-04 22:40:42 -06:00
daniel
eee083714f
Merge pull request #146 from MasterGroosha/russian
Added Russian translation for some files
2018-06-04 22:33:33 -06:00
Daniel Supernault
4c7cf26c16 Fix N+1 in #144 2018-06-04 22:09:48 -06:00
daniel
2a04281bdc
Merge pull request #144 from hellcp/patch-4
Introduce OpenGraph meta tags
2018-06-04 22:03:05 -06:00
daniel
f1c50408f1
Merge pull request #135 from hellcp/patch-3
Make footer always be at the bottom of the page
2018-06-04 21:44:51 -06:00
Daniel Supernault
c2f6ffc043 Make #122 responsive
Closes #119
2018-06-04 21:33:19 -06:00
daniel
e8b88f0b59
Merge pull request #122 from Whaxion/dev
Change id to username in users list and change the url
2018-06-04 21:28:59 -06:00
daniel
7400f13f10
Merge pull request #113 from m4sk1n/navbar-labels
Make navbar look better on mobile devices
2018-06-04 21:23:10 -06:00
daniel
ae71ffb26d
Merge pull request #40 from voss/dev
Danish translation done.
2018-06-04 21:21:19 -06:00
Stasiek Michalski
6c98939bf2
Merge branch 'frontend-ui-refactor' into patch-9 2018-06-05 00:12:45 +02:00
Stasiek Michalski
f69dfb0364
Merge branch 'dev' into patch-4 2018-06-05 00:10:37 +02:00
Stasiek Michalski
47a15c89b0
Merge branch 'dev' into patch-3 2018-06-05 00:08:55 +02:00
Stasiek Michalski
78fe6758c9
Add needed classes to status view 2018-06-05 00:04:56 +02:00
Stasiek Michalski
33ab1c987a
Add required html to improve status view 2018-06-04 23:55:28 +02:00
Daniel Supernault
eaf465914a Add comment notifications 2018-06-04 02:16:33 -06:00
Daniel Supernault
aaf94d56cc Fix comment timeline bug 2018-06-03 23:40:17 -06:00
daniel
c35287f6ad
Merge pull request #176 from hellcp/patch-10
Don't use JS for navbar so much in mobile view
2018-06-03 21:44:25 -06:00
Daniel Supernault
4751832ad3 Fix pagination bug for like and comment events 2018-06-03 21:04:01 -06:00
Daniel Supernault
dfe451db70 Fix like count 2018-06-03 20:46:55 -06:00
Daniel Supernault
9952920aa7 Update status template 2018-06-03 20:21:13 -06:00
Daniel Supernault
2514bc75e3 Update status template 2018-06-03 20:21:02 -06:00
Daniel Supernault
2b4a6dc20a Update bootstrap.js 2018-06-03 20:20:54 -06:00
Daniel Supernault
cc9dcca5e0 Update commentform.js 2018-06-03 20:20:45 -06:00
Daniel Supernault
b2f20eb8a6 Update likebutton.js 2018-06-03 20:20:39 -06:00
Daniel Supernault
4f93a4044e Add Font Awesome 5 2018-06-03 19:38:18 -06:00
OpenAlgeria
7a57c3cd42
Update French language profile.php 2018-06-04 01:18:42 +02:00
OpenAlgeria
b6bf360d00
Update French language notification.php 2018-06-04 01:13:40 +02:00
OpenAlgeria
e4564828f3
Update French language timeline.php 2018-06-04 01:10:50 +02:00
Stasiek Michalski
1fa27770b8
Merge branch 'frontend-ui-refactor' into patch-11 2018-06-04 00:29:00 +02:00
Stasiek Michalski
022d23ff79
Restore link to user profile 2018-06-03 20:44:25 +02:00
Stasiek Michalski
f09acf51b6
Adapt following to partial 2018-06-03 18:22:41 +02:00
Stasiek Michalski
412c3c8122
Adapt following to partial 2018-06-03 18:21:54 +02:00
Stasiek Michalski
d03c762146
Adapt show to new partial 2018-06-03 18:19:13 +02:00
Stasiek Michalski
a9cc8239be
Seperate info about user into new view 2018-06-03 18:07:18 +02:00
Stasiek Michalski
fe2017fe7b
Make searchbar darker 2018-06-03 16:28:59 +02:00
Stasiek Michalski
9e28bb6c56
Don't use JS for navbar so much in mobile view
And fix #174
2018-06-03 16:22:13 +02:00
Stasiek Michalski
a96bf64388
Add breakpoined border to status 2018-06-03 15:05:23 +02:00
Stasiek Michalski
172c0c5d66
Add border breakpoint 2018-06-03 15:04:02 +02:00
Isak Alexander
875b32c5bc
Fixed language. 2018-06-03 13:11:27 +02:00
Isak Alexander
4c76d3dfbc
Fixed typos 2018-06-03 12:38:04 +02:00
Daniel Supernault
6d5c8fb90a Fix n+1 query in status view 2018-06-03 01:15:38 -06:00
Daniel Supernault
7f7e8526f3 Update status view 2018-06-03 01:00:16 -06:00
trwnh
48240d319c
Define offset only for md layout (following)
Fix #160 for following list
2018-06-03 01:46:25 -05:00
trwnh
89646cf1c6
Offset only for md layout (followers)
Fix #160 for followers list
2018-06-03 01:44:29 -05:00
trwnh
32fa4c2e0b
Singular footer margin
Remove complexity and unnecessarily large gap
2018-06-03 01:20:06 -05:00
trwnh
b1a46f9b15
Remove unnecessary block definition
Default display model is already block, so need to redefine it
2018-06-03 01:17:27 -05:00
trwnh
6c0817a572
Fix #156 2018-06-03 01:06:26 -05:00
Daniel Supernault
818fd76550 Change assets to use mix() method for versioning 2018-06-02 21:03:37 -06:00
Daniel Supernault
3d657e0c52 Fix n+1 comment + like counts in status overlays 2018-06-02 20:26:49 -06:00
Daniel Supernault
3fcb53c7a6 Add padding to overlay 2018-06-02 20:22:44 -06:00
Daniel Supernault
c36aeba532 Fix profile blade variables 2018-06-02 19:41:27 -06:00
Stasiek Michalski
ea119a28ed
Add CSS for added classes 2018-06-03 03:28:58 +02:00
Stasiek Michalski
66f285c2b1
Add supporting classes to square based layout 2018-06-03 03:25:29 +02:00
daniel
cf0943a00a
Merge pull request #150 from hellcp/patch-5
Improve image view
2018-06-02 18:57:04 -06:00
Stasiek Michalski
0440f8ba72
Fix #90 2018-06-03 01:53:54 +02:00
Stasiek Michalski
c4b9cc9eda
Remove useless hr 2018-06-03 01:52:50 +02:00
Stasiek Michalski
35020b7108
Update look of status view 2018-06-03 01:47:06 +02:00
Daniel Supernault
c53e963537 Add supported file types and max caption length to new post form.
Closes #121 and #136
2018-06-02 16:53:35 -06:00
jaranta
ac944ec565 Add Finnish translations 2018-06-02 23:18:45 +03:00
Evgeny Petrov
9985b77a6b Added Russian translation for some files 2018-06-02 22:30:17 +03:00
Marcin Mikołajczak
f1bf40f2d5 Make navbar look better on mobile devices
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-02 21:00:08 +02:00
Stasiek Michalski
8fde4618f2
Fix typo 2018-06-02 20:27:16 +02:00
hellcp
76f23cb208 Introduce opengraph tags to the service 2018-06-02 20:11:08 +02:00
voss
4c48a942d7 fixed typo and made changes based on feedback from @zatnosk. 2018-06-02 17:46:12 +01:00
Whaxion
455d95f6c4 Merge remote-tracking branch 'upstream/dev' into dev 2018-06-02 13:42:35 +02:00
Stasiek Michalski
2bdd21105b
Update welcome.blade.php 2018-06-02 10:20:46 +02:00
Stasiek Michalski
da417a5545
Remove useless padding from footer 2018-06-02 07:27:55 +02:00
Stasiek Michalski
ddbf0adb67
Add CSS to keep footer always at the bottom 2018-06-02 07:26:24 +02:00
Stasiek Michalski
840ea0b41b
Update app.blade.php 2018-06-02 07:22:20 +02:00
Stasiek Michalski
2d008ea2ee
Replicate improvements from show 2018-06-02 06:33:15 +02:00
Stasiek Michalski
1b12cc2295
Replicate improvements from show 2018-06-02 06:32:19 +02:00
Stasiek Michalski
2c190ba934
Use new classes from stylesheet 2018-06-02 06:25:12 +02:00
Stasiek Michalski
3550c0b94c
Add lower weight option 2018-06-02 06:22:43 +02:00
Stasiek Michalski
b240ae3b44
Add css for changes in user's profile 2018-06-02 06:14:49 +02:00
Daniel Supernault
ae6a59e782 Update profile views
Closes #84
2018-06-01 21:00:03 -06:00
daniel
586329b6d9
Merge pull request #126 from imbsky/ja-translation
Japanese translation 🇯🇵
2018-06-01 17:03:42 -06:00
daniel
04cf434aec
Merge pull request #109 from xmgz/dev
galician (gl), translating pixelfed beta
2018-06-01 16:54:30 -06:00
daniel
136d39e32e
Merge pull request #105 from m4sk1n/follow-in-lists
Follow/Unfollow button in followers/ing lists
2018-06-01 16:45:17 -06:00
daniel
bf6a014bdb
Merge pull request #104 from iah/patch-1
Update auth.php
2018-06-01 16:44:26 -06:00
daniel
ee22d9d98c
Merge pull request #103 from moshpirit/patch-4
Update notification.php
2018-06-01 16:43:45 -06:00
daniel
3626cdcf93
Merge pull request #102 from moshpirit/patch-3
Update profile.php
2018-06-01 16:43:01 -06:00
daniel
8cd153a629
Merge pull request #101 from moshpirit/patch-2
Token→"token" and one forgotten word to translate
2018-06-01 16:41:55 -06:00
daniel
b00154a85d
Merge pull request #100 from moshpirit/patch-1
Create timeline.php
2018-06-01 16:41:21 -06:00
daniel
f8ac51a686
Merge pull request #99 from Swedneck/dev
updated swedish translation
2018-06-01 16:40:44 -06:00
daniel
2d0442b420
Merge pull request #95 from m4sk1n/follow-button
Do not show “Follow” button in notifications if already followed
2018-06-01 16:37:08 -06:00
daniel
082e348a81
Merge pull request #91 from m4sk1n/dev
🌍: 🇵🇱⬆️
2018-06-01 16:31:05 -06:00
daniel
f424adfe83
Merge pull request #83 from Zatnosk/add-accept-attribute
Add accept attribute
2018-06-01 16:29:30 -06:00
daniel
a28f6f60bc
Merge pull request #66 from hellcp/patch-1
Always center content without leaking in card
2018-06-01 16:26:24 -06:00
daniel
b36651417c
Merge pull request #52 from j1t/dev
Hebrew Translatin (cont)
2018-06-01 16:24:47 -06:00
daniel
a3f7ecfb80
Merge pull request #39 from Nouutilizaire/dev
i18n Completes Occitan translation
2018-06-01 16:22:18 -06:00
daniel
569a00cd92
Merge pull request #120 from dansup/kpcyrd-patch-1
Use route() for settings link
2018-06-01 16:21:24 -06:00
Whaxion
20a29acacf Take username on user and not on profile 2018-06-01 23:12:53 +02:00
Daniel Supernault
91a6f8eba5 Add post delete method 2018-06-01 15:04:33 -06:00
bsky
69ce309191 Add ja translation of validation.php 2018-06-02 05:42:05 +09:00
Whaxion
9f0120443e Change id to username in users list 2018-06-01 21:42:30 +02:00
bsky
ae4a9753ec Add ja translation of timeline.php 2018-06-02 04:35:56 +09:00
bsky
26a1ffaeed Add ja translation of profile.php 2018-06-02 04:35:01 +09:00
kpcyrd
38e45d3890
Use route() for settings link 2018-06-01 21:34:21 +02:00
bsky
b961ed1ada Add ja translation of passwords.php 2018-06-02 04:28:37 +09:00
bsky
43f4024caa Add ja translation of pagination.php 2018-06-02 04:14:55 +09:00
bsky
3c5b662650 Add ja translation of notification.php 2018-06-02 04:09:13 +09:00
bsky
2a08d0a2e7 Add ja translation of auth.php 2018-06-02 04:06:29 +09:00
bsky
ebb1c85c40 Add newline at end of files 2018-06-02 04:05:42 +09:00
bsky
ae40a4d591 Copy lang files to ja from en 2018-06-02 04:00:45 +09:00
Daniel Supernault
92939ed867 Add recaptcha to login/register form 2018-06-01 11:58:43 -06:00
Xosé M
8071f11370 primeira tradución 2018-06-01 19:19:56 +02:00
Marcin Mikołajczak
8107f64eec Follow/Unfollow button in followers/ing lists
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 17:59:53 +02:00
Marcin Mikołajczak
9511988ddd Follow/Unfollow button in followers/ing lists
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 17:49:45 +02:00
moshpirit
c083fa7c9f
Update notification.php 2018-06-01 17:32:44 +02:00
moshpirit
ac4d325325
Update profile.php
Lacked some lines
2018-06-01 17:27:19 +02:00
moshpirit
ab10da0350
Token→"token" and one forgotten word to translate
password wasn't translated and token is not a Spanish word, so it should go between quotation marks
2018-06-01 17:22:10 +02:00
moshpirit
464cd3f888
Create timeline.php 2018-06-01 17:17:50 +02:00
Tim Stahel
31802c942d updated swedish translation 2018-06-01 16:47:11 +02:00
Marcin Mikołajczak
d49a054c38 Do not show “Follow” in notifications if already followed
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 16:12:10 +02:00
Isak Alexander
a8811e44ec
Update auth.php
Fixed a typo.
2018-06-01 13:47:20 +02:00
Marcin Mikołajczak
fc1dc62576 🌍: 🇵🇱⬆️
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-06-01 10:44:18 +02:00
Jonas
6a87f9d0e2
Update public.blade.php 2018-06-01 09:48:32 +02:00
Jonas
1273a5bb53
Update personal.blade.php 2018-06-01 09:47:34 +02:00
deadsuperhero
3ead4b42b2 adjust to just the class 2018-06-01 00:17:14 -07:00
deadsuperhero
336439b331 prevent card from stretching 2018-06-01 00:12:13 -07:00
Stasiek Michalski
0a619bac8f
Always center content without leaking in card 2018-06-01 08:42:10 +02:00
Daniel Supernault
d2ed666321 Update discover page
Closes #48
2018-06-01 00:06:08 -06:00
j1t
112ca537e6
Update profile.php 2018-06-01 06:03:12 +00:00
j1t
57edcfac80
Create timeline.php 2018-06-01 05:59:07 +00:00
Daniel Supernault
1d3482a6e8 Update compiled assets 2018-05-31 23:38:33 -06:00
Daniel Supernault
4b9dd1e312 Update settings home view 2018-05-31 21:25:18 -06:00
Daniel Supernault
7f10f8caf3 Update personal timeline view 2018-05-31 21:24:15 -06:00
Daniel Supernault
786e4b5747 Update open source view 2018-05-31 21:23:57 -06:00
Daniel Supernault
b222186527 Update fediverse view 2018-05-31 21:23:43 -06:00
Daniel Supernault
7df83c7902 Add import view 2018-05-31 21:23:31 -06:00
Daniel Supernault
b2362776cc Add report views 2018-05-31 21:23:00 -06:00
Daniel Supernault
6f8a296392 Add remote follow view 2018-05-31 21:22:26 -06:00
Daniel Supernault
2d8e6186da Update bootstrap.js 2018-05-31 21:21:02 -06:00
Daniel Supernault
9ec302a168 Update profile view 2018-05-31 16:08:04 -06:00
Daniel Supernault
942442476c Add profile following view 2018-05-31 15:59:46 -06:00
Daniel Supernault
41414747d4 Add profile followers view 2018-05-31 15:59:29 -06:00
Daniel Supernault
42897aab14 Add error views 2018-05-31 15:59:05 -06:00
Daniel Supernault
18d9e609dc Update activity blade template
Add follow notifications
2018-05-31 15:58:42 -06:00
Daniel Supernault
e4daaf32b5 Add timeline localization 2018-05-31 15:58:13 -06:00
Daniel Supernault
5592b73ec0 Update custom sass 2018-05-31 15:57:42 -06:00
Daniel Supernault
1c63184133 Add Bookmark feature 2018-05-31 15:56:46 -06:00
Nouutilizaire
d1fa191f06
Update notification.php 2018-05-30 08:54:37 +00:00
Daniel Supernault
b7b916e211 Add atom user feed
Closes #37
2018-05-29 22:54:31 -06:00
Daniel Supernault
53c4c50d23 Update admin dashboard 2018-05-29 20:51:57 -06:00
Daniel Supernault
17a04ed62e Update custom SASS 2018-05-29 20:50:06 -06:00
Daniel Supernault
c6a4882a80 Update notification localization file 2018-05-29 20:49:50 -06:00
Daniel Supernault
9767bec660 Update admin dashboard views 2018-05-29 20:49:25 -06:00
Daniel Supernault
ff32f51ee5 Update user dashboard view 2018-05-29 20:48:07 -06:00
Daniel Supernault
60c1f272e0 Update login view 2018-05-29 20:47:11 -06:00
Daniel Supernault
a5061c653d Update password reset views 2018-05-29 20:46:59 -06:00
Daniel Supernault
dba5a5561c Update register view 2018-05-29 20:46:27 -06:00
Daniel Supernault
67daf7c403 Add discover view 2018-05-29 20:44:46 -06:00
Daniel Supernault
3ec72aff04 Update main layout view 2018-05-29 20:44:12 -06:00
Daniel Supernault
c2f1af51b2 Add footer view 2018-05-29 20:42:46 -06:00
Daniel Supernault
51053556ba Add nav view 2018-05-29 20:42:40 -06:00
Daniel Supernault
7ae21ab26b Add profile view 2018-05-29 20:38:21 -06:00
Daniel Supernault
606979eaca Add setting blade views 2018-05-29 20:37:10 -06:00
Daniel Supernault
1e9fe8db2a Update settings import view
The instagram import tool is not yet ready
2018-05-29 20:36:39 -06:00
Daniel Supernault
e6a1e364d7 Update password settings view 2018-05-29 20:35:49 -06:00
Daniel Supernault
870ac92a0a Update settings blade template 2018-05-29 20:35:31 -06:00
Daniel Supernault
fb8a17ad6b Add site blade views 2018-05-29 20:35:05 -06:00
Daniel Supernault
5a41542291 Add comment/reply permalink view 2018-05-29 20:33:59 -06:00
Daniel Supernault
f657bba76b Update status show view 2018-05-29 20:33:27 -06:00
Daniel Supernault
147e6395ea Update status template 2018-05-29 20:32:46 -06:00
Daniel Supernault
0d32c28886 Update personal timeline view 2018-05-29 20:32:16 -06:00
Daniel Supernault
1dfa2317b4 Add public timeline view 2018-05-29 20:31:04 -06:00
Daniel Supernault
f1c1c9e6cc Update home page 2018-05-29 20:30:39 -06:00
voss
8148e61415 Changed Danish characters to HTML encoded versions. 2018-05-29 21:47:44 +01:00
voss
9fbcf225b9 Danish translations done. 2018-05-29 21:09:59 +01:00
Nouutilizaire
9ed904091b
Create profile.php 2018-05-29 08:45:16 +00:00
Nouutilizaire
42ba511e3e
Create notification.php 2018-05-29 08:42:30 +00:00
j1t
23850cd950
Create profile.php 2018-05-29 00:16:07 +00:00
j1t
522e304a30
Create notification.php 2018-05-29 00:13:57 +00:00
voss
1664095c3d some translations done. 2018-05-28 22:41:18 +01:00
Michael Demetriou
dc5bce159d Greek translation
Added translations for greek (el). Also added DS_Store to .gitignore
2018-05-28 18:12:46 +03:00
daniel
13dbb509ab
Merge pull request #34 from yabirgb/dev
Spanish translation
2018-05-27 15:39:10 -06:00
Yabir
5cbbecf9aa Spanish traslation 2018-05-27 23:22:49 +02:00
daniel
a6e8366489
Merge pull request #31 from Swedneck/dev
i18n: Add Swedish translation
2018-05-27 12:01:14 -06:00
daniel
9a8155b328
Merge pull request #30 from Grazouillis/patch-5
French corrections
2018-05-27 12:00:53 -06:00
daniel
d38b7be9ee
Merge pull request #29 from Grazouillis/patch-4
Call a variable correctly
2018-05-27 11:59:27 -06:00
daniel
e872d928d9
Merge pull request #28 from timmyrs/dev
Translate new files in German
2018-05-27 11:59:04 -06:00
daniel
6ee0c3cc81
Merge pull request #27 from Grazouillis/patch-3
escape characters are missing before apostrophes
2018-05-27 11:58:42 -06:00
daniel
b5748e2efe
Merge pull request #25 from Grazouillis/patch-2
escaping single quote mark
2018-05-27 11:55:31 -06:00
Tim Stahel
b79d013544 finished swedish translations 2018-05-27 16:49:55 +02:00
Reka
4e0d49bd5e
French corrections
More comprehensible for French natives ;)
2018-05-27 15:24:59 +02:00
Reka
46b32d9890
call a variable correctly
:seconds instead : secondes
2018-05-27 15:21:02 +02:00
timmyRS
df5db1d27f
Translate new files in German 2018-05-27 15:18:24 +02:00
Reka
618b5b46ef
escape caracters are missing before aporstrophes
many antislashes are missing before apostrophes (single quote mark) to escape this character.
+ non présente => absente*
+ x et y doit => doivent* (plural) correspondre
and other french corrections
2018-05-27 15:11:03 +02:00
Reka
a1b444cb7a
triple single quote marks 2018-05-27 14:30:18 +02:00
Reka
1f46410777
french correction
I suppose this mention will appear after a nickname. Ex : JohnDoe liked this photo. So in French, JohnDoe a aimé cette photo.
2018-05-27 14:27:55 +02:00
daniel
d8bbe98728
Merge pull request #21 from OpenAlgeria/dev
notification.php Translate French
2018-05-26 22:19:30 -06:00
OpenAlgeria
0e1c1611c3
notification.php Translate French 2018-05-27 06:13:49 +02:00
Daniel Supernault
1406f467a0 Add basic notification support 2018-05-26 21:25:04 -06:00
Daniel Supernault
3ec93d096c Add LikePipeline and like notifications 2018-05-26 20:26:44 -06:00
daniel
a6ee20b8f3
Merge pull request #20 from OpenAlgeria/dev
profile.php Translate French
2018-05-26 17:14:34 -06:00
OpenAlgeria
73f71b7922
Translate French 2018-05-27 01:09:24 +02:00
daniel
da2fa82fca
Merge pull request #14 from j1t/dev
WIP Hebrew Translation
2018-05-26 16:51:55 -06:00
j1t
02ec1688b4
Update validation.php 2018-05-26 22:49:41 +00:00
Daniel Supernault
3dafc278b5 Add DiscoverController and hashtag posts view 2018-05-26 16:49:39 -06:00
j1t
9f6b9bcd38
Update validation.php 2018-05-26 22:45:52 +00:00
Daniel Supernault
1b145ab4ea Update personal timeline view 2018-05-26 16:42:47 -06:00
Daniel Supernault
00b4fe04a6 Add privacy policy 2018-05-26 16:42:14 -06:00
Daniel Supernault
8631669dc3 Add about view 2018-05-26 16:40:52 -06:00
Daniel Supernault
d292c3870f Add user settings views 2018-05-26 16:40:39 -06:00
Daniel Supernault
22b779c828 Add user settings view 2018-05-26 16:39:32 -06:00
daniel
9ca59f73b0
Merge pull request #16 from OpenAlgeria/dev
add French Language
2018-05-26 15:54:18 -06:00
OpenAlgeria
ff896d99e6
Translate French 2018-05-26 22:59:58 +02:00
timmyRS
1d83c857ac Add German Translation 2018-05-26 22:18:47 +02:00
OpenAlgeria
686cec073f
Translate French 2018-05-26 22:14:35 +02:00
OpenAlgeria
c5a845da3c
Create pagination.php
Translate French
2018-05-26 22:10:39 +02:00
OpenAlgeria
00006b8867
Rename resources/lang/en/auth.php to resources/lang/fr/auth.php 2018-05-26 22:04:21 +02:00
j1t
0fb5e143a5
Update validation.php 2018-05-26 17:38:22 +00:00
ahmad-amsyar
3895b6dff1 add more malay translation. 2018-05-26 14:56:43 +08:00
ahmad-amsyar
ec42c29aa9 Improve malay translation. 2018-05-26 13:40:17 +08:00
ahmad-amsyar
4f8941df9a add malay translation. 2018-05-26 13:29:52 +08:00
Tim Stahel
004dc22b1b added partial swedish translations 2018-05-25 21:00:48 +02:00
daniel
18b712e790
Merge pull request #11 from Quenty31/dev
i18n: Add Occitan translation
2018-05-22 11:07:20 -06:00
Quentí
28c24936a4
Create passwords.php 2018-05-22 18:46:40 +02:00
Quentí
0fe54246e1
Create pagination.php 2018-05-22 18:45:55 +02:00
Quentí
ec5aef9340
Create validation.php 2018-05-22 18:45:22 +02:00
Quentí
5ff07a06b2
Create auth.php 2018-05-22 18:43:24 +02:00
Marcin Mikołajczak
7c56412216 i18n: Add Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-22 16:43:26 +02:00
j1t
1173a53266
Update validation.php 2018-05-22 07:03:27 +00:00
j1t
18e06945e8
Update passwords.php 2018-05-22 06:56:07 +00:00
j1t
b4ab656f70
Update pagination.php 2018-05-22 06:55:30 +00:00
j1t
fe7c443ffb
Update auth.php 2018-05-22 06:55:04 +00:00
j1t
16e29a0ecd
Create validation.php 2018-05-22 06:54:05 +00:00
j1t
f842418031
Create passwords.php 2018-05-22 06:51:57 +00:00
j1t
37ab494200
Create pagination.php 2018-05-22 06:43:48 +00:00
j1t
a113c0117e
Create auth.php 2018-05-22 06:43:04 +00:00
Daniel Supernault
b144efbe96 Add basic admin dashboard views 2018-05-20 15:50:11 -06:00
Daniel Supernault
e3914e94e8 Add pagination views 2018-05-19 21:17:27 -06:00
Daniel Supernault
8062d3e5d0 Add new sass components 2018-05-19 21:14:39 -06:00
Daniel Supernault
c6e5d114ef Update custom sass 2018-05-19 21:14:28 -06:00
Daniel Supernault
60a54c4b5a Remove unused fonts sass 2018-05-19 21:14:20 -06:00
Daniel Supernault
d8d44af15c Add typeahead sass 2018-05-19 21:13:52 -06:00
Daniel Supernault
ba3577adf6 Add notifications sass 2018-05-19 21:13:41 -06:00
Daniel Supernault
86919f7ba6 Update _variables.scss and replace Roboto with system fonts 2018-05-19 21:13:17 -06:00
Daniel Supernault
a55913ebef Update bootstrap.js 2018-05-19 21:12:56 -06:00
Daniel Supernault
993f831867 Add timeline.js 2018-05-19 21:12:42 -06:00
Daniel Supernault
6c9675a74d Add typeahead.js + bloodhound.js 2018-05-19 21:12:30 -06:00
Daniel Supernault
cb88a07f8e Add searchform.js 2018-05-19 21:12:09 -06:00
Daniel Supernault
f65ce65ddd Add likebutton.js 2018-05-19 21:11:58 -06:00
Daniel Supernault
1a423ce139 Add localstorage.js 2018-05-19 21:11:16 -06:00
Daniel Supernault
5f40f39435 Add commentform.js 2018-05-19 21:11:01 -06:00
Daniel Supernault
9238dbf9b3 Update app.js 2018-05-19 21:10:34 -06:00
Daniel Supernault
fbeac9c1d9 Add simple line icon fonts 2018-04-16 19:26:53 -06:00
Daniel Supernault
d3552b2fdd Add basic status template 2018-04-16 19:26:38 -06:00
Daniel Supernault
4694382ed8 Update personal timeline blade template 2018-04-16 19:25:05 -06:00
Daniel Supernault
3a9f92eb62 Update variables.scss 2018-04-16 19:10:11 -06:00
Daniel Supernault
c477cf9a9b Add personal timeline blade template 2018-04-15 19:55:48 -06:00
Daniel Supernault
411d4b9ab9 Update app blade template 2018-04-15 19:55:24 -06:00
Daniel Supernault
c9da78a1e9 Replace import with inline font sass 2018-04-15 19:54:38 -06:00
Daniel Supernault
307e227ed5 Update compiled assets 2018-04-15 19:35:11 -06:00
Daniel Supernault
a13cdefa8c Remove vue for now 2018-04-15 19:29:16 -06:00
Daniel Supernault
2855c83c50 Update welcome blade view 2018-04-15 18:25:49 -06:00
Daniel Supernault
d1b44529df Add username to register form 2018-04-15 18:23:02 -06:00
Daniel Supernault
2af48823ae Add authentication scaffolding 2018-04-15 18:00:49 -06:00
Daniel Supernault
a034358c98 Add Laravel Framework 2018-04-15 17:56:48 -06:00