Commit graph

100 commits

Author SHA1 Message Date
xevidos
2f4727aad3 Updated Ace Editor, Started rewrite of collaborative plugin, added ability to disable and enable editors, Started adding some php variables to javascript. 2018-08-08 10:12:29 -04:00
xevidos
2894a7a694 Updated ace.js to version 1.3.3, Updated readme, Updated authors, 2018-07-31 15:59:15 -04:00
xevidos
a18a05fb71 Updated Readme 2018-07-27 14:19:50 -04:00
xevidos
5f0a158c9a Updated Readme and Example Config 2018-07-27 14:19:11 -04:00
xevidos
7c01c4c809 Added site renaming, Added sessions folder checks, Updated wiki url, Updated readme 2018-07-27 13:59:08 -04:00
Isaac Brown
607da674f7 Merge branch 'development' into 'master'
Updated auto save implementation,  fixed session kicking.

See merge request xevidos/codiad!13
2018-07-26 18:04:18 -04:00
xevidos
cf653b5776 Updated version and updated readme. 2018-07-26 17:58:53 -04:00
xevidos
7e8e292882 Removed auto save plugin, Finished integrating auto save, Fixed JSEND error on first load, added checks for incompatible files and plugins on update. 2018-07-26 16:50:47 -04:00
xevidos
f0f9f3a89e Updated auto save, Updated install, Updated auto kick 2018-07-26 15:39:40 -04:00
Isaac Brown
602d90b120 Update README 2018-07-25 09:26:29 -04:00
Isaac Brown
d13496f49e Delete README.md 2018-07-25 09:09:28 -04:00
xevidos
5febcf99df Changed README file to HTML instead of MD 2018-07-25 09:09:07 -04:00
xevidos
7297e62931 Changed README file to HTML instead of MD 2018-07-25 09:07:37 -04:00
Isaac Brown
5a8b2b9340 Update README 2018-07-25 09:02:09 -04:00
xevidos
9b790b3532 Updated install and update script, Updated sample config, Updated Readme, Changed version 2018-07-25 08:56:41 -04:00
xevidos
e3b4c0df98 Fixed issue with sessions not timing out on firefox and removed CodeSettings from default plugins due to errors. 2018-07-24 14:27:53 -04:00
Isaac Brown
8ac44ce344 Merge branch 'development' into 'master'
Deleted extraneous files and fixed extra session declaration.

See merge request xevidos/codiad!12
2018-07-24 10:01:26 -04:00
xevidos
d824926299 Deleted extraneous files and fixed extra session declaration. 2018-07-24 10:01:00 -04:00
Isaac Brown
988c07b0f4 Merge branch 'development' into 'master'
Fixed incorrect sessions deletion issue.

See merge request xevidos/codiad!11
2018-07-24 09:47:07 -04:00
xevidos
6da112e8a9 Added extra check to session delete. 2018-07-24 09:45:36 -04:00
xevidos
e903608001 Fixes issue where collaborative sessions would get deleted when checking for duplicate sessions. 2018-07-24 09:39:12 -04:00
Isaac Brown
41536b8ddb Merge branch 'development' into 'master'
Updated version number

See merge request xevidos/codiad!10
2018-07-24 09:20:19 -04:00
xevidos
d1edeb7ea7 Updated version number 2018-07-24 09:19:38 -04:00
Isaac Brown
b5ee0c6d82 Merge branch 'development' into 'master'
Fixed permissions for sessions folder

See merge request xevidos/codiad!9
2018-07-24 09:17:58 -04:00
xevidos
de120cc548 Fixed permissions for sessions folder 2018-07-24 09:16:05 -04:00
Isaac Brown
d8e5f978dc Merge branch 'development' into 'master'
Updated Install and update script to create sessions path.

See merge request xevidos/codiad!8
2018-07-24 08:57:24 -04:00
xevidos
fbd9c144ef Updated Install and update script to create sessions path. 2018-07-24 08:56:42 -04:00
Isaac Brown
10d6dbc84e Merge branch 'development' into 'master'
Update

See merge request xevidos/codiad!6
2018-07-24 08:37:21 -04:00
Isaac Brown
e16617d6c2 Revert "Updated version"
This reverts commit dd9070f85b
2018-07-24 08:36:39 -04:00
Isaac Brown
ef5126e3b5 Merge branch 'master' into 'development'
# Conflicts:
#   components/update/class.update.php
2018-07-24 08:34:20 -04:00
xevidos
dd9070f85b Updated version 2018-07-24 08:33:02 -04:00
xevidos
6030f3de74 Added a fetch to get the latest update script, on update the update file deletes. 2018-07-24 08:32:06 -04:00
xevidos
dd638b6dc7 Fixed JS error on login screen, added force logout if more than one session is open, fixed favicon, added session path. 2018-07-23 22:03:13 -04:00
xevidos
1901373012 Updated filemanager to handle downloading PDfs, opening icons, and fixed favicon. 2018-07-18 17:06:28 -04:00
xevidos
cb044a00ce Merge branch 'development' of https://gitlab.telaaedifex.com/xevidos/codiad into development 2018-07-18 17:02:06 -04:00
xevidos
4e292284eb Updated filemanager to handle downloading PDfs, opening icons, and fixed favicon. 2018-07-18 17:00:52 -04:00
xevidos
b21d548357 Updated version. 2018-07-18 16:16:44 -04:00
Isaac Brown
957b6dc381 Merge branch 'master' into 'development'
Master

See merge request xevidos/codiad!4
2018-07-18 16:12:04 -04:00
xevidos
10463c5708 Fixed 500 error in updater. 2018-07-18 16:11:02 -04:00
Isaac Brown
f35a290570 Merge branch 'development' into 'master'
Merge updater update.

See merge request xevidos/codiad!3
2018-07-18 15:31:16 -04:00
xevidos
92d2636372 Updated version number 2018-07-18 15:28:56 -04:00
xevidos
701cce6756 Removed auto update plugin, Implemented update script. 2018-07-18 15:28:30 -04:00
xevidos
cd5bd773ab Merge branch 'master' into development 2018-07-17 16:27:07 -04:00
xevidos
9307f312fb Made changes to get ready for auto update 2018-07-17 16:14:39 -04:00
Isaac Brown
35fa9c0226 Revert "Updated Auto Save and Components"
This reverts commit a320b612d5
2018-07-17 14:47:03 -04:00
Isaac Brown
a320b612d5 Updated Auto Save and Components 2018-07-17 14:38:02 -04:00
xevidos
2900522462 Changed name for auto save 2018-07-17 13:37:02 -04:00
xevidos
ffbb309ba2 Fixed dev branch sync 2018-07-17 13:32:22 -04:00
xevidos
9a78c22f5b Updated for PHP 7.2, modified save message function, Updated Collaboration for newer versions. 2018-07-13 12:39:55 -04:00
Isaac Brown
af875d488f Initial commit. 2018-07-12 09:47:53 -04:00