lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							e808df0285 
							
						 
					 
					
						
						
							
							Merge branch 'cleanups' into 'develop'  
						
						... 
						
						
						
						Cleanups
See merge request !54  
						
						
					 
					
						2017-03-09 03:02:55 -05:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							2a29c89672 
							
						 
					 
					
						
						
							
							Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into develop  
						
						
						
						
					 
					
						2017-03-09 09:01:35 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							b11c1f57a9 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading  
						
						
						
						
					 
					
						2017-03-09 09:00:09 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							d954909134 
							
						 
					 
					
						
						
							
							Add linter.  
						
						
						
						
					 
					
						2017-03-09 08:58:17 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							08297ea83e 
							
						 
					 
					
						
						
							
							Remove redirect on login  
						
						... 
						
						
						
						This is to enable this workflow:
1. Open conversation in new tab
2. Login
3. Interact with the conversation
We can add this again once we have persistent logins. 
						
						
					 
					
						2017-03-09 08:51:33 +01:00 
						 
				 
			
				
					
						
							
							
								xj9 
							
						 
					 
					
						
						
						
						
							
						
						
							d94cd15467 
							
						 
					 
					
						
						
							
							fix cursor style  
						
						
						
						
					 
					
						2017-03-08 22:38:14 -07:00 
						 
				 
			
				
					
						
							
							
								xj9 
							
						 
					 
					
						
						
						
						
							
						
						
							aff432a572 
							
						 
					 
					
						
						
							
							themeable hover states for nav-panel  
						
						
						
						
					 
					
						2017-03-08 22:36:03 -07:00 
						 
				 
			
				
					
						
							
							
								xj9 
							
						 
					 
					
						
						
						
						
							
						
						
							459fdaf10f 
							
						 
					 
					
						
						
							
							add a spin animation to favorite and boost actions  
						
						
						
						
					 
					
						2017-03-08 21:45:40 -07:00 
						 
				 
			
				
					
						
							
							
								xj9 
							
						 
					 
					
						
						
						
						
							
						
						
							502757da28 
							
						 
					 
					
						
						
							
							improvements on fature/better-nsfw-image-loading  
						
						... 
						
						
						
						- loading indicator
- avoid hitting the cache if we already know the image was loaded
- more responsive toggle 
						
						
					 
					
						2017-03-08 20:23:10 -07:00 
						 
				 
			
				
					
						
							
							
								Shpuld Shpuldson 
							
						 
					 
					
						
						
						
						
							
						
						
							ba4f7ef3ef 
							
						 
					 
					
						
						
							
							Merge branch 'feature/failed-login-error' into 'develop'  
						
						... 
						
						
						
						Visual feedback on failed login
See merge request !49  
						
						
					 
					
						2017-03-08 19:21:36 -05:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							9511691c94 
							
						 
					 
					
						
						
							
							Make the error into a div instead of a button to get rid of the hover effects.  
						
						
						
						
					 
					
						2017-03-09 02:21:23 +02:00 
						 
				 
			
				
					
						
							
							
								Shpuld Shpuldson 
							
						 
					 
					
						
						
						
						
							
						
						
							aeda390da0 
							
						 
					 
					
						
						
							
							Merge branch 'feature/timeline-fetch-error' into 'develop'  
						
						... 
						
						
						
						Move rejection handler
See merge request !48  
						
						
					 
					
						2017-03-08 19:03:06 -05:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							507fe79050 
							
						 
					 
					
						
						
							
							Add base03 border to timeline bottom fetcher too.  
						
						
						
						
					 
					
						2017-03-09 01:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8fc99d5a 
							
						 
					 
					
						
						
							
							Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses.  
						
						
						
						
					 
					
						2017-03-09 01:09:23 +02:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							5997492795 
							
						 
					 
					
						
						
							
							Merge branch 'feature/performance' into 'develop'  
						
						... 
						
						
						
						Feature/performance
