|  | 98e138b8f6 | Change to new markdown parser to allow tables. | 2015-11-30 18:31:40 -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 |  | 
				
					
						|  | 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 |  | 
				
					
						|  | 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 |  | 
				
					
						|  | 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 |  | 
				
					
						|  | 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 |  | 
				
					
						|  | 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 |  |