Commit Graph

162 Commits

Author SHA1 Message Date
b422b34146 Merge branch 'master' into 'master'
Fixed critical bug where databases can not be used due to inheritance issue. Please refer later

Fix for #61

Please see further details

See merge request !32
2015-07-26 17:09:09 +02:00
ebd81b9fce Fixed critical bug where databases can not be used due to inheritance issue. Please refer later 2015-07-07 23:11:56 +02:00
b9b236ec22 Merge branch 'master' into 'master'
Fix for #56

Fixes #56 and

See merge request !31
2015-07-07 17:28:50 +02:00
d9001d5f9e Removed Fuze References. Fixes #56 2015-07-07 17:27:46 +02:00
73208b9542 Added the Nginx directives used by the framework 2015-07-07 15:54:01 +02:00
a2ca90432e Merge branch 'master' into 'master'
API implementation

Implemented the API interface plugin

See merge request !30
2015-07-07 14:11:44 +02:00
a688821c65 Implemented the API interface. Can now be used by direct dependency insertion 2015-07-07 14:09:38 +02:00
00eff0480e Prepare for multiple types of Template Engines 2015-07-07 13:59:36 +02:00
3824c25555 Merge branch 'master' into 'master'
Version information and coverage

See merge request !29
2015-05-27 22:04:49 +02:00
4dce5516bb Added version information 2015-05-27 21:57:45 +02:00
67d1e6c295 Removed obsolete coverage report 2015-05-19 20:44:30 +02:00
94015bb664 Merge branch 'master' into 'master'
Fix for namespace clash with sections

As said

See merge request !28
2015-05-17 19:04:33 +02:00
f65635d8cb Fix for namespace clash with sections 2015-05-17 19:03:37 +02:00
dd82ac216f Merge branch 'master' into 'master'
Sections Rewrite

Fixes #54 and #52

See merge request !27
2015-05-17 18:49:00 +02:00
a3007668ba Updated the Sections module to the renewed FuzeWorks standard. Modules are now responsible on their own to handle controller loading.
Fixes #54 and offers a new solution for #52
2015-05-17 18:46:33 +02:00
b86c26243d Misc bug fixes 2015-05-14 17:45:25 +02:00
cda60c264e Removed advanced controller abstract, it's just a wrapper now 2015-05-14 17:45:11 +02:00
bf67daf181 Merge branch 'Issue_#59' into 'master'
Added Joins to the QueryBuilder

Fixes Issue #59

See merge request !26
2015-05-14 13:32:55 +02:00
bdf6b0244c Added Joins to the QueryBuilder 2015-05-14 13:30:40 +02:00
32b534d59a Merge branch 'ffnmaster/core-Renewed_Modules'
Conflicts:
	Core/System/class.core.php
2015-05-14 13:01:03 +02:00
71c9904746 The big great rewrite of modules. Hope it will merge well 2015-05-14 12:43:11 +02:00
51a2d47525 Merge branch 'Issue_#46' into 'master'
QueryBuilder and new Model system

Implemented the new QueryBuilder and Model system.

Please applaud

See merge request !24
2015-05-06 21:42:13 +02:00
26d06947ad Added new QueryTest for the newly made QueryBuilder 2015-05-06 21:38:31 +02:00
aab34844ee Implemented renewed querybuilder and a better databasemodel. Database utilities can from now on be added to this module.
Fixes #46
2015-05-06 21:25:57 +02:00
019ab4f2fa Merge branch 'Issue_#47' into 'master'
Fix for Issue #47

Fix for #47

See merge request !23
2015-05-06 19:53:49 +02:00
c046b0867b Fix for Issue #47 2015-05-06 19:52:52 +02:00
cb2f2d9d97 Merge branch 'Issue_#51' into 'master'
Fix for issue #51. Tighter checks on input

Fixes issue #51.

Better testing for database config

See merge request !22
2015-05-06 18:35:22 +02:00
6e0729be6f Merge branch 'Issue_#55' into 'master'
Fix for #55. Created a better looking 404 error page

Better 404 page

See merge request !21
2015-05-06 18:34:13 +02:00
524ac87f77 Fix for #55. Created a better looking 404 error page 2015-05-06 18:27:53 +02:00
7d732790d2 Fix for issue #51. Tighter checks on input 2015-05-06 18:26:19 +02:00
1171e67223 Merge branch 'master' into 'master'
GF Merge

Better router, logger, removal of several useless files, a lot of pragmatic rewrites.

See merge request !20
2015-05-03 22:54:30 +02:00
dd93772704 Router and Logger merge with GF, and many more CI Tests 2015-05-03 22:50:36 +02:00
b4a574dadf Removed files that are not important to the core 2015-05-03 20:42:50 +02:00
884c421a46 Added regular coverage report 2015-05-03 19:32:22 +02:00
98f2daca42 Finalized regular coverage 2015-05-03 18:57:44 +02:00
18f95e250c Retry with care 2015-05-03 18:53:32 +02:00
44ba75c8d2 Added coverage report in a Gitlab CI compatible format 2015-05-03 18:49:44 +02:00
2345c24f4e Merge branch 'master' into 'master'
Finalized basic continuous integration

It works! That is quite an achievement

See merge request !19
2015-05-03 18:27:06 +02:00
a7204acd0c Replaced zip command with git archive 2015-05-03 18:23:29 +02:00
07f88f1913 Fixed a crucial bug which made it impossible to run continuous integration on FuzeWorks 2015-05-03 18:12:58 +02:00
1d01e44b36 Merge branch 'Issue_#7,_Continuous_Integration' into 'master'
Issue #7, continuous integration

Real work done

See merge request !18
2015-05-01 22:48:02 +02:00
c86822f99b Added multiple tests and started real continuous integration 2015-05-01 22:47:11 +02:00
4b3829612b Merge branch 'master' into 'master'
Removal of FUZEPATH

Glorious day it is

See merge request !17
2015-05-01 20:57:34 +02:00
58f0910f63 Merge branch 'master' into Issue_#7,_Continuous_Integration
Conflicts:
	index.php
2015-05-01 20:56:31 +02:00
630e207efc Removed FUZEPATH and FUZESYSPATH since it actually is pretty stupid 2015-05-01 20:53:23 +02:00
2e571c8324 Updated PHPUnit and APIGen 2015-05-01 20:40:10 +02:00
881dcb0ae5 Fixed a few logging errors 2015-05-01 17:59:40 +02:00
60d0081cb6 Merge branch 'master' into 'master'
Updated the database to a higher standard according to issue #33 and #32

Also moved the NotifierEvent into another file, the event abstract and gave the interpret model a namespace.

See merge request !16
2015-04-30 21:20:53 +02:00
b10561df6d Updated the database to a higher standard according to issue #33 and #32
Also moved the NotifierEvent into another file, the event abstract and gave the interpret model a namespace.
2015-04-30 21:19:07 +02:00
584148e16d Merge branch 'Issue_#37,_New_Namespaces' into 'master'
Added Controller Abstract for multiple parent classes of controller

See title

See merge request !15
2015-04-29 19:37:12 +02:00