06f5fe58c4 
								
							 
						 
						
							
							
								
								Got ctrl+enter to submit a word from the Word Form. Just need to resolve some focus issues after editing.  
							
							 
							
							
							
						 
						
							2016-03-11 08:06:20 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								956255bc00 
								
							 
						 
						
							
							
								
								Altered public view link to be tinier.  
							
							 
							
							... 
							
							
							
							Made links global ("/" instead of "./") 
							
						 
						
							2016-03-09 13:23:18 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b887e1309b 
								
							 
						 
						
							
							
								
								Moved, minified, and renamed defiantJS  
							
							 
							
							
							
						 
						
							2016-03-02 11:18:52 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								24917e7ff2 
								
							 
						 
						
							
							
								
								Include minified versions of scripts for the server  
							
							 
							
							
							
						 
						
							2016-03-02 11:13:19 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								0df7281c94 
								
							 
						 
						
							
							
								
								Update Sorting - sort by name then part of speech.  
							
							 
							
							
							
						 
						
							2016-03-02 10:59:14 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b0d45e226c 
								
							 
						 
						
							
							
								
								Fixed public dictionary search  
							
							 
							
							
							
						 
						
							2016-02-27 11:00:48 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ab61fdcfb8 
								
							 
						 
						
							
							
								
								Made searching for most punctuation work and highlight correctly.  
							
							 
							
							
							
						 
						
							2016-02-27 10:10:11 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								989b67f923 
								
							 
						 
						
							
							
								
								Allow Fullscreen Textarea for Word Long Description and Dictionary Description.  
							
							 
							
							
							
						 
						
							2016-02-27 08:54:13 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								5cb27c874b 
								
							 
						 
						
							
							
								
								Started working on setting the cursor position in the fullscreen textbox (INCOMPLETE!)  
							
							 
							
							
							
						 
						
							2016-02-26 18:13:52 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								03aeeb4a8c 
								
							 
						 
						
							
							
								
								Add functionality for fullscreen textbox for dictionary description  
							
							 
							
							
							
						 
						
							2016-02-26 18:01:05 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								3bb9bab9a8 
								
							 
						 
						
							
							
								
								Organized functions more logically.  
							
							 
							
							
							
						 
						
							2016-02-26 17:18:29 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								cb9041c7ca 
								
							 
						 
						
							
							
								
								Re-lock word form if dictionary is completed.  
							
							 
							
							... 
							
							
							
							Broke out Lock and Unlock word form functions for use elsewhere. 
							
						 
						
							2016-02-24 13:07:32 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								7cf5eeb252 
								
							 
						 
						
							
							
								
								Word Entry Form can now be unlocked and scroll next to the dictionary.  
							
							 
							
							
							
						 
						
							2016-02-24 12:50:30 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								9d18c038e2 
								
							 
						 
						
							
							
								
								Fixed wording for plurals on result counter.  
							
							 
							
							
							
						 
						
							2016-01-18 13:04:53 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								9ec5ca325f 
								
							 
						 
						
							
							
								
								Added word count for searching/filtering.  
							
							 
							
							
							
						 
						
							2016-01-18 12:14:36 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6be4798bbc 
								
							 
						 
						
							
							
								
								Utilize the knowledge of whether a dictionary is complete or not on when viewing.  
							
							 
							
							
							
						 
						
							2015-12-22 15:16:36 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8a48798e84 
								
							 
						 
						
							
							
								
								Make public settings only visible to logged in users,  
							
							 
							
							... 
							
							
							
							Reset new user dictionaries to not public if uploading for the first time,
Updated README, TERMS, and PRIVACY to include info about public dictionaries. 
							
						 
						
							2015-12-22 11:23:35 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b98f1750d9 
								
							 
						 
						
							
							
								
								Added Public View option!  
							
							 
							
							
							
						 
						
							2015-12-21 17:52:56 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								00e522849a 
								
							 
						 
						
							
							
								
								Fixed removing backslashes.  
							
							 
							
							
							
						 
						
							2015-12-21 14:34:37 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								14f9942647 
								
							 
						 
						
							
							
								
								Disable word entry when confirming edit.  
							
							 
							
							... 
							
							
							
							Added separate "announcement" apart from notifications.
