6690 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Art Lowel	b8ee768d0e	Merge pull request #44 from LotteHofstede/w2p-38248_PageNotFound-component ... PageNotFound Component	2017-02-02 16:56:28 +01:00
Lotte Hofstede	48b4f13e3f	Merge branch 'master' into w2p-38248_PageNotFound-component	2017-02-02 16:02:36 +01:00
Art Lowel	1c4e4c96be	Merge pull request #56 from 4Science/package-json ... Script "start:dev" fixed	2017-02-02 15:41:53 +01:00
Matteo Perelli	b2fb8b9741	Script "server:dev" fixed and script "server:dev:watch" added.	2017-02-02 11:51:02 +01:00
Matteo Perelli	7539f87b73	Script "start:dev" fixed	2017-02-01 18:11:42 +01:00
Art Lowel	cd3ebf0c3e	Merge pull request #55 from artlowel/shrinkwrap-optional-deps ... removed optional dependencies from npm-shrinkwrap.json	2017-02-01 16:35:30 +01:00
Art Lowel	8d42e0a80b	removed optional dependencies from npm-shrinkwrap.json to prevent issues with different OS-es	2017-02-01 16:02:43 +01:00
Art Lowel	71ea4f9464	Merge pull request #52 from 4Science/build-error ... postcss script changed	2017-02-01 15:11:35 +01:00
Giuseppe Digilio	7f4f10a77b	postcss script changed	2017-01-31 16:29:25 +01:00
Matteo Perelli	2cdd02dc4d	'pree2e' and 'ci' scripts added	2017-01-31 14:50:11 +01:00
Art Lowel	1ee18808df	Merge pull request #42 from 4Science/Environments ... Environments	2017-01-31 10:52:01 +01:00
Giuseppe	9b6d2b4a3d	Merge branch 'master' into Environments	2017-01-27 19:03:12 +01:00
Giuseppe Digilio	845e921fe7	app.component.ts and app.component.html changed	2017-01-27 18:40:27 +01:00
Giuseppe Digilio	589c9d5822	Default configuration file added	2017-01-27 18:34:24 +01:00
William Welling	65dd17c4c2	Merge pull request #41 from artlowel/npm-shrinkwrap ... generated npm-shrinkwrap.json file	2017-01-25 09:21:02 -06:00
Art Lowel	16b3ba6649	added readme for npm-shrinkwrap	2017-01-25 15:23:38 +01:00
Art Lowel	458a98d94b	added npm script to re-run shrinkwrap and ran it to account for the addtion of deep-freeze in PR #39	2017-01-25 15:15:30 +01:00
Art Lowel	5a2a263327	Merge branch 'master' into npm-shrinkwrap	2017-01-25 15:06:27 +01:00
William Welling	a4ef421a6f	Merge pull request #39 from artlowel/reducer-tests ... Reducer tests	2017-01-25 07:40:23 -06:00
Lotte Hofstede	26c2eae142	38248: updated pagenotfound tests	2017-01-24 08:39:00 +01:00
Lotte Hofstede	494e2c73af	38248: wrote e2e test for pagenotfound component	2017-01-23 12:49:48 +01:00
Lotte Hofstede	16fb1a3794	Merge remote-tracking branch 'artlowel/reducer-tests' into w2p-38248_PageNotFound-component	2017-01-23 11:26:39 +01:00
Giuseppe Digilio	3f484ebf4f	README.md changed	2017-01-20 15:39:23 +01:00
Giuseppe Digilio	0079d6d631	README.md changed	2017-01-20 15:30:41 +01:00
Giuseppe Digilio	2f77c21ed5	Merge branch 'master' of https://github.com/4Science/dspace-angular into Environments ... # Conflicts: # README.md	2017-01-20 15:17:27 +01:00
Giuseppe Digilio	5ada934e67	Add a mechanism to configure environment variables.	2017-01-20 15:08:30 +01:00
Art Lowel	736e10d7d3	generated npm-shrinkwrap.json file	2017-01-18 15:04:37 +01:00
Art Lowel	8fd1c6de5c	added a MockTranslateLoader to fix 404 with ng2-translate during testing	2017-01-18 12:53:09 +01:00
Art Lowel	58b4b381e7	added test for window resize to app.component.spec.ts	2017-01-18 11:27:39 +01:00
Art Lowel	e1d69e0efd	header component tests	2017-01-17 18:50:07 +01:00
Art Lowel	5418e3c8cc	Merge branch 'master' into inital-tests	2017-01-17 15:03:04 +01:00
Art Lowel	4836727009	Merge pull request #38 from wwelling/readme-typo ... Corrected typo for test command	2017-01-17 15:02:27 +01:00
William Welling	7947451dd4	Corrected typo for test command	2017-01-17 07:58:26 -06:00
Art Lowel	f1e443684e	Merge branch 'master' into inital-tests	2017-01-17 14:57:57 +01:00
William Welling	d092f534f7	Merge pull request #33 from artlowel/postcss ... added postcss	2017-01-17 07:57:02 -06:00
Art Lowel	f02bc9bc35	Merge branch 'master' into inital-tests	2017-01-17 14:54:13 +01:00
William Welling	32d00cfbcf	Merge pull request #37 from 4Science/test-issue ... Test issue fix	2017-01-17 07:53:10 -06:00
Art Lowel	562f09a366	turned null actions in to classes	2017-01-17 12:06:32 +01:00
Art Lowel	5e523a5653	Merge remote-tracking branch 'upstream/pr/37' into inital-tests	2017-01-17 11:17:46 +01:00
Art Lowel	37c9b106f2	removed global dependency on postcss-cli	2017-01-17 11:01:21 +01:00
Art Lowel	49bb5a3d78	Merge branch 'master' into postcss	2017-01-17 10:55:44 +01:00
Giuseppe	bd29e4ad65	Delete test-issue.spec.ts	2017-01-16 17:13:45 +01:00
Giuseppe Digilio	3766a4ba85	test issue	2017-01-13 18:39:24 +01:00
Giuseppe Digilio	28fd92b9f7	test issue	2017-01-13 18:37:35 +01:00
Art Lowel	8e4bec9c30	added tests for hostReducer and Header Effects, and switch to typed actions	2017-01-13 11:25:07 +01:00
Art Lowel	dba6dcec63	Merge branch 'master' into inital-tests	2017-01-13 09:27:07 +01:00
Art Lowel	c31a0c927f	Merge pull request #34 from 4Science/testing	2017-01-12 16:31:30 +01:00
Lotte Hofstede	4ddaf450ae	Added missing pagenotfound files	2017-01-12 15:26:03 +01:00
Lotte Hofstede	82a379df3c	38248: Added PageNotFound component	2017-01-12 15:18:15 +01:00
Art Lowel	4b62d964a9	added tests for headerReducer and HeaderActions	2017-01-11 09:40:23 +01:00