Commit graph

273 commits

Author SHA1 Message Date
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