Commit Graph

295 Commits

Author SHA1 Message Date
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
f074bce545 Added Controller Abstract for multiple parent classes of controller 2015-04-29 19:36:38 +02:00
5b50adf530 Merge branch 'Issue_#37,_New_Namespaces' into 'master'
Added more documentation and implemented the Logger::backtrace into fatal errors

More documentation and backtrace.

See merge request !14
2015-04-29 19:00:15 +02:00
39d2982cf1 Added more documentation and implemented the Logger::backtrace into fatal errors 2015-04-29 17:49:33 +02:00
f8b98f4c13 Merge branch 'Issue_#37,_New_Namespaces' into 'master'
Issue #34, new namespaces

And a lot more! See commit log for detailed changes.

Fixes #34, #31, parts of #12 and a lot of bugfixes!

See merge request !13
2015-04-29 17:22:09 +02:00
c5318a2e99 Added new namespaces as described in Issue #37. The following namespaces are used:
\FuzeWorks for Core classes
\Controller for controller classes
\Model for model classes
\Module for modules

Also did the following changes:
- DatabaseModel now loads the database module as a dependency
- DatabaseModel is no longer abstract because of ModelServer
- Implemented a new mechanism for model types in the name of a ModelServer. This interface requires a Model Type Server to return a Model parent class based on a given type
- Added a backtrace to the logger class for easy and fast debugging

And that was it for this commit
2015-04-29 17:18:33 +02:00
7a5ac7cfad Fix for #31. Low priority for Sections. 2015-04-29 16:15:50 +02:00
ed8aff38e7 Merge branch 'master' into 'master'
Did the MVC Rewrite. Each component now has events. Fixes #9 , #10 , #20

Fixes and completes the MV rewrite. Besides that it fixes #26 from the pragmatic rewrites.

See merge request !12
2015-04-29 13:50:01 +02:00
156f4a3460 Did the MVC Rewrite. Each component now has events. Fixes #9 , #10 , #20 2015-04-29 13:46:33 +02:00
b644641dbe Merge branch 'master' into 'master'
Sections are now dynamic and modules can now be disabled

Fix for #24 and #29

See merge request !11
2015-04-29 13:01:36 +02:00
54c81f769a Fixed #24. Sections are now dynamic and modules can now be disabled 2015-04-29 12:20:39 +02:00
f6a282d38f Merge branch 'master' into 'master'
Fixes for #23 and #28

Fixes all associated bugs. Might set the project on fire, but I don't care

See merge request !10
2015-04-22 12:26:13 +02:00
ba84fa5cef Messages when a module is already loaded, and loaded modules get correctly registered 2015-04-22 12:16:14 +02:00
e877d103c8 Implemented renewed modloading, so that modules do not get loaded multiple times 2015-04-22 12:11:28 +02:00
8c1a7afda5 Fix for #28 and #23. This patch removes the mod and event registers so that modules can now be loaded dynamicly instead of using a global configuration file. 2015-04-22 11:31:29 +02:00
7809a4efd5 Merge branch 'master' into 'master'
Events for Views and Models

Implemented events to load the correct view and model

Also did some bugfixes

See merge request !9
2015-03-20 13:35:31 +01:00
71547eec26 Bugfix where sections does not load correct viewdir and modeldir. 2015-03-20 11:41:09 +01:00
9b3bf5fc20 Moved Modules to a new directory, makes more sense. Also started adding events for the renewed sections, see #19 and #18 2015-03-20 10:20:30 +01:00