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

4990 Commits

Author SHA1 Message Date
daniel 31620facab
Merge pull request #1946 from pixelfed/staging 
Fix account deletion bug
 2020-01-19 21:52:39 -07:00
Daniel Supernault 238e0cc057
Update changelog 2020-01-19 21:52:18 -07:00
Daniel Supernault 578d2f353d
Update DeleteAccountPipeline 2020-01-19 21:51:21 -07:00
Daniel Supernault 284a694030
Update admin partials 2020-01-17 21:23:11 -07:00
daniel 6a1a1f36ca
Merge pull request #1945 from pixelfed/staging 
Update settings view, fix default language
 2020-01-17 20:57:06 -07:00
Daniel Supernault 7f4edbfecf
Update changelog 2020-01-17 20:56:20 -07:00
Daniel Supernault 4223a11e3c
Update settings view, fix default language 2020-01-17 20:55:27 -07:00
daniel 77c6962f7b
Merge pull request #1943 from pixelfed/staging 
Add BANNED_USERNAMES env var support to RestrictedNames
 2020-01-16 23:11:49 -07:00
Daniel Supernault 5b5cd2ce9a
Update changelog 2020-01-16 23:09:21 -07:00
Daniel Supernault 6cdd64c669
Add BANNED_USERNAMES env var support to RestrictedNames 2020-01-16 23:07:58 -07:00
daniel 3a12a32378
Merge pull request #1942 from pixelfed/staging 
Fix TRUST_PROXIES configuration
 2020-01-16 22:38:38 -07:00
Daniel Supernault be75a19260
Update changelog 2020-01-16 22:37:35 -07:00
daniel f25c9c2c26
Merge pull request #1941 from asonix/asonix/log-preview-media 
Don't always explode the TRUST_PROXIES variable
 2020-01-16 22:36:39 -07:00
asonix 64af65e992 TrustProxies natively supports , strings 2020-01-16 23:34:10 -06:00
asonix cb6e8a4eaa Don't always explode the TRUST_PROXIES variable 2020-01-16 22:52:13 -06:00
daniel 0adf959a74
Merge pull request #1936 from pixelfed/staging 
Update StoryController, fix postgres bug
 2020-01-14 21:51:30 -07:00
Daniel Supernault 8360aa4827
Update StoryController, fix postgres bug 2020-01-14 21:50:05 -07:00
daniel 2c4894d4dd
Merge pull request #1935 from pixelfed/staging 
Update AccountTransformer, re-add header_bg field. Fixes #1933
 2020-01-14 20:44:35 -07:00
Daniel Supernault b0fd75f4c2
Update changelog 2020-01-14 19:59:11 -07:00
Daniel Supernault 121b258dbb
Update AccountTransformer, re-add header_bg field. Fixes #1933 2020-01-14 19:58:18 -07:00
daniel 7444c7235e
Merge pull request #1928 from pixelfed/staging 
Update settings home view, fixes #1914
 2020-01-10 23:43:01 -07:00
Daniel Supernault 0307be567e
Update settings home view, fixes #1914 2020-01-10 22:38:44 -07:00
daniel 99014fa13c
Merge pull request #1927 from pixelfed/staging 
Update StoryController
 2020-01-10 22:04:16 -07:00
Daniel Supernault aba509fc6b
Update StoryController 2020-01-10 22:03:51 -07:00
daniel 3ce9af33ee
Merge pull request #1926 from pixelfed/staging 
Update StoryController
 2020-01-10 21:54:04 -07:00
Daniel Supernault 71f6cbb5a6
Update StoryController 2020-01-10 21:53:24 -07:00
daniel 2461fe905c
Merge pull request #1925 from pixelfed/staging 
Update StoryController
 2020-01-10 19:49:56 -07:00
Daniel Supernault d403e0c615
Update StoryController 2020-01-10 19:45:46 -07:00
daniel e41363d7dd
Merge pull request #1924 from pixelfed/staging 
Add StoryTimelineComponent.vue
 2020-01-10 13:01:13 -07:00
Daniel Supernault 5a764473f2
add StoryTimelineComponent.vue 2020-01-10 13:00:42 -07:00
daniel 5184c2a6ce
Merge pull request #1922 from pixelfed/staging 
Revert StoryController update
 2020-01-08 20:35:09 -07:00
Daniel Supernault e30823dbf2
Revert StoryController update 2020-01-08 20:34:49 -07:00
daniel 4fe18687e0
Merge pull request #1921 from pixelfed/staging 
Update Timeline.vue, restore notification card
 2020-01-08 18:43:56 -07:00
Daniel Supernault 70b98d9ace
Update Timeline.vue, restore notification card 2020-01-08 18:43:06 -07:00
Daniel Supernault 92fd593055
Update compiled assets 2020-01-08 18:42:42 -07:00
daniel 966cfe8e09
Merge pull request #1920 from pixelfed/staging 
Update StoryController
 2020-01-08 18:05:58 -07:00
Daniel Supernault 523d90cdec
Update StoryController 2020-01-08 18:05:20 -07:00
daniel 4168c4192b
Merge pull request #1919 from pixelfed/staging 
Update changelog
 2020-01-08 15:40:40 -07:00
Daniel Supernault b07d5ca3a0
Update changelog 2020-01-08 15:39:58 -07:00
daniel 4c8a1f6a8d
Merge pull request #1918 from pixelfed/staging 
Update StoryController, fix postgres bug + new translations
 2020-01-08 14:52:18 -07:00
Daniel Supernault a8a8e5f0dc
Update StoryController, fix postgres bug 2020-01-08 14:51:34 -07:00
daniel fa8aed7dd5
Merge pull request #1913 from amin3mej/dev 
Add Persian translation
 2020-01-07 20:10:44 -07:00
daniel ac24435037
Merge pull request #1910 from jordibrus/patch-1 
Added new language - Catalan
 2020-01-07 20:09:10 -07:00
daniel 700c7805ce
Merge pull request #1906 from pixelfed/staging 
Add S3 + Stories
 2020-01-07 00:58:15 -07:00
Daniel Supernault e6419297f3
Update web routes 2020-01-07 00:52:13 -07:00
Daniel Supernault 38f8c9fd91
Update compiled assets 2020-01-07 00:47:34 -07:00
Daniel Supernault 060009a88b
Update ComposeModal.vue component 2020-01-07 00:41:37 -07:00
Daniel Supernault ca68cf78b7
Add profile story view 2020-01-07 00:30:19 -07:00
Daniel Supernault 37347f4d58
Update compiled assets 2020-01-07 00:21:44 -07:00
Daniel Supernault c33b49453a
Update web routes 2020-01-07 00:20:27 -07:00