inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-26 17:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,076 Commits 104 Branches 53 Tags
Commit Graph

2076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bogdan Cilibiu
2b8b856977 Merge branch 'pionnegru-tidyup' of https://github.com/Alfresco/alfresco-content-app into pionnegru-tidyup 2017-10-27 10:40:05 +03:00
Bogdan Cilibiu
d10a616774 Merge branch 'master' of https://github.com/Alfresco/alfresco-content-app into pionnegru-tidyup 
# Conflicts:
#	src/app/components/libraries/libraries.component.html
#	src/app/components/recent-files/recent-files.component.html
 2017-10-27 10:39:48 +03:00
Adina Parpalita
9468fc3336 Merge pull request #17 from Alfresco/pionnegru-934-935 
Empty states - correct text reference
 2017-10-27 10:34:01 +03:00
Bogdan Cilibiu
de223fbb68 correct text reference 2017-10-27 09:22:16 +03:00
Cilibiu Bogdan
0c3d280121 Merge branch 'master' into pionnegru-tidyup 2017-10-26 08:34:47 +03:00
Adina Parpalita
7533c875e9 Merge pull request #16 from Alfresco/pionnegru-e2e-reporters 
e2e reporters
 2017-10-25 23:23:27 +03:00
Cilibiu Bogdan
25a9f92c10 junit reporter prefix 2017-10-25 17:43:50 +03:00
Bogdan Cilibiu
0b27836d6a run all tests 2017-10-25 11:47:54 +03:00
Bogdan Cilibiu
e2a0ce84d5 e2e reporters 2017-10-25 11:46:30 +03:00
Bogdan Cilibiu
65a509a7ae tidyup 2017-10-25 00:42:14 +03:00
Denys Vuika
dd5e9277ff remove language selector and docs 2017-10-24 21:56:56 +01:00
Denys Vuika
e59cc227d1 documentation updates 2017-10-24 21:06:34 +01:00
Denys Vuika
5879db3fe7 remove changelog link from docs for now 2017-10-24 20:03:59 +01:00
Denys Vuika
7a6b4376d6 documentation settings 2017-10-24 20:02:12 +01:00
Cilibiu Bogdan
00783139f2 Merge pull request #13 from Alfresco/denys-proxy-settings 
proxy settings for basic auth
 2017-10-24 22:00:44 +03:00
Cilibiu Bogdan
825052077b Merge branch 'master' into denys-proxy-settings 2017-10-24 21:32:56 +03:00
Cilibiu Bogdan
568949be6d Merge pull request #14 from Alfresco/denys-language-picker 
integrate language picker
 2017-10-24 21:31:58 +03:00
Denys Vuika
133e972dc7 integrate language picker 2017-10-24 18:56:35 +01:00
Denys Vuika
4f30ee0700 proxy settings for basic auth 2017-10-24 17:05:57 +01:00
Denys Vuika
1b0947e704 ITALIAN, JAPANESE,NORWEGIAN updated files based on EN 2017-10-24 (#12) 2017-10-24 16:44:42 +01:00
Cilibiu Bogdan
b501f01177 [ACA-249] routing generic error (#9) 
* generic error

* rename folder and files
 2017-10-24 16:10:21 +01:00
Cilibiu Bogdan
5269e68db8 mat over md prefix (#11) 2017-10-24 15:41:16 +01:00
Cilibiu Bogdan
709a13e483 mat over md prefix (#10) 2017-10-24 09:22:28 +01:00
Cilibiu Bogdan
0f14e2fde3 Merge pull request #8 from Alfresco/dev-denys-SFSNG-939 
Upgrade to ADF 1.10.0-beta3
 2017-10-23 18:13:26 +03:00
Denys Vuika
f4035887b6 fix unit tests 2017-10-23 15:51:49 +01:00
Denys Vuika
e2e473e71b udpate unit tests 2017-10-23 15:41:50 +01:00
Denys Vuika
b922ca8d40 upgrade ADF to 1.10.0-beta3 2017-10-23 15:20:31 +01:00
Cilibiu Bogdan
df07ad48fd make navigation work with routerLinkActive (#7) 2017-10-21 11:52:40 +01:00
Denys Vuika
16eda621b6 Merge pull request #6 from Alfresco/pionnegru-shared-translation 
[ACA] Shared - empty state translation
 2017-10-21 09:40:07 +01:00
Bogdan Cilibiu
293ebb7265 shared empty state translation 2017-10-21 07:22:17 +03:00
Denys Vuika
93516809de Merge pull request #4 from Alfresco/sdirla-undo-move-unit-test 
[SFSNG-924] Undo Move - unit tests
 2017-10-20 19:08:25 +01:00
Denys Vuika
dd776c8dad Merge branch 'master' into sdirla-undo-move-unit-test 2017-10-20 18:56:53 +01:00
Denys Vuika
65f60a0f6b Merge branch 'master' of https://github.com/Alfresco/alfresco-content-app 2017-10-20 16:14:27 +01:00
Denys Vuika
dfe398c468 remove duplicate module 2017-10-20 16:14:24 +01:00
Denys Vuika
6275d138dc Merge pull request #2 from Alfresco/pionnegru-empty-state 
[ACA] Folder - empty state
 2017-10-20 15:57:55 +01:00
Denys Vuika
acc2166ee3 Merge pull request #5 from Alfresco/pionnegru-e2e-app-locator 
[ACA] E2E - application root locator
 2017-10-20 15:56:14 +01:00
Bogdan Cilibiu
70af159e6a app locator for e2e 2017-10-20 15:16:11 +03:00
Denys Vuika
a257a56b19 Merge branch 'master' into sdirla-undo-move-unit-test 2017-10-20 12:21:49 +01:00
Denys Vuika
1107e0a303 Merge branch 'master' into pionnegru-empty-state 2017-10-20 12:21:41 +01:00
Denys Vuika
5dda693c58 minimal docs setup 2017-10-20 12:20:09 +01:00
Denys Vuika
3b3f39ac38 Merge branch 'master' into sdirla-undo-move-unit-test 2017-10-20 12:15:44 +01:00
Denys Vuika
0f2cda6781 Merge branch 'master' into pionnegru-empty-state 2017-10-20 12:15:35 +01:00
Denys Vuika
f3078d6718 AoT fixes 2017-10-20 12:12:52 +01:00
suzanadirla
6031c9116e Merge branch 'master' into sdirla-undo-move-unit-test 2017-10-20 12:24:31 +03:00
Denys Vuika
0c6d930188 Merge branch 'master' into pionnegru-empty-state 2017-10-20 10:24:05 +01:00
Denys Vuika
d17f92e199 Merge pull request #3 from Alfresco/pionnegru-remove-build-number 
[ACA] Remove build number from UI
 2017-10-20 10:04:35 +01:00
suzana_dirla
454ca7e696 [SFSNG-924] add unit tests for undo move 2017-10-20 09:52:12 +03:00
Bogdan Cilibiu
46b9f124e9 remove build number 2017-10-20 00:30:58 +03:00
Cilibiu Bogdan
a83069ad71 Merge branch 'master' into pionnegru-empty-state 2017-10-20 00:16:13 +03:00
Denys Vuika
1a5bce4692 use hash with navigation 2017-10-19 22:04:27 +01:00