9d0be46a53 
								
							
								 
							
						 
						
							
							
								
								Close an open conversation before opening another  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								bbb5d56516 
								
							
								 
							
						 
						
							
							
								
								Don't reopen a currently selected conversation  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								98cfc1b701 
								
							
								 
							
						 
						
							
							
								
								Remove old convo compose view  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								511b121a2f 
								
							
								 
							
						 
						
							
							
								
								Refactor conversation view into two classes  
							
							... 
							
							
							
							One that resides in the left hand column as a list item, and another
which displays in the main column and handles ui events therein. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6ff6ef07a9 
								
							
								 
							
						 
						
							
							
								
								Parse the template before binding render to an event  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d615a5a18b 
								
							
								 
							
						 
						
							
							
								
								Let list view changes the color of selected conversations  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								dc957415c2 
								
							
								 
							
						 
						
							
							
								
								Cull dead code  
							
							... 
							
							
							
							Most of this no longer needed because of templating and list views. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								9082781e09 
								
							
								 
							
						 
						
							
							
								
								Make header and footer/form work without overflowing  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								df95a7f71a 
								
							
								 
							
						 
						
							
							
								
								Move ui init out of nacl callback and remove some lines that no longer apply  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								def32f42d4 
								
							
								 
							
						 
						
							
							
								
								New layout/design  
							
							... 
							
							
							
							Two column layout and style tweaks. Templatized conversation views.
Generalized list view. 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6d5e32bca8 
								
							
								 
							
						 
						
							
							
								
								Don't make a new collection on every call to thread.messages()  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								7e20838128 
								
							
								 
							
						 
						
							
							
								
								Rename file  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								4724c96ecb 
								
							
								 
							
						 
						
							
							
								
								Use $.find so these locals can go away  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								2e3d89ef78 
								
							
								 
							
						 
						
							
							
								
								Use mustache template for message rendering  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								25fecc949e 
								
							
								 
							
						 
						
							
							
								
								Condense some code using Backbone.View's event framework  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								06ff6c3087 
								
							
								 
							
						 
						
							
							
								
								Let thread collection double as contacts db  
							
							... 
							
							
							
							When a thread is 'destroyed' from the UI we delete its messages and mark
the thread as inactive, (in other words, keep it around as contact info).
Additionally, we only load active threads when initializing the UI, and
reactivate threads when new messages are added to them.
Conflicts:
	js/models/messages.js
	js/models/threads.js
	js/views/conversations/show.js 
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								c6b79236d9 
								
							
								 
							
						 
						
							
							
								
								Fix whitespace, lint  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								ebf1b3352f 
								
							
								 
							
						 
						
							
							
								
								Use separate message collections for each thread to facilitate lookup and lazy loading  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d6d17eaf19 
								
							
								 
							
						 
						
							
							
								
								Remove unused function  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3696214edc 
								
							
								 
							
						 
						
							
							
								
								Add missing localStorage.clear()  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								28779e0b35 
								
							
								 
							
						 
						
							
							
								
								Fix tests by returning promises  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								90eb9cb0c8 
								
							
								 
							
						 
						
							
							
								
								Remove ping, update to latest spec proposal  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f6f35c5b61 
								
							
								 
							
						 
						
							
							
								
								Fix a missing function and dont blow up on delivery receipts  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								d9f53d4c01 
								
							
								 
							
						 
						
							
							
								
								Fix not-allowed inline scripts error  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a6b0d1f84b 
								
							
								 
							
						 
						
							
							
								
								Add entirely untested secondary device init  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								2751d0e884 
								
							
								 
							
						 
						
							
							
								
								Such tests. Very mocha. Much chai. Amaze!!!  
							
							... 
							
							
							
							ERHMAGERRRD testing frameworks are so the best. Removed all our custom
code for ensuring test exclusivity and doneness and isolating callbacks
and everything. mocha does it all for us, and makes it pretty.
Also rather than return a long chain of promises that eventually resolve
to truthiness, we now use chai to make assertions about what is good and
right in the world.
Recommended reading:
  https://visionmedia.github.io/mocha 
  http://chaijs.com/api/assert/  
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6455da5c9a 
								
							
								 
							
						 
						
							
							
								
								Refactor a bunch of stuff re: session closing, add test cases  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								c427da04f0 
								
							
								 
							
						 
						
							
							
								
								Add closeSession tests as Alice and fix re-requesting prekeys  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								6f3ee151f3 
								
							
								 
							
						 
						
							
							
								
								Add a BOB test-case around session closure  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a6426194ef 
								
							
								 
							
						 
						
							
							
								
								Update BOB test cases  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								957587bd9a 
								
							
								 
							
						 
						
							
							
								
								Add identity keys to MAC, begin updating test cases  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								eab0911d3d 
								
							
								 
							
						 
						
							
							
								
								I lied, there is no verification tag  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								85f33345ab 
								
							
								 
							
						 
						
							
							
								
								Move test shuffling to js/testvectors.js  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0088721343 
								
							
								 
							
						 
						
							
							
								
								Move AXOLOTL test vectors to js/testvectors.js  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								07f79cb4bf 
								
							
								 
							
						 
						
							
							
								
								Fix tester  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								7013c5e031 
								
							
								 
							
						 
						
							
							
								
								First steps towards BOB test vectors  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								ebcfd4736e 
								
							
								 
							
						 
						
							
							
								
								Fix session lookup in duplicate prekeymessage case  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								5040bfbe44 
								
							
								 
							
						 
						
							
							
								
								Fix pending verifications  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a76ae2f1f8 
								
							
								 
							
						 
						
							
							
								
								Add verification tags, make alice tests strict(ish) again  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								287b55120d 
								
							
								 
							
						 
						
							
							
								
								First cut of ALICE test vectors  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								a8908646aa 
								
							
								 
							
						 
						
							
							
								
								Fix null flags in v3  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								0d4ae6a8cb 
								
							
								 
							
						 
						
							
							
								
								Fix undefined variable in for's (browser update to strict mode?)  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								de83429962 
								
							
								 
							
						 
						
							
							
								
								v3 steps  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								66bf371aa7 
								
							
								 
							
						 
						
							
							
								
								Use staging server (ie update to server keys v2) and protocolv3  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								53f8ac9ad9 
								
							
								 
							
						 
						
							
							
								
								Generate signed keys (breaks registration)  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								4c3ee6f23b 
								
							
								 
							
						 
						
							
							
								
								Compare equality w/o getString (in the future)  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								3190fe97f9 
								
							
								 
							
						 
						
							
							
								
								HMAC Update for Protov3  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b5c6e3d101 
								
							
								 
							
						 
						
							
							
								
								JS ed25519  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								b94ba6b726 
								
							
								 
							
						 
						
							
							
								
								USE_NACL = true  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								7d27df9868 
								
							
								 
							
						 
						
							
							
								
								Report testing done  
							
							
							
						 
						
							11 years ago