chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity
10,186 Commits 5 Branches 33 Tags 122 MiB
Commit Graph

10186 Commits

Author SHA1 Message Date
daniel 619d51060f
Merge pull request #108 from m4sk1n/discover-fix 
Do not recommend myself
 2018-06-01 16:46: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 7c4a383a65
Merge pull request #93 from neilalexander/patch-2 
Use inRandomOrder instead of orderByRaw in Discover page
 2018-06-01 16:34:46 -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 Supernault c07cf12a9d Update compiled assets 
Related to #66
 2018-06-01 16:28:12 -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
Daniel Supernault fa7d1fef2f Update RestrictedNames so users can't register a username that conflicts with routes 2018-06-01 13:57:31 -06: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
Marcin Mikołajczak 13c0e33490 Fix “Can't update account settings without setting a bio” 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-06-01 21:13:29 +02: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 1b794c8508 Update StatusPipeline 2018-06-01 12:33:44 -06: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 71c90c8f49 Do not recommend myself 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-06-01 19:05:12 +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 5aea779619
Merge pull request #1 from iah/patch-1 
Update auth.php
 2018-06-01 13:49:50 +02:00
Isak Alexander a8811e44ec
Update auth.php 
Fixed a typo.
 2018-06-01 13:47:20 +02:00
Neil Alexander efbb1017e7
Also fix orderByRaw in SeedFollows 2018-06-01 12:23:52 +01:00
Neil Alexander 11447c13da
Use inRandomOrder instead of orderByRaw in Discover page 2018-06-01 12:13:32 +01: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