See merge request !50  
						
						
					 
					
						2017-03-08 15:17:59 -05:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							0d39ed809b 
							
						 
					 
					
						
						
							
							Add caching system to statuses.  
						
						
						
						
					 
					
						2017-03-08 21:04:48 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							0810b2d51a 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2017-03-08 19:31:39 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							ccc460bb5e 
							
						 
					 
					
						
						
							
							Give more specific reason for failed login  
						
						
						
						
					 
					
						2017-03-08 19:22:56 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e8111d64 
							
						 
					 
					
						
						
							
							Clear username and password field on failed login  
						
						
						
						
					 
					
						2017-03-08 19:08:01 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b6fe95c0 
							
						 
					 
					
						
						
							
							Show visual feedback on login error, redirect on success  
						
						
						
						
					 
					
						2017-03-08 18:28:41 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							5699872bb5 
							
						 
					 
					
						
						
							
							Use user cache in users module.  
						
						
						
						
					 
					
						2017-03-08 18:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							480a1ba253 
							
						 
					 
					
						
						
							
							Use cache to quickly access users.  
						
						
						
						
					 
					
						2017-03-08 17:59:12 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							bde1241843 
							
						 
					 
					
						
						
							
							eslint fixes.  
						
						
						
						
					 
					
						2017-03-08 17:58:49 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							ccbfc64bfc 
							
						 
					 
					
						
						
							
							Don't redirect after login.  
						
						
						
						
					 
					
						2017-03-08 16:54:06 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							7d52258378 
							
						 
					 
					
						
						
							
							Move rejection handler  
						
						
						
						
					 
					
						2017-03-07 21:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Shpuld Shpuldson 
							
						 
					 
					
						
						
						
						
							
						
						
							d954db0221 
							
						 
					 
					
						
						
							
							Merge branch 'feature/timeline-fetch-error' into 'develop'  
						
						... 
						
						
						
						Visual feedback on failure to fetch new statuses
See merge request !47  
						
						
					 
					
						2017-03-07 12:15:37 -05:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							3a62ad3c4c 
							
						 
					 
					
						
						
							
							Merge branch 'feature/more-visible-notifications' into 'develop'  
						
						... 
						
						
						
						Notifications inside a red circle and the red line more visible
See merge request !46  
						
						
					 
					
						2017-03-07 11:27:46 -05:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							086dd832d3 
							
						 
					 
					
						
						
							
							Visual feedback on failure to fetch new statuses  
						
						
						
						
					 
					
						2017-03-07 17:27:12 +01:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							1057227be3 
							
						 
					 
					
						
						
							
							Merge branch 'fix/collapse-on-same-line' into 'develop'  
						
						... 
						
						
						
						Put conversation 'Collapse' back on the same line with the rest of the heading.'
See merge request !45  
						
						
					 
					
						2017-03-07 10:15:41 -05:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							ae570ea0ff 
							
						 
					 
					
						
						
							
							Put conversation 'Collapse' back on the same line with the rest of the heading.'  
						
						
						
						
					 
					
						2017-03-07 16:00:45 +02:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							58fdf9e70d 
							
						 
					 
					
						
						
							
							Put the number of notifications inside a red circle (kinda like qvitter and everyone else does), make the red notification line slightly less transparent.  
						
						
						
						
					 
					
						2017-03-07 15:55:00 +02:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							aa0d207c94 
							
						 
					 
					
						
						
							
							Merge branch 'fix/highlight-expanded-retweets' into 'develop'  
						
						... 
						
						
						
						Highlight original notice when expanding retweets
See merge request !43  
						
						
					 
					
						2017-03-07 06:06:43 -05:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							e64a5beb35 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop  
						
						
						
						
					 
					
						2017-03-07 08:44:53 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							5143ae7f72 
							
						 
					 
					
						
						
							
							Switch to localforage to use indexeddb by default.  
						
						
						
						
					 
					
						2017-03-07 08:43:48 +01:00 
						 
				 
			
				
					
						
							
							
								Shpuld Shpuldson 
							
						 
					 
					
						
						
						
						
							
						
						
							34531de8c0 
							
						 
					 
					
						
						
							
							Merge branch 'fix/overlapping-styles-user-card' into 'develop'  
						
						... 
						
						
						
						Fix overlapping styles in timeline and notifications that screwed up user-card.
