|  | cfbd4abe55 | Merge branch 'prod' | 2015-11-10 14:56:07 -07:00 |  | 
				
					
						|  | 92b047893d | Fixed some apostrophe problems. | 2015-11-10 14:51:36 -07:00 |  | 
				
					
						|  | 62f08516df | Forgot to remove the rest of the PHP files. | 2015-11-09 18:12:33 -07:00 |  | 
				
					
						|  | 782bbe10e5 | Merge branch 'prod' for fixes and link to new words. | 2015-11-09 18:10:26 -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 |  | 
				
					
						|  | 272ba90fe7 | Updated README to include Pronunciation and removed unused currentVersion. | 2015-11-09 12:38:01 -07:00 |  | 
				
					
						|  | 924d330cec | HTML entity was not rendering, so replaced with actual character. | 2015-11-09 12:28:01 -07:00 |  | 
				
					
						|  | dea301a520 | Updated README to mention Pronunciation field. | 2015-11-09 12:25:29 -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 |  | 
				
					
						|  | 8356317d1d | Added simple notifications. Updated styling for word links. | 2015-11-09 11:45:46 -07:00 |  | 
				
					
						|  | a4a3bc8b9d | Added links to issues page. | 2015-11-07 17:21:06 -07:00 |  | 
				
					
						|  | e2b5d19e15 | Tidying up after the merge. | 2015-11-07 17:12:59 -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 |  | 
				
					
						|  | aef556de99 | Changed index to PHP for merge. | 2015-11-07 16:51:19 -07:00 |  | 
				
					
						|  | 0606aeef59 | Ignore IPA character picker files | 2015-11-07 16:44:31 -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 |  | 
				
					
						|  | 10cf5a34c5 | Committed to switching index.php's. Also commented out adsense and analytics inserts. | 2015-11-04 14:52:12 -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 |  | 
				
					
						|  | 75bd9ec216 | Added Terms and Privacy plus Analytics and Adsense Started move to PHP | 2015-11-02 10:28:43 -07:00 |  | 
				
					
						|  | 6a8d74c6f9 | Added Libraries Used section to give credit | 2015-11-01 20:45:19 -07:00 |  | 
				
					
						|  | 44a7ca7297 | Tweaked About button size | 2015-11-01 20:09:20 -07:00 |  | 
				
					
						|  | 178b6da02b | Completed Readme Moved About button
Fixed & reorganized styles | 2015-11-01 20:04:44 -07:00 |  | 
				
					
						|  | 173e242158 | Updated logo SVGs | 2015-11-01 13:57:08 -07:00 |  | 
				
					
						|  | 54ae8a2542 | Temporarily hid login/out buttons until implemented. | 2015-11-01 13:37:33 -07:00 |  | 
				
					
						|  | 9d2d26edf9 | Added lots of styling | 2015-11-01 13:35:59 -07:00 |  | 
				
					
						|  | b418afafcb | Conditional and case-insensitive search highlighting | 2015-10-30 16:56:29 -06:00 |  | 
				
					
						|  | c60456e113 | Added Search Term highlighting and Clear Search Box | 2015-10-30 16:45:29 -06:00 |  | 
				
					
						|  | c08cf616dd | Updated README with about text Added loader into main script to load README on page load (only works when hosted) | 2015-10-30 16:13:13 -06:00 |  | 
				
					
						|  | 4f511c72a4 | Fixed Search by removing Word function Cleaned up some duplicate lines into SaveAndUpdateDictionary()
Removed UpdateFilter() | 2015-10-30 15:56:05 -06:00 |  | 
				
					
						|  | 8f6a3e3a99 | Added Search through Defiant.js Altered when Allow Duplicates is considered
Added Entry Count in settings screen. | 2015-10-30 13:23:04 -06:00 |  | 
				
					
						|  | d8b3ab00c5 | Added Allow Duplicates option Fixed Part of Speech Filter
Updated styling for entries
Updated Dictionary is Complete functionality | 2015-10-30 11:38:41 -06:00 |  | 
				
					
						|  | 310144b9ed | Reset Parts of Speech when erasing dictionary | 2015-10-28 18:44:36 -06:00 |  | 
				
					
						|  | 6a368d9aa6 | Made it responsive | 2015-10-28 16:11:33 -06:00 |  | 
				
					
						|  | 543c302fa8 | Adjusted comments | 2015-10-28 15:55:51 -06:00 |  | 
				
					
						|  | 8abef4c95d | Added Markdown, Description, and About Markdown parser is from https://github.com/evilstreak/markdown-js | 2015-10-28 15:53:59 -06:00 |  | 
				
					
						|  | f81aed185a | Added Dictionary description field | 2015-10-27 23:41:01 -06:00 |  | 
				
					
						|  | decf674ea0 | Added Dictionary Filter | 2015-10-27 22:54:27 -06:00 |  | 
				
					
						|  | 872762bc56 | Added Custom Parts of Speech Started validation based on case sensitivity | 2015-10-27 16:36:24 -06:00 |  | 
				
					
						|  | 6d1ea1bd76 | Undoing Tests | 2015-10-27 13:47:13 -06:00 |  | 
				
					
						|  | 396443be4f | Merge branch 'master' of https://github.com/Alamantus/DictionaryBuilder | 2015-10-27 13:46:11 -06:00 |  | 
				
					
						|  | 84ca0bcc6e | Undoing tests | 2015-10-27 13:46:06 -06:00 |  | 
				
					
						|  | 2a7c5da908 | Testing Visual Studio Code's functionality | 2015-10-27 13:44:53 -06:00 |  |