Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity
175 Commits 20 Branches 10 Tags 12 MiB
Commit Graph

175 Commits

Author SHA1 Message Date
Robbie Antenesse 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
Robbie Antenesse 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
Robbie Antenesse bf38b762fa Fixed broken dictionary deletion switching. 2015-12-02 09:47:17 -07:00
Robbie Antenesse 0f3185c9ea Moved random_string() to helpers.php. Renamed password_reset_validation.php to ajax_passwordresetvalidation.php for consistency. 2015-12-01 18:05:38 -07:00
Robbie Antenesse 02d313cb73 Started on password reset. 2015-12-01 18:01:52 -07:00
Robbie Antenesse 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
Robbie Antenesse f700db633e Updated ReadMe, Terms, Privacy, and Login form. 2015-12-01 16:06:15 -07:00
Robbie Antenesse 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
Robbie Antenesse adbc60b2d8 Minor changes, removed line breaks after h# tags. 2015-11-30 22:55:05 -07:00
Robbie Antenesse 98e138b8f6 Change to new markdown parser to allow tables. 2015-11-30 18:31:40 -07:00
Robbie Antenesse e8c31a86d5 Forced imports to always create a new dictionary. 2015-11-30 16:28:21 -07:00
Robbie Antenesse 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
Robbie Antenesse 8861ca24b5 Adding and changing dictionaries. 2015-11-27 23:17:52 -07:00
Robbie Antenesse 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
Robbie Antenesse 6e88e55e12 Merge branch 'prod' into php 
Conflicts:
	.gitignore
	index.php
	js/dictionaryBuilder.js
 2015-11-25 10:37:03 -07:00
Robbie Antenesse d3f296e560 Fixed sorting 2015-11-10 16:11:10 -07:00
Robbie Antenesse 94b43b99d6 Force sort to ignore case. 2015-11-10 15:49:21 -07:00
Robbie Antenesse 317c52d390 Tiny fix. 2015-11-10 15:01:49 -07:00
Robbie Antenesse cfbd4abe55 Merge branch 'prod' 2015-11-10 14:56:07 -07:00
Robbie Antenesse 92b047893d Fixed some apostrophe problems. 2015-11-10 14:51:36 -07:00
Robbie Antenesse 62f08516df Forgot to remove the rest of the PHP files. 2015-11-09 18:12:33 -07:00
Robbie Antenesse 782bbe10e5 Merge branch 'prod' for fixes and link to new words. 2015-11-09 18:10:26 -07:00
Robbie Antenesse 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
Robbie Antenesse 7fb4dfbb70 Un-parse Pronunciation HTML because it's a Markdown field 2015-11-09 15:44:10 -07:00
Robbie Antenesse 272ba90fe7 Updated README to include Pronunciation and removed unused currentVersion. 2015-11-09 12:38:01 -07:00
Robbie Antenesse 924d330cec HTML entity was not rendering, so replaced with actual character. 2015-11-09 12:28:01 -07:00
Robbie Antenesse dea301a520 Updated README to mention Pronunciation field. 2015-11-09 12:25:29 -07:00
Robbie Antenesse 71defdd59b Added close notification button and fixed Info Pages. 
Also added admin override for ads.
 2015-11-09 12:20:03 -07:00
Robbie Antenesse 8356317d1d Added simple notifications. 
Updated styling for word links.
 2015-11-09 11:45:46 -07:00
Robbie Antenesse a4a3bc8b9d Added links to issues page. 2015-11-07 17:21:06 -07:00
Robbie Antenesse e2b5d19e15 Tidying up after the merge. 2015-11-07 17:12:59 -07:00
Robbie Antenesse 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
Robbie Antenesse aef556de99 Changed index to PHP for merge. 2015-11-07 16:51:19 -07:00
Robbie Antenesse 0606aeef59 Ignore IPA character picker files 2015-11-07 16:44:31 -07:00
Robbie Antenesse 996874a38f Split out UI-related functions into a separate file. 2015-11-07 16:33:29 -07:00
Robbie Antenesse 061a9f9929 Added unique word ids for linking directly to words 2015-11-07 16:24:50 -07:00
Robbie Antenesse 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
Robbie Antenesse 88dbe2fba8 Added Pronunciation field, reorganized fields, optimized search code, improved imports. 
Removed import tokens.
 2015-11-06 23:51:44 -07:00
Robbie Antenesse 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
Robbie Antenesse dd3783be5c Fixed database load/save. Changed import acceptance policy/method. 2015-11-04 16:43:52 -07:00
Robbie Antenesse 10cf5a34c5 Committed to switching index.php's. 
Also commented out adsense and analytics inserts.
 2015-11-04 14:52:12 -07:00
Robbie Antenesse 782a5140e7 Little tweaks to improve UX 2015-11-04 14:35:33 -07:00
Robbie Antenesse 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
Robbie Antenesse 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
Robbie Antenesse 75bd9ec216 Added Terms and Privacy plus Analytics and Adsense 
Started move to PHP
 2015-11-02 10:28:43 -07:00
Robbie Antenesse 6a8d74c6f9 Added Libraries Used section to give credit 2015-11-01 20:45:19 -07:00
Robbie Antenesse 44a7ca7297 Tweaked About button size 2015-11-01 20:09:20 -07:00
Robbie Antenesse 178b6da02b Completed Readme 
Moved About button
Fixed & reorganized styles
 2015-11-01 20:04:44 -07:00
Robbie Antenesse 173e242158 Updated logo SVGs 2015-11-01 13:57:08 -07:00
Robbie Antenesse 54ae8a2542 Temporarily hid login/out buttons until implemented. 2015-11-01 13:37:33 -07:00