Andy Dixon c287e9de30 Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	cms/js/neocms.js
#	cms/settings/index.php

2024-08-01 21:15:41 +01:00

..

core

Merge branch 'master' into dev

2024-07-23 19:03:59 +01:00

css

Merge branch 'master' into dev

2024-07-23 19:03:59 +01:00

functions

Merge remote-tracking branch 'origin/dev' into dev

2024-08-01 21:15:41 +01:00

images

Initial Commit

2024-07-23 16:21:39 +01:00

js

Merge remote-tracking branch 'origin/dev' into dev

2024-08-01 21:15:41 +01:00

templates

Fixed issue #8 - Issue was related to being unable to support https, and also over https, the port number was being included. Added support for https and removal of the port number. Also fixed issue with calls going to legacy location instead of core.

2024-08-01 21:14:51 +01:00

config.php

Removed some simplified english, tag changes and cleared out small nuggets of dead code

2024-07-23 18:50:27 +01:00

index.php

Initial Commit

2024-07-23 16:21:39 +01:00

login.php

Removed some simplified english, tag changes and cleared out small nuggets of dead code

2024-07-23 18:50:27 +01:00