UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-30 02:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
442 commits 5 branches 42 tags 84 MiB
Commit graph

246 commits

Author SHA1 Message Date
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