chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity
486 Commits 5 Branches 33 Tags 117 MiB
Commit Graph

486 Commits

Author SHA1 Message Date
daniel 85d164ce07
Merge pull request #211 from trwnh/patch-1 
Fix missing bootstrap prefix in activity page
 2018-06-05 11:51:58 -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
daniel 731fc6e08e
Merge pull request #205 from timmyrs/dev 
Update German Translation
 2018-06-05 00:42:22 -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 0b8bd6b4d3
Merge pull request #204 from dansup/frontend-ui-refactor 
Update ProfileController
 2018-06-04 23:42:04 -06:00
Daniel Supernault dfbcb0ae24 Update ProfileController 2018-06-04 23:41:40 -06:00
daniel d0d8da1192
Merge pull request #203 from dansup/frontend-ui-refactor 
Update ProfileController
 2018-06-04 23:26:12 -06:00
Daniel Supernault e9627c4c4c Update ProfileController 2018-06-04 23:25:34 -06:00
daniel 197742d0df
Merge pull request #202 from dansup/frontend-ui-refactor 
Frontend ui refactor
 2018-06-04 23:03:25 -06:00
Daniel Supernault 2952e78369 Update compiled assets from #197 2018-06-04 23:02:26 -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
Daniel Supernault 75d1b7c298 Update complied assets from #173 2018-06-04 22:53:58 -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 e77c4637d3
Merge pull request #167 from iah/iah-patch-2 
Iah patch 2
 2018-06-04 22:47:05 -06:00
daniel da8dfe4410
Merge pull request #166 from iah/dev 
Fixed typos.
 2018-06-04 22:43:36 -06:00
daniel 8414ed768e
Merge pull request #165 from trwnh/patch-1 
lowercase name in nodeinfo
 2018-06-04 22:41:54 -06:00
daniel 38e8e2b103
Merge pull request #147 from jaranta/dev 
Add Finnish translations
 2018-06-04 22:40:42 -06:00
daniel ee61030165
Merge pull request #201 from dansup/frontend-ui-refactor 
Frontend ui refactor
 2018-06-04 22:38:39 -06:00
daniel 51b23a9e9a
Merge pull request #200 from imbsky/license 
Replace to perfect license
 2018-06-04 22:37:29 -06:00
bsky 7393b621ae Replace to perfect license 2018-06-05 13:33:38 +09: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 8d95796aa9
Merge pull request #199 from dansup/frontend-ui-refactor 
Frontend UI tweaks
 2018-06-04 22:16:02 -06:00
daniel 16f4d52476
Merge pull request #137 from Skehmatics/fix/apostrophe-bug 
(Lazily) fix #131 by ignoring hashtags that begin with a ampersand in lexer
 2018-06-04 22:13:40 -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 Supernault a189f899e3 Update compiled assets from #135 2018-06-04 21:52:25 -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
daniel 1c457ab3dd
Merge pull request #198 from dansup/frontend-ui-refactor 
Relicense from MIT to AGPL
 2018-06-04 20:16:41 -06:00
Daniel Supernault 662470c8dd Relicense from MIT to AGPL 2018-06-04 20:15:07 -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