See merge request !44  
						
						
					 
					
						2017-03-06 16:55:48 -05:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ebf44f24 
							
						 
					 
					
						
						
							
							Fix overlapping styles in timeline and notifications that screwed up user-card.  
						
						
						
						
					 
					
						2017-03-06 23:51:39 +02:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							990047725a 
							
						 
					 
					
						
						
							
							Revert "Temporarily remove persistence."  
						
						... 
						
						
						
						This reverts commit 0bb1ec30d0ccba0fded1c6555d75297a6d9c83d2. 
						
						
					 
					
						2017-03-06 19:57:00 +01:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb1ec30d0 
							
						 
					 
					
						
						
							
							Temporarily remove persistence.  
						
						
						
						
					 
					
						2017-03-06 19:55:08 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							9d56721533 
							
						 
					 
					
						
						
							
							Highlight original notice when expanding retweets  
						
						
						
						
					 
					
						2017-03-06 16:21:11 +01:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							eab4b76951 
							
						 
					 
					
						
						
							
							Merge branch 'feature/load-new-statuses-in-heading' into 'develop'  
						
						... 
						
						
						
						Improvements in loading statuses interface
See merge request !42  
						
						
					 
					
						2017-03-06 07:58:32 -05:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							31c0a2dfef 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading  
						
						
						
						
					 
					
						2017-03-06 14:51:01 +02:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							67c22276d3 
							
						 
					 
					
						
						
							
							Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop'  
						
						... 
						
						
						
						Wakarimasen/pleroma fe highlight notice
See merge request !41  
						
						
					 
					
						2017-03-05 14:59:33 -05:00 
						 
				 
			
				
					
						
							
							
								Roger Braun 
							
						 
					 
					
						
						
						
						
							
						
						
							51160f0fdb 
							
						 
					 
					
						
						
							
							Style fixes.  
						
						
						
						
					 
					
						2017-03-05 20:36:22 +01:00 
						 
				 
			
				
					
						
							
							
								shpuld 
							
						 
					 
					
						
						
						
						
							
						
						
							e19bfb9a22 
							
						 
					 
					
						
						
							
							Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else.  
						
						
						
						
					 
					
						2017-03-05 19:00:35 +02:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							42ae57dace 
							
						 
					 
					
						
						
							
							Remove unused import  
						
						
						
						
					 
					
						2017-03-05 16:49:45 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							289326855c 
							
						 
					 
					
						
						
							
							Add focused prop to status  
						
						
						
						
					 
					
						2017-03-05 16:31:01 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							c921662036 
							
						 
					 
					
						
						
							
							Add inConversation prop to status  
						
						
						
						
					 
					
						2017-03-05 14:34:14 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							22e8258a56 
							
						 
					 
					
						
						
							
							Highlight current notice in conversation-page, add backlinks  
						
						
						
						
					 
					
						2017-03-05 11:56:28 +01:00 
						 
				 
			
				
					
						
							
							
								wakarimasen 
							
						 
					 
					
						
						
						
						
							
						
						
							6bcbed38d0 
							
						 
					 
					
						
						
							
							Add option to only hide attachments on timeline  
						
						
						
						
					 
					
						2017-03-04 21:25:59 +01:00 
						 
				 
			
				
					
						
							
							
								lambadalambda 
							
						 
					 
					
						
						
						
						
							
						
						
							049c74f8e8 
							
						 
					 
					
						
						
							
							Merge branch 'feature/better-nsfw-image-loading' into 'develop'  
						
						... 
						
						
						
						issue #1  - better nsfw image loading
See merge request !37  
						
						
					 
					
						2017-03-03 05:00:06 -05:00