Commit Graph

43 Commits (69fc689d38b82b50e2de7628abce2bc07eb4c975)

Author SHA1 Message Date
Are0h 69fc689d38 Finally merging 2.5.1 updates into beta
2.5.1 is ready to go, so it's time to merge into the beta branch and
  test it to make sure everything is ship shape
2 years ago
Ro 2d5de69f1c format bar float fix, added upload progess bar 3 years ago
Ro 257d2a0623 text editor adjustments, fix for page delete, ignore update 3 years ago
Ro 2fdd7f40f0 cleared conflict with git ignore 3 years ago
Ro d2f02eea50 edited ignore file to include new script. duh. 3 years ago
Ro 55b16a0acd update ignore file 3 years ago
Ro 39c6ff7f11 Update for #76 - Beta 2.5.0
# Conflicts:
#	src/com/actions/PageActions.js
#	src/com/controllers/PageEditor.js
#	src/com/controllers/SettingsIndex.js
#	src/com/ui/TextEditor.js
#	src/styles/dash.sass
#	src/styles/main/_colors.sass
#	src/styles/main/_editor-highlight.sass
#	src/styles/main/_normalize.sass
#	src/styles/main/_posts.sass
3 years ago
Ro 682406515d added assets compiling scripts, added syntax highlighting for text editor, fix for #73 3 years ago
Ro 4f4ee5dfc7 updated gitignore 3 years ago
Ro 02563a4c87 First round of changes for 2.2.0 headless update for testing
# Conflicts:
#	src/com/Base.js
#	src/com/controllers/NavIndex.js
#	src/com/controllers/PageEditor.js
#	src/com/controllers/SettingsIndex.js
#	src/libraries/FipamoAPI.js
#	src/libraries/FipamoAdminAPI.js
#	src/package-lock.json
#	src/package.json
3 years ago
Ro 46691b454d added FipamoAPI class 3 years ago
Ro 8f5df10b89 Hot fix for Fipamo admin content API 3 years ago
Ro 3d8c421f76 Merging API clean up from develop 3 years ago
Ro c21704b8bd updated ignore file 4 years ago
Ro b4ed326387 beta branch should not have source files 4 years ago
Ro 573219472a removed theme assets from repo 4 years ago
Ro 4d44ea2a06 added base style and script assets for dash 4 years ago
Ro 00f9229eb2 got rid of src files for styles and front end scripting, added base css and script assets 4 years ago
Ro c6f7c56f4a Activated site back up via zip and added download link in settings 4 years ago
Ro b98707bb0d install site activated, fixed large image upload issue(php setting), fixed page indexing 4 years ago
Ro 9283a7f5b3 tag html rendering implemented 4 years ago
Ro 5ad1118244 clean up API, re-connected API to front end, base template tweak 4 years ago
Ro f3aa86d472 git ignore tweak to save index. oops 4 years ago
Ro 67a47355d2 added basic routing and page rendering 4 years ago
Ro 125256838c clean up to move nodejs-archive-branch 4 years ago
Ro efb20eeeb3 fixed git ignore remant blocking new api path 4 years ago
Ro 96e7fddcdf git ignore update 4 years ago
Ro 634011059d finally added a damn favicon 4 years ago
Ro dca45315f4 edited git ignore file to add default global images 4 years ago
Ro 33f4765a87 navigation updates correctly when pages are pinned to menu, menu items deleted when page is deleted 4 years ago
Ro 03e8fbe82f index page now created as part of blog init process 4 years ago
Ro cf89b48d17 added settings loading to API to fix caching, added site init and onboarding, added settings templates to make site set up easier 4 years ago
Ro 161f441b84 made separate file for tags, fixed config caching error when creating new post 5 years ago
Ro 7b6af21c77 cleaned up auth in api calls, added page delete, moved edit page methods to Book data class 5 years ago
Ro d536871fd4 added pages config json(may not need), synced editor to markdown metadata, resolved new asset dependency paths 5 years ago
Ro 12d19bc3e9 cleaned up class dependancies, moving auth to new methodology 5 years ago
Ro 006c01f39e restructed cotent folders, removed assets that automatically from repo 5 years ago
Ro bdc84bc330 restructuring brain set up 5 years ago
Ro 750a55ef1c added generic site setting file, removed actual setting file. oops 6 years ago
Ro 1f52df297a quick commit for review 6 years ago
Ro 99db0dde71 moved custom tools to brain, got rid of react extensions, converted custom tools to es6 6 years ago
Ro c2de21b9b1 added db migration functionality, added published and featured to post data model 6 years ago
Ro 6f7fed59f3 initial commit in new repo 6 years ago