Commit graph

3774 commits

Author SHA1 Message Date
Daniel Supernault
8c860dc2ed
Update SharePipeline 2019-06-23 23:50:42 -06:00
Daniel Supernault
9d2b5c43ba
Update FollowPipeline 2019-06-23 23:50:20 -06:00
Daniel Supernault
73bacf5b8d
Update AccountController 2019-06-23 23:49:49 -06:00
daniel
a47fd755e6
Merge pull request #1458 from pixelfed/frontend-ui-refactor
Fixes #1453
2019-06-23 23:33:59 -06:00
Daniel Supernault
1c0b6134e3
Update privacy settings view 2019-06-23 23:31:45 -06:00
Daniel Supernault
74b76ac175
Update PrivacySettings 2019-06-23 23:31:07 -06:00
Daniel Supernault
95807c93e5
Update AP Helpers 2019-06-23 22:22:23 -06:00
Daniel Supernault
13f18d09c8
Update blocked instances view 2019-06-23 21:09:13 -06:00
Daniel Supernault
d2039ac3fd
Update web routes 2019-06-23 20:35:56 -06:00
Daniel Supernault
83e5633388
Update User RateLimit 2019-06-23 20:35:37 -06:00
Daniel Supernault
53b0a0601a
Update .env.example 2019-06-23 14:24:30 -06:00
daniel
2c1cddda0b
Merge pull request #1457 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2019-06-23 14:12:05 -06:00
Daniel Supernault
73f37e4dc7
Update .env.example 2019-06-23 14:11:13 -06:00
daniel
9f130bd769
Merge pull request #1455 from okpierre/dev
index.blade.php
2019-06-23 12:44:40 -06:00
okpierre
4be1bf3f79
Merge pull request #4 from okpierre/frontend-ui-refactor
Frontend ui refactor
2019-06-23 13:00:26 -04:00
okpierre
a433695587
Update index.blade.php
Replace static links for Terms of Use and Privacy
2019-06-23 12:56:56 -04:00
okpierre
0990bb9c35
Merge pull request #3 from pixelfed/frontend-ui-refactor
Sync Frontend ui refactor to June 22
2019-06-23 12:50:30 -04:00
okpierre
e865eede2a
Merge pull request #2 from pixelfed/dev
Sync to June 22
2019-06-23 12:48:06 -04:00
daniel
7781f7dfdc
Merge pull request #1452 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2019-06-22 21:33:07 -06:00
Daniel Supernault
5ec4004968
Merge branch 'frontend-ui-refactor' of https://github.com/pixelfed/pixelfed into frontend-ui-refactor 2019-06-22 21:31:36 -06:00
Daniel Supernault
bef3b88d30
Update Follower model 2019-06-22 21:31:12 -06:00
daniel
4ca6308bca
Merge pull request #1448 from okpierre/dev
Update register.blade.php
2019-06-21 15:51:45 -06:00
okpierre
3c1ba317da
Merge pull request #1 from okpierre/register-blade
Update register.blade.php
2019-06-21 17:37:01 -04:00
okpierre
c620ffdd68
Update register.blade.php
Change # placeholder for Terms of Use and Privacy Policy links into direct links
2019-06-21 17:33:26 -04:00
daniel
0cf6f5e5b3
Merge pull request #1447 from pixelfed/frontend-ui-refactor
Update Profile model
2019-06-21 14:05:04 -06:00
Daniel Supernault
abec5e4861
Update Profile model 2019-06-21 14:04:45 -06:00
daniel
bdb809ac2c
Merge pull request #1446 from pixelfed/frontend-ui-refactor
Update AuthLogin listener
2019-06-21 12:55:22 -06:00
Daniel Supernault
1e8b0927a7
Update AuthLogin listener 2019-06-21 12:54:58 -06:00
daniel
5896a5103c
Merge pull request #1443 from pixelfed/frontend-ui-refactor
Add Admin Configuration Editor
2019-06-20 21:06:19 -06:00
Daniel Supernault
0ae5c4368a
Update admin config view 2019-06-20 20:57:33 -06:00
Daniel Supernault
ed1b1e746c
Update admin config view 2019-06-20 20:54:27 -06:00
Daniel Supernault
095b135f4f
Update AdminSettingsController 2019-06-20 20:51:27 -06:00
Daniel Supernault
4348680907
Update admin config settings 2019-06-20 20:22:20 -06:00
Daniel Supernault
d64616af8a
Update webpack config 2019-06-20 20:17:13 -06:00
Daniel Supernault
0b20082b73
Update config view 2019-06-20 20:16:54 -06:00
Daniel Supernault
4630b4c2c8
Update compiled assets 2019-06-20 20:15:53 -06:00
Daniel Supernault
d32c3257bf
Add ace libs 2019-06-20 20:12:20 -06:00
Daniel Supernault
94bef4c74c
Add Admin Configuration Editor 2019-06-20 20:01:16 -06:00
daniel
2f8c87b6dd
Merge pull request #1442 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2019-06-20 12:48:05 -06:00
Daniel Supernault
cd7ecd11a6
Update compiled assets 2019-06-20 12:45:39 -06:00
Daniel Supernault
3612990d43
Add quill bundles 2019-06-20 12:42:36 -06:00
daniel
6b8deecfb7
Merge pull request #1438 from pixelfed/frontend-ui-refactor
Custom Pages
2019-06-19 21:32:40 -06:00
Daniel Supernault
1dbfcae041
Update admin pages view 2019-06-19 21:23:44 -06:00
Daniel Supernault
4539afabdb
Update SiteController 2019-06-19 21:16:01 -06:00
Daniel Supernault
7ade78b4ee
Update PageController 2019-06-19 21:06:10 -06:00
Daniel Supernault
e3cfd8170f
Update web routes 2019-06-19 20:55:04 -06:00
Daniel Supernault
59fcfc2779
Update PageController 2019-06-19 20:54:48 -06:00
Daniel Supernault
aca5114fcb
Update SiteController 2019-06-19 20:54:27 -06:00
Daniel Supernault
ef07e31d9a
Update admin page edit view 2019-06-19 20:54:01 -06:00
Daniel Supernault
bb207a42bd
Update custom page views 2019-06-19 20:53:40 -06:00