Eric
4ceccb3c41
Add setup.css for initial setup
2021-02-10 09:01:03 +01:00
Molkobain
e48d257b00
Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design
...
# Conflicts:
# application/ajaxwebpage.class.inc.php
# application/csvpage.class.inc.php
# application/displayblock.class.inc.php
# application/itopwebpage.class.inc.php
# application/utils.inc.php
# application/webpage.class.inc.php
# application/xmlpage.class.inc.php
# datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
# datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
# datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# js/components/breadcrumbs.js
# pages/navigator.php
# test/core/DBSearchTest.php
2020-10-07 11:36:15 +02:00
Pierre Goiffon
7d26b6092e
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# .idea/codeStyles/codeStyleConfig.xml
# .idea/inspectionProfiles/Combodo.xml
2020-10-06 10:42:55 +02:00
Pierre Goiffon
7c3659d5ba
🔧 Remove versionned PHPStorm files
...
Those files were duplicates of the .editorconfig file
.editorconfig was pushed with ecd8f40c0f for 2.7.0 and should be the only source of the IDE / editor configuration
This generic format is implemented in PHPStorm since v2019.2 (see https://blog.jetbrains.com/idea/2019/06/managing-code-style-on-a-directory-level-with-editorconfig/ )
To check if your IDE / editor supports it, check https://editorconfig.org/
2020-09-18 18:26:31 +02:00
Molkobain
c5b8d3fa72
Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design
...
# Conflicts:
# application/datamodel.application.xml
# application/itopwebpage.class.inc.php
# css/light-grey.scss
2020-08-19 10:20:37 +02:00
odain
a35b2d83b7
Cancel functionnal changes to make sure they are ok in next release (develop/2.8) first
2020-08-07 15:17:24 +02:00
odain
8902d6e532
CI migration/automation + new test to ease iTop release management
...
- new Jenkinsfile and .jenkins removal to launch phpunit/behat tests
triggered on both iTop build and push.
- N°3053 - Check XML conversion methods
- N°3057 - New build recipe
- N°3059 - Automatically set the documentation URLs
- N°3052 - Check community modules XML version against latest version
- N°3054 - Check community modules version against major version
- N°3062 - setup.css file integrity test
- N°3060 - Check consistency between the list of modules and installation.xml
- Add exclusion group for CI
- N°3061 - Automatically check the installation.xml consistency
2020-08-07 14:48:51 +02:00
Pierre Goiffon
cc708f6ccc
🙈 Add temp ignore rules
2020-07-28 11:03:59 +02:00
Molkobain
6f9565d979
Remove duplicated entries from .gitignore
2020-07-27 15:09:32 +02:00
Molkobain
a88df33167
Add SASS converter cache to .gitignore
2020-07-27 15:09:32 +02:00
bruno DA SILVA
a53ce32e54
N°3062 - setup.css file integrity test
...
this is for the task : "Generate setup.css at build time"
2020-07-22 17:09:51 +02:00
Pierre Goiffon
0d1059a8fc
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# application/utils.inc.php
# conf/web.config
# datamodels/2.x/itop-backup/ajax.backup.php
# datamodels/2.x/itop-backup/status.php
2020-05-18 09:24:46 +02:00
Pierre Goiffon
228a945da9
N°2984 Security hardening
2020-05-14 11:26:35 +02:00
bruno DA SILVA
c2589492d9
📝 documentation generator dependencies handling improvement
...
- ignore /.doc/vendor
- uses a lock file (at /.doc/composer.lock)
2020-01-31 17:29:38 +01:00
Pierre Goiffon
ad821e7d9c
N°2651 rollback gitignore for lib tests dirs
...
Too dangerous ! We'll work properly on this but for 2.8
2020-01-10 15:23:15 +01:00
Pierre Goiffon
0d231d9b94
N°2651 Remove lib test files from index
2019-12-20 17:07:20 +01:00
Pierre Goiffon
c75e6960a7
N°2651 Remove lib test files from index
2019-12-20 11:57:18 +01:00
Pierre Goiffon
34d4f6b1f9
N°2240 add /.maintenance in ignore
2019-07-30 08:59:52 +02:00
Pierre Goiffon
991bc359cb
Merge remote-tracking branch 'origin/master' into develop
2019-05-23 10:52:34 +02:00
OИUЯd da silva
9c75cb4537
:note: PhpDoc generation for the public API ( #63 )
...
- generate phpdoc to a dokuwiki compatible format
- add/update the phpdoc of a selection of class methods
2019-05-21 12:05:52 +02:00
Lars Hippler
cb7c382b99
Secure the server: prevent the users from browsing/getting files from the conf directories.
...
With Apache, it is still a must to enable htaccess with the spec "AllowOverride All". The index.php files are here to prevent from browsing whatever the HTTP server config.
2019-03-15 14:32:43 +01:00
Pierre Goiffon
24aca83de4
Merge remote-tracking branch 'origin/support/2.5'
2019-03-04 09:16:53 +01:00
Pierre Goiffon
3de7aa1ada
🙈 Update ignore file
2019-03-04 09:15:38 +01:00
Pierre Goiffon
79200e8f96
🙈 Update gitignore to handle toolkit symlinks
2018-12-07 11:13:51 +01:00
Molkobain
1973f7526e
Update .gitignore to match the one from develop
2018-10-02 10:48:32 +02:00
Pierre Goiffon
1fc261937f
Add toolkit to gitignore
2018-09-25 14:52:38 +02:00
bruno DA SILVA
8004b411da
gitignore
...
- add the test's vendor dir
2018-09-05 10:11:09 +02:00
Molkobain
c74d9bbafb
Add .gitignore
2018-09-03 15:51:43 +02:00
Pierre Goiffon
894eeef140
ignore : add extensions
2018-09-03 15:10:51 +02:00
bruno DA SILVA
7991069282
.gitignore completion
...
- cache
- logs
- composer's vendor dir
2018-09-03 12:13:57 +02:00
Pierre Goiffon
fc0e5ecd3b
Ignore : add other shared files in index
2018-08-31 17:46:12 +02:00
Pierre Goiffon
8897d9f82b
ignore : add other shared idea files in index
2018-08-31 17:36:52 +02:00
Denis Flaven
55fad3a9ec
Added .project files to ignore.
2018-08-30 15:32:41 +02:00
Pierre Goiffon
13855b1501
Add .gitignore and README
2018-08-30 11:04:23 +02:00