Commit Graph

74 Commits

Author SHA1 Message Date
Carsten Brandt
a81482b967 more on bootstrap upgrade 2014-11-04 00:35:57 +01:00
Qiang Xue
1eef5cb33b fixed test break. 2014-10-31 15:22:13 -04:00
Qiang Xue
29f69394ab build break fix. 2014-10-31 15:16:49 -04:00
Qiang Xue
39e5e5d3ed fixed test break due to smarty error. 2014-10-31 15:01:48 -04:00
Qiang Xue
7d31fb597e avoid test break. 2014-10-31 14:44:38 -04:00
Carsten Brandt
664fe08874 updated cebe/markdown to 1.0.0
this commit breaks the apidoc extension. will adjust it afterwards.
2014-10-10 13:21:49 +02:00
Carsten Brandt
c93bbee1d0 adjusted composer.json to follow more stable versioning policy for assets
as discussed before, better do this change before RC to avoid breaking BC in GA.
2014-09-28 00:43:19 +02:00
Carsten Brandt
46488e674a improved version constraints for bower asset packages 2014-09-22 17:34:18 +02:00
Carsten Brandt
e40fd9d623 added branch alias to composer.json 2014-09-22 17:26:21 +02:00
Carsten Brandt
8176a392bb Changed version constratints to be semantic versioning again
- in composer the `~` operator is just a shortcut for `~1.0` = `>=1.0.0,<2.0.0`
  it does not prevent dev versions to be installed but neither does `1.*`
- dev versions are constrolled via `minimum-stability` setting and the
  `@dev`, `@beta`, `@stable`,... settings.
- setting bower packages that ship compiled files only with the stable
  release to use `@stable` in composer.json of the applictaions. This
  setting can be removed when we remove the `minimum-stability=dev`
  setting after GA.
2014-09-22 13:15:43 +02:00
Qiang Xue
889d3bc942 using stable versions. 2014-09-18 23:44:36 -04:00
Qiang Xue
ad4f652ca9 Removed unused bower.json files. Adjusted version dependencies. 2014-09-18 23:25:38 -04:00
Qiang Xue
a81969950d Adjusted dependency versions to stable ones. 2014-09-18 23:09:45 -04:00
Qiang Xue
4a31628b01 Fixes #5089: Added asset debugger panel 2014-09-18 00:07:30 -04:00
Qiang Xue
ecdb41e046 Fixes #5061: Switched to use jquery composer package. 2014-09-17 09:59:44 -04:00
Qiang Xue
c23435973b Fixed composer.json. 2014-09-16 21:23:00 -04:00
Qiang Xue
b6a53e3046 WIP 2014-09-16 13:31:32 -04:00
Carsten Brandt
10dc407a3c implemented markdown parsing for console command description
issue #746
2014-06-25 18:05:29 +02:00
Carsten Brandt
b7e493fca0 Tabs to spaces to be consistent
```
vendor/bin/indent --spaces -r framework/
vendor/bin/indent --tabs -r . --pattern=*.json
vendor/bin/indent --spaces -r . --pattern=*.md
vendor/bin/indent --spaces -r . --pattern=yii.*.js
vendor/bin/indent --spaces -r . --pattern=*.css
```
2014-05-23 16:58:21 +02:00
Carsten Brandt
777f4a28dc added missing suggestion to composer.json
issue #2872
2014-03-24 23:03:07 +01:00
Carsten Brandt
80e9b80078 replace pjax with external resouce via composer
We are now maintaining a fork of pjax:
https://github.com/yiisoft/jquery-pjax
2014-03-05 05:06:37 +01:00
Tobias Munk
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +01:00
Carsten Brandt
3b40d44909 made createQuery() config param optional 2014-02-20 05:54:47 +01:00
Carsten Brandt
aedfef1e79 added tests for smarty and worked around a small bug
fixes #2265
2014-02-20 02:43:06 +01:00
Carsten Brandt
9190e0f4dd Changed markdown library to cebe/markdown
- supports GFM now
- allows defining different flavors

