Skip to content
This repository has been archived by the owner on Aug 23, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release-1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dalers
dalers committed Nov 16, 2012
2 parents 4d309be + 4b49fac commit 443eacc
Show file tree
Hide file tree
Showing 23 changed files with 1,756 additions and 529 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
achievotmp/
documents/
2 changes: 1 addition & 1 deletion .htaccess
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Achievo .htaccess file
## More info see: http://www.ibuildings.nl/wiki/Achievo/Howto/Developers/Speed_up_Achievo
## More info see: https://github.com/atkphpframework/achievo/wiki/Performance-Tuning

############################################
## uncomment these lines for CGI mode
Expand Down
1 change: 0 additions & 1 deletion README
View file

This file was deleted.

98 changes: 95 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,100 @@
Achievo
=======
Achievo is a web-based Business Support Services (BSS) application for organizations, built using [the ATK Framework](https://www.github.com/atkphpframework/atk). Achievo includes a rich set of core modules, including support for employees, projects (phases and activities), timesheets, organizations, contacts, CRM (customers, campaings and contracts), and document management. There are a wide variety of Add-on modules available for additional functionality, and you can add or develop Custom modules for more more specific requirements. Achievo is stable and suitable for production. For more information, see the [Achievo GitHub project wiki](https://github.com/atkphpframework/achievo/wiki) and the [Achievo website](http://www.achievo.org).

Achievo is a fully-featured resource management application for organizations, based on the ATK Framework. Achievo includes a rich set of core modules, providing support for employees, projects (phases and activities), timesheets, organizations, contacts, CRM, document management and more. External modules are supported for adding new functionality.
The purpose of the [Achievo project on GitHub](https://www.github.com/atkphpframework/achievo) is to create, as a community, the leading rapid-development environment for providing enterprise Business Support Services. Achievo was created by [ibuildings.nl](http://www.ibuildings.nl) and development is now carried on by the Achievo community, managed by the [GitHub atkphpframework group](https://www.github.com/atkphpframework/), with the endorsement and permission of [ibuildings.nl](http://www.ibuildings.nl).

Achievo is licensed under the terms of the GNU GPL v2.
* Achievo is licensed under the terms of the GNU GPL v2. See the doc/COPYRIGHT and DOC/LICENSE files, and the [License page in the Achievo project wiki](https://github.com/atkphpframework/achievo/wiki/License) for more information.

* Achievo is a trademark of ibuildings.nl. See the [Achievo Trademark and Logo Policy](https://github.com/atkphpframework/achievo/wiki/Trademark-and-Logo-Policy) for more information.

To Get Started
==============
Achievo can be hosted on a standard web application AMP stack (Apache/MySQL/PHP), and is compatible with current AMP stack versions (e.g. PHP 5.4.x and MySQL 5.5.x, although currently Achievo makes use of some deprecated PHP features).

The most convenient way to get started is to clone the [Achievo GitHub repository](https://github.com/atkphpframework/achievo) to your webserver.

<code>
$ git clone --recurse-submodules git://github.com/atkphpframework/achievo.git achievo
</code>

After cloning, the local master branch in the repo will contain the most recent release. Achievo is built using the ATK Framework and includes ATK as a submodule; the --recurse-submodules option tells Git to update the ATK submodule during the cloning, otherwise the atk/ directory will be empty and you will have to update submodules manually). You do not need a GitHub account to clone using the "git:" protocol.

You can also download a zip archive of the [Achievo master branch](https://github.com/atkphpframework/achievo) and extract it to your webserver. However, in this case you will also need to download a zip archive of version 6.4.4 of the ATK Framework and extract it to your achievo/atk/ directory (currently from https://github.com/dalers/atk-6.4.4, although this will eventually change to the GitHub [ATK Framework project](https://github.com/atkphpframework/atk).

Once you have Achievo on your server or workstation, review the doc/INSTALL and doc/README files. These should explain everything you need to complete the install. Also review the [Guided Tour](http://github.com/atkphpframework/achievo/wiki/Achievo-guided-tour) on the Achievo project wiki, which is a step-by-step tutorial for configuring a new Achievo installation and using Achievo's basic features.

Version Control and Issue Tracking
==================================
* [Achievo GitHub project canonical repository](https://github.com/atkphpframework/achievo)
* [Achievo GitHub project issue tracker](https://github.com/atkphpframework/achievo/issues)
* There is also the [ibuildings legacy Achievo and ATK bug tracker](http://bugzilla.achievo.org/query.cgi) for searching historical issues prior to Achievo 1.4.5 (if you find an issue here that applies to current development, please copy the pertinent details into a new GitHub issue and include a reference to the Bugzilla entry).

Communication Channels
======================
Achievo users and developers discuss problems and solutions, keep each other informed, and generally help each other out, on the [Achievo/ATK forum](http://forum.achievo.org/). Please consider creating a free user profile on the forum; you will need a user profile to post or reply, (viewing does not require a profile), having a profile also enables you to be sent an email notice when someone replies to one of your posts (or creates a new post), and color-codes posts to show the ones you haven't read yet.

If you create a new forum topic, be careful to submit it to the Achivo forum (generally use the ATK forum only when you are developing an Achievo module and you have a low-level issue relating to the ATK Framework).

Developer Guidelines
====================
The Achievo project follows the Gitflow workflow using the Gitflow Fork & Pull model:
* Fork the GitHub atkphpframework/achievo repo
* Clone your fork locally
* Create a local topic branch to work in (typically off a release branch or the develop branch)
* Develop and test your work
* Push your topic branch to your GitHub clone
* Issue a pull request to the atkframework group to have your changes integrated, indicating where your changes are to be merged (typically into either a release branch - as a maintenance release - or into the develop branch)

For more information, see [Developer Guidelines](https://github.com/atkphpframework/achievo/wiki/Developer-Guidelines) in the [GitHub Achievo project wiki](https://github.com/atkphpframework/achievo/wiki).

Repository Structure
--------------------
The Achievo project on GitHub was migrated from the ibuildings Subversion server at Achievo version 1.4.5. The current master branch branch essentially starts with the 1.4.5 release and includes 1.4.5 and later releases, and the develop branch also starts with the 1.4.5 release.

The svn-master branch includes some commits made after the 1.4.5 release, which can be reviewed for merging or cherry picking into the develop (or other branch).

<==== ibuildings svn repository ====================================>
br1 ... brn trunk
| | |
| | |
<==== GitHub atkphpframework/achievo repository ====================>
| | |
svn-br1 ... svn-brn svn-master release-1.4 master develop
| | |
tag release_1_4_5-->| | |
|-------->1.4.5 |
| |------>|
| | |
|-------->1.4.6 |
| |------>|
| | |
V V V

Documentation
=============
Official project documentation (although still somewhat sparse) is in the [Achievo GitHub project wiki](https://github.com/atkphpframework/achievo/wiki/), with valuable discussion topics in the [Achievo/ATK forum](http://forum.achievo.org/). The [Achievo website](http://www.achievo.org/) and [ATK Framework website](http://www.atk-framework.com/) are also valuable resources, as is the [ibuildings Achievo/ATK wiki](http://www.achievo.org/wiki/) (but may not be current, updated articles are published on the [Achievo GitHub project wiki](https://github.com/atkphpframework/achievo/wiki/)). The ATK Framework (used by Achievo) is documented internally with PHPDoc comments, and the [ATK Framework API documentation](http://www.atk-framework.com/documentation/) can also be browsed on the [ATK Framework website](http://www.atk-framework.com/).

* [Achievo GitHub project wiki](https://github.com/atkphpframework/achievo/wiki/)
* [Achievo/ATK forum](http://forum.achievo.org/)
* [Achievo website](http://www.achievo.org/)
* [ATK Framework website](http://www.atk-framework.com/)
* [ibuildings Achievo/ATK wiki](http://www.achievo.org/wiki/)

Support
=======
In the event you have a problem:

* Review Achievo behavior using an un-modified Achievo installation.
* Search the [Achievo GitHub project wiki](https://github.com/atkphpframework/achievo/wiki/) and the [ibuildings Achievo/ATK wiki](http://www.achievo.org/wiki/).
* Search the [Achievo/ATK forum](http://forum.achievo.org/).
* Search the [Achievo GitHub project Issues](https://github.com/atkphpframework/achievo/issues) and [ibuildings legacy bug tracker](http://bugzilla.achievo.org/query.cgi).
* Post a question to the [Achievo/ATK forum](http://forum.achievo.org/) (free account sign-up is required for posting).

To get the most informed response when posting to the forum try to include:

* What are you trying to achieve?
* What are the symptoms of your problem? Why do you think there *is* a problem?
* What is your server (OS, web server, PHP and MySQL)? E.g. FreeBSD 9.1, Apache 2.2.22, PHP 5.3.10 and MySQL 5.5.20.
* Include example code (the *simplest* code that demonstrates the symptoms).

For more information, see http://www.achievo.org
2 changes: 1 addition & 1 deletion atk
Submodule atk updated from ce0274 to 5ff824
163 changes: 45 additions & 118 deletions config.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,31 @@
//
// Change this file to fit your needs before using Achievo.
//

// This file should be used for global configurations. Module-specific
// configurations should be placed in configs/modulename.inc.php files
//

// -------------------------------------------
// DATABASE CONFIGURATION
// -------------------------------------------

// The database to use. Default is mysqli.
// mysql is currently the only officially supported database.
// Experimental: If you want to use PostgreSQL, change this value to
// "pgsql". For Oracle, use "oci8".
// MySQL is the only officially supported DBMS with the mysqli driver
// (the mysql driver is also provided). PostgreSQL (pgsql) and Oracle
// (oci8) drivers are also provided, but are not officially supported.
//
// $config_db["default"]["host"] = "localhost";
// $config_db["default"]["db"] = "dbname";
// $config_db["default"]["user"] = "username";
// $config_db["default"]["password"] = "password";
// $config_db["default"]["charset"] = "utf8";
// $config_db["default"]["collate"] = "utf8_general_ci";

// system database
$config_db["default"]["driver"] = "mysqli";



// The database configuration. Specify the hostname of the database server,
// the database to use and the user/password.
//
$config_db["default"]["host"] = "localhost";
$config_db["default"]["db"] = "achievo_1_4";
$config_db["default"]["user"] = "demo";
$config_db["default"]["password"] = "demo";
$config_db["default"]["db"] = "achievo";
$config_db["default"]["user"] = "achievo";
$config_db["default"]["password"] = "achievo";
$config_db["default"]["charset"] = "utf8";
$config_db["default"]["collate"] = "utf8_general_ci";

Expand Down Expand Up @@ -52,13 +56,11 @@
// is 'achievo_modern'
$config_menu_layout = "modern";

// This variable determines wether all manytoone dropdowns should have
// the autocompletion feature (instead of dropdowns)
// This variable determines whether all manytoone dropdowns should have
// the auto-completion feature (instead of dropdowns)
//
$config_manytoone_autocomplete_default = false;



// -------------------------------------------
// SECURITY CONFIGURATION
// -------------------------------------------
Expand Down Expand Up @@ -99,13 +101,13 @@
//
$config_auth_dropdown = false;

// As an extra security measure, to prevent session highjacking, Achievo
// As an extra security measure to prevent session highjacking, Achievo
// will regenerate it's session id on each hit. This does not work
// properly on some (usually older) PHP installations. If you experience
// login trouble, set the next value to false.
//
$config_session_regenerate = false;


// -------------------------------------------
// MAIL CONFIGURATION
// -------------------------------------------
Expand All @@ -120,115 +122,53 @@
//
$config_mail_sender = "achievo";


// -------------------------------------------
// TIME REGISTRATION
// -------------------------------------------

// The number of projects/phases to show in the 'recent projects/phases'
// dropdown. Note: The more you specify here, the slower time registration
// and planning gets (due to some javascript issues).
//
$config_numberofrecentprojects = 10;

// The ammount of time that a user can book on a day before it is
// considered overtime. (visualization only, true overtime is
// calculated based on employee contracts.)
//
$config_overtimethreshold = 480;

// Default view in time registration. Can be "week" or "day"
//
$config_timereg_defaultview = "day";

// Number of lines of the 'remark' field for time entry. Defaults to a
// single line. (Regardless of this setting, the actual amount of text
// that can be entered is unlimited.)
$config_timereg_remark_lines = 1;

// Allow registration of time in the future. By default, this is false, so
// only time actually spent can be registered.
$config_timereg_allowfuture = false;

// Resolution for time registration. By default, time can be registered in
// steps of 15 minutes. You can increase or decrease this.
// You can specify a resolution in minutes or in hours.
// Examples: 1m, 5m, 10m, 20m, 30m, 1h, 2h etc.
//
$config_timereg_resolution = "15m";

// This variable indicates whether the user may directly register
// time on each day in a week when he is in weekview.
// If set to false, the user must first go to the dayview of a day,
// before he may register time.
//
$config_timereg_week_bookable = true;

// This variable indicates wheter users may lock their time
// registration for weeks in which they have not entered
// all hours.
//
$config_timereg_incompleteweeklock = false;

// The next value indicates how many weeks back the timereg_check cron
// script searches for incomplete time registrations.
//
$config_timereg_checkweeks = 5;

// The next value indicates if a fake startingpoint should be used by
// the overtime_balance node if no balance-records can be found to
// determine a new balance record. Possible values:
// String date: a date in the format YYYY-MM-DD.
// boolean true: the date is set to the 31st of dec of the former year.
// boolean false: no startingpoint is used.
//
$config_timereg_overtime_balance_use_startingpoint = false;


// -------------------------------------------
// PROJECT MODULE
// -------------------------------------------
// This variable indicated whether contacts in the project module are
// obligatory
// This variable indicates whether contacts in the project module
// are obligatory
//
$config_project_contact_obligatory = false;

// Use autocompletion for project selection?
// Use auto-completion for project selection?
//
$config_project_selection_autocomplete = false;

// Fill this config with a path relative to the achievo directory.
// When you add a project the skel will be copied to the destionation directory
// also a path relative to the achievo directory. And sends a mail when the skel
// Fill this config with a path relative to the achievo directory. When you
// add a project, the skel will be copied to the destination directory (also
// relative to the achievo directory), and an email will be sent when the skel
// is copied.
// To disable this feature leave the dir_skel and dir_destination configs empty.
//
// To disable this feature, leave the dir_skel and dir_destination configs empty.
// See also atk/utils/class.atkfileutils.inc function atkCopyDirRec
//
$config_project_dir_skel = '';
$config_project_dir_destination = '';

// You can specify which field of the project node you want to use for the
// directoryname.
//
$config_project_dir_name_template = '[abbreviation]';
$config_project_formatmail = 'html';
$config_project_sendto = 'sendto@domein.nl';

// -------------------------------------------
// PIM MODULE
// -------------------------------------------
// If you don't want a pim, set an URL in the config below to let PIM
// redirect to the specified url. If not set or empty this feature is
// If you don't want a PIM, set a URL in the config below to let PIM
// redirect to the specified URL. If not set or empty, this feature is
// disabled.
//
$config_pim_redirect_to = "";



// -------------------------------------------
// DOCMANAGER MODULE
// -------------------------------------------
// If you a docmanager to other nodes add the node and file location here
// To add docmanager to other nodes, add the node and file location here
$config_docmanageroptions = array(
"project.project"=>array("dir"=>"./documents/project/", "url"=>"documents/project/"),
"quotation.quotation"=>array("dir"=>"./documents/quotations/", "url"=>"documents/quotations/"),
);

"project.project"=>array("dir"=>"./documents/project/", "url"=>"documents/project/"),
"quotation.quotation"=>array("dir"=>"./documents/quotations/", "url"=>"documents/quotations/"),
);

// -------------------------------------------
// GENERAL SETTINGS
Expand All @@ -238,35 +178,22 @@
// 0 = sunday
// 1 = monday (ISO)
// 3 = wednesday
//
$config_startday = 1;

// First week contains has 3 valid options
// 1 = Starts on 1 january
// 4 = First week with 4 days (ISO)
// 7 = First full week
$config_firstweekcontains = 4;


// -------------------------------------------
// EXTERNAL MODULES
// -------------------------------------------

// Use the module function if you want to use Achievo modules.
// Specify the module name as first parameter, and the path where
// it can be found as the second parameter.
//
// module("somemodule","../achievo_modules/somemodule/");

$config_firstweekcontains = 4;

// -------------------------------------------
// END OF CONFIGURATION
// -------------------------------------------

// Leave this line in place, it configures the backend of Achievo.
// Also, you should not change the atkconf.inc file, since that would
// break Achievo.
// Leave this line in place, it configures the ATK backend. Also,
// do not edit the atkconf.inc file since that would break Achievo.
//

include "atkconf.inc";

?>
Loading

0 comments on commit 443eacc

Please sign in to comment.