Added explanation for "Allow Emails".
Updated ReadMe. 
							
						 
						
							2015-12-16 18:13:45 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6b7eebe9f3 
								
							 
						 
						
							
							
								
								Fix forced hiding if logged out.  
							
							 
							
							
							
						 
						
							2015-12-13 17:01:26 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								d33229e472 
								
							 
						 
						
							
							
								
								Hide info screen if account is open and vice versa, plus reorganize screens so loadAfterDeleteScreen always appears on top and can't be closed.  
							
							 
							
							
							
						 
						
							2015-12-12 11:24:47 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ea04571590 
								
							 
						 
						
							
							
								
								Added Password Reset and Account Settings management.  
							
							 
							
							
							
						 
						
							2015-12-11 18:06:47 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								7b7c0e9543 
								
							 
						 
						
							
							
								
								Merge branch 'prod' into php for Search Overhaul changes.  
							
							 
							
							... 
							
							
							
							Conflicts:
	index.php
	js/dictionaryBuilder.js
	js/removeDiacritics.js 
							
						 
						
							2015-12-02 16:39:04 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								dcecb90b62 
								
							 
						 
						
							
							
								
								Search function overhaul: now search by case sensitive and regardless of diacritics!  
							
							 
							
							... 
							
							
							
							Changed markdown parser to allow Github-Flavored Markdown. 
							
						 
						
							2015-12-02 16:03:23 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								bf38b762fa 
								
							 
						 
						
							
							
								
								Fixed broken dictionary deletion switching.  
							
							 
							
							
							
						 
						
							2015-12-02 09:47:17 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								a7fe6c2432 
								
							 
						 
						
							
							
								
								Added some helpers for the lockout function and a script for removing diacritics for the export file name.  
							
							 
							
							
							
						 
						
							2015-12-01 17:24:43 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8f446503cc 
								
							 
						 
						
							
							
								
								Fixed Sort By Equivalent not loading from database. Changed Markdown Parser again to allow Github-Flavored Md.  
							
							 
							
							
							
						 
						
							2015-12-01 13:15:37 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								adbc60b2d8 
								
							 
						 
						
							
							
								
								Minor changes, removed line breaks after h# tags.  
							
							 
							
							
							
						 
						
							2015-11-30 22:55:05 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								98e138b8f6 
								
							 
						 
						
							
							
								
								Change to new markdown parser to allow tables.  
							
							 
							
							
							
						 
						
							2015-11-30 18:31:40 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								e8c31a86d5 
								
							 
						 
						
							
							
								
								Forced imports to always create a new dictionary.  
							
							 
							
							
							
						 
						
							2015-11-30 16:28:21 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ade8d57281 
								
							 
						 
						
							
							
								
								Fixed switching dicitonaries, added deletion and addition of dictionaries, added next_word_id to dictionary, added warning for logging in with non-new dictionary.  
							
							 
							
							... 
							
							
							
							Commented out ads/tracking, so be sure to add that before prod. 
							
						 
						
							2015-11-30 16:08:43 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8861ca24b5 
								
							 
						 
						
							
							
								
								Adding and changing dictionaries.  
							
							 
							
							
							
						 
						
							2015-11-27 23:17:52 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8a025d14b5 
								
							 
						 
						
							
							
								
								Got everything loading and saving correctly using PDO for slightly better security.  
							
							 
							
							... 
							
							
							
							Still need to work on creating new dictionaries and switching between them. 
							
						 
						
							2015-11-25 16:08:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6e88e55e12 
								
							 
						 
						
							
							
								
								Merge branch 'prod' into php  
							
							 
							
							... 
							
							
							
							Conflicts:
	.gitignore
	index.php
	js/dictionaryBuilder.js 
							
						 
						
							2015-11-25 10:37:03 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								d3f296e560 
								
							 
						 
						
							
							
								
								Fixed sorting  
							
							 
							
							
							
						 
						
							2015-11-10 16:11:10 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								92b047893d 
								
							 
						 
						
							
							
								
								Fixed some apostrophe problems.  
							
							 
							
							
							
						 
						
							2015-11-10 14:51:36 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6e9d11ec0c 
								
							 
						 
						
							
							
								
								Show link to word after adding it and focus on Word field.  
							
							 
							
							... 
							
							
							
							Only for newly added words. 
							
						 
						
							2015-11-09 17:53:01 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								7fb4dfbb70 
								
							 
						 
						
							
							
								
								Un-parse Pronunciation HTML because it's a Markdown field  
							
							 
							
							
							
						 
						
							2015-11-09 15:44:10 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								71defdd59b 
								
							 
						 
						
							
							
								
								Added close notification button and fixed Info Pages.  
							
							 
							
							... 
							
							
							
							Also added admin override for ads. 
							
						 
						
							2015-11-09 12:20:03 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								94fa5ea5df 
								
							 
						 
						
							
							
								
								Merge branch 'web' into prod  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	.gitignore
#	README.md
#	css/styles.css
#	index.php
#	js/dictionaryBuilder.js 
							
						 
						
							2015-11-07 17:02:35 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								996874a38f 
								
							 
						 
						
							
							
								
								Split out UI-related functions into a separate file.  
							
							 
							
							
							
						 
						
							2015-11-07 16:33:29 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								061a9f9929 
								
							 
						 
						
							
							
								
								Added unique word ids for linking directly to words  
							
							 
							
							
							
						 
						
							2015-11-07 16:24:50 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								76358af020 
								
							 
						 
						
							
							
								
								Allowed sorting by Equivalent Word, trim whitespace from fields.  
							
							 
							
							... 
							
							
							
							Also added link to IPA Character Picker backup file (ignored in repo). 
							
						 
						
							2015-11-07 10:40:28 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								88dbe2fba8 
								
							 
						 
						
							
							
								
								Added Pronunciation field, reorganized fields, optimized search code, improved imports.  
							
							 
							
							... 
							
							
							
							Removed import tokens. 
							
						 
						
							2015-11-06 23:51:44 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								1a891cebd7 
								
							 
						 
						
							
							
								
								Separated confirmation from actions. Broke imports.  
							
							 
							
							... 
							
							
							
							Imports only work when logged out. They should work regardless of when they happen. 
							
						 
						
							2015-11-04 17:47:54 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								dd3783be5c 
								
							 
						 
						
							
							
								
								Fixed database load/save. Changed import acceptance policy/method.  
							
							 
							
							
							
						 
						
							2015-11-04 16:43:52 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								782a5140e7 
								
							 
						 
						
							
							
								
								Little tweaks to improve UX  
							
							 
							
							
							
						 
						
							2015-11-04 14:35:33 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								898dabedb2 
								
							 
						 
						
							
							
								
								Lots more stuff for accounts and managing dictionaries in the database.  
							
							 
							
							... 
							
							
							
							All this PHP stuff really needs to be in a new branch. 
							
						 
						
							2015-11-04 14:12:39 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								30abe592db 
								
							 
						 
						
							
							
								
								Started working on PHP - create account support and validation.  
							
							 
							
							... 
							
							
							
							Create Account works, but login does nothing. 
							
						 
						
							2015-11-02 17:25:08 -07:00