fixes #47
2014-02-18 03:48:31 +01:00
Carsten Brandt
985682c34c typo in composer.json 2014-02-07 15:05:52 +01:00
Carsten Brandt
8ad33449ac added yiisoft/yii2-coding-standards to yii2-dev suggested packages
issue yiisoft/yii2-coding-standards#4
2014-02-07 14:57:50 +01:00
Qiang Xue
3e732a2bd9 fixed test break. 2014-02-04 18:56:55 -05:00
Qiang Xue
42981fabee adjusted required packages for yii2-dev. 2014-02-04 18:41:31 -05:00
Carsten Brandt
1af612ca6f updated composer.json 2014-01-27 11:41:07 +01:00
Carsten Brandt
f112cc633b allow installing jQuery 1.10 for IE support
fixes #1905
2014-01-21 17:54:10 +01:00
Alexander Makarov
c522fffe00 Fixes #1905: Update composer.json to use jQuery 2.0.* 2014-01-12 22:13:23 +04:00
Qiang Xue
0c38655217 psr-4 move 2014-01-10 21:41:43 -05:00
Qiang Xue
da9d544c54 psr-4 change. 2014-01-10 21:06:25 -05:00
Qiang Xue
d9802aacce psr-4 change. 2014-01-10 20:51:49 -05:00
Qiang Xue
4cf356df8d adjust directories for PSR-4. 2014-01-10 20:28:17 -05:00
Carsten Brandt
951791f245 added unit test for twig renderer
verify #1755 works
2014-01-07 17:06:25 +01:00
Carsten Brandt
c9baa5309f updated composer.json 2014-01-06 06:16:17 +01:00
Qiang Xue
8173b16433 added apidoc to composer.json. 2014-01-06 00:13:44 -05:00
Qiang Xue
03a88e4f38 Adjusted composer for faker extension. 2014-01-02 22:47:21 -05:00
Mark
a3071fd90d added faker integration 2014-01-02 23:46:08 +04:00
Qiang Xue
2df7d0a8bd Merge branch '46-image-helper' of github.com:tonydspaniard/yii2 into tonydspaniard-46-image-helper
Conflicts:
	composer.json
2013-12-31 15:33:46 -05:00
Alexander Makarov
90d5e5cfe4 Updated HTMLPurified dependency to 4.6.* 2013-12-31 11:47:34 +01:00
Carsten Brandt
dabeea7a38 testing: do not require php ext in composer.json and use composer phpunit on travis 2013-12-30 20:53:30 +01:00
Alexander Kochetov
32ea48c7ba Actualize phpunit usage approach 2013-12-30 22:34:24 +04:00
Antonio Ramirez
fc28927ddb fix composer.json syntax 2013-12-29 21:55:07 +01:00
Antonio Ramirez
53160797df added tests 2013-12-29 21:43:26 +01:00
Qiang Xue
6eb6e22630 fixed composer.json 2013-12-26 22:22:26 -05:00
Carsten Brandt
382cee156c Made yii2-dev composer.json more lightweight
Do not depend on all packages, suggest them instead. require-dev will still have them for testing.
2013-12-18 00:03:40 +01:00
Carsten Brandt
57277f7415 Merge PR #1393 branch 'yii2-basic-codeception' of https://github.com/Ragazzo/yii2 into Ragazzo-yii2-basic-codeception
* 'yii2-basic-codeception' of https://github.com/Ragazzo/yii2:
  small typo fix
  added readme, changelog, license and composer files.
  added new extension yii2-codeception, modified composer settings
  modified tests according yii2-codeception extension
  added testcase for unit tests, bootstrap files improved, tests inherited from base testcase
  configs fixed and improved
  tests modified, bootstrap added
  colors added
  new entry points for application
  codeception configs, web config modifed for db-settings

Conflicts:
	composer.json
2013-12-16 19:20:37 +01:00