1
0
Fork 0
mirror of https://github.com/Alamantus/Lexiconga.git synced 2025-03-25 04:40:44 +01:00
Commit graph

95 commits

Author SHA1 Message Date
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
75bd9ec216 Added Terms and Privacy plus Analytics and Adsense
Started move to PHP
2015-11-02 10:28:43 -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
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
78fa2e88db Changed ExportDictionary to include dictionary's name as exported file name. 2015-10-26 16:21:13 -06:00
b8e822eaa7 Added lots of stuff.
Editing/deleting entries, Dictionary import/export, settings, etc.
2015-10-26 15:50:09 -06:00
d2babfd485 Initial Commit. Basic add and save functionality, no delete. 2015-10-25 22:41:25 -06:00