hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,585 Commits 268 Branches 107 Tags
e48b5b540f5b9d52eefcf98b957eb86fd5c85aa7
Commit Graph

7585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
e48b5b540f Update treeview.css 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
93e17c2752 Refactor admin javascript to backbone application 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
79cf2b7241 Add subscriber manager 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
3207f24f80 Remove getters & setters 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
c7962531fa Add jquery.treeview, jquery.tooltip as dependency trought bower 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
ef5b3fadb7 WSConnection is not a singleton anymore 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
5216e8fc9c Remove unnecessary dependencies 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
133e5f3d19 Add application to admin 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
3a5e309dee Rename task option from configuration to status 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
7c0f7c4411 Fix init 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
947545620a Use new WS Connection object in task Manager App 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
1d8c0e86cf Add WS Connection object 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
0a2d4fe04d Bind task manager backbone app to websocket using autobahn 2014-03-05 15:33:21 +01:00
Romain Neutron
d3bf3f747e Fix unit tests 2014-03-05 15:27:24 +01:00
Romain Neutron
92b1ee1b52 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2014-03-05 15:00:05 +01:00
Romain Neutron
e3fbe08890 Merge branch '3.8' 
Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-05 14:59:41 +01:00
Romain Neutron
49f1de8fe4 Revert changes in tests 2014-03-05 14:57:20 +01:00
Romain Neutron
b8654fdb43 Merge pull request #1016 from nlegoff/log-user-query 
[Ready][3.9] Use user manipulator to log user query
 2014-03-05 12:28:54 +01:00
Romain Neutron
f9174caab3 Merge branch '3.8' 
Conflicts:
	lib/classes/system/server.php
	tests/classes/system/serverTest.php
 2014-03-05 12:23:27 +01:00
Romain Neutron
1823e4be5b Remove verbosity 2014-03-05 12:22:42 +01:00
Nicolas Le Goff
c7810502a5 Merge pull request #1025 from romainneutron/master-cleanup 
[Ready][3.9] Remove unused functions
 2014-03-05 11:51:07 +01:00
Nicolas Le Goff
3e7a36cff3 Merge pull request #1024 from romainneutron/3.8-cleanup 
[Ready][3.8] Remove unused files
 2014-03-05 11:49:33 +01:00
Romain Neutron
0e7c6d821a Merge pull request #1022 from romainneutron/elastic-search-1.0 
[3.9] Add compatibility with elasticsearch 1.0
 2014-03-05 11:07:35 +01:00
Romain Neutron
8e80271a51 Merge branch '3.8' 
Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-05 11:06:48 +01:00
Romain Neutron
ea4a309005 Merge pull request #1023 from romainneutron/tests-exception-handler 
[3.8] Reset exception handler in tests setup
 2014-03-05 11:05:09 +01:00
Romain Neutron
e8ec3801e8 Remove unused files 2014-03-05 02:58:52 +01:00
Romain Neutron
b48d95d6a5 Remove unused functions 2014-03-05 02:45:10 +01:00
Romain Neutron
f0ca05e720 Remove unused files 2014-03-05 02:41:06 +01:00
Romain Neutron
82bd617477 Add compatibility with elasticsearch 1 2014-03-05 02:19:18 +01:00
Romain Neutron
297a08492a Reset exception handler in tests setup 2014-03-05 02:18:18 +01:00
Romain Neutron
024b5353b1 Merge branch '3.8' 
Conflicts:
	lib/classes/Feed/Collection.php
	tests/classes/Feed/Feed_CollectionTest.php
 2014-03-05 00:42:14 +01:00
Romain Neutron
7b59e2272f Merge pull request #1018 from nlegoff/twigify-html 
[3.9] Twigify thesaurus presets rendering
 2014-03-05 00:09:20 +01:00
Nicolas Le Goff
1d8b6edc46 Use user manipulator to log user query 2014-03-04 19:53:07 +01:00
Romain Neutron
975e8bd3c5 Merge pull request #1010 from nlegoff/fix-homepage-feed 
[Ready][3.8] Fix #1606 & #1712 Homepage does not display when deleting a feed
 2014-03-04 18:26:34 +01:00
Nicolas Le Goff
3e46657d7c Twigify thesaurus presets rendering 2014-03-04 18:25:48 +01:00
Romain Neutron
91057a9dcc Merge pull request #1013 from nlegoff/fix-upload-img-overflow 
[Ready][3.8] Fix canva overflow for thumbnail preview
 2014-03-04 18:25:46 +01:00
Romain Neutron
9e14ecb858 Merge pull request #1014 from nlegoff/fix-tinymce-build 
[Ready][3.9] Fix tinymce build
 2014-03-04 18:25:31 +01:00
Nicolas Le Goff
40347cee45 Merge pull request #1015 from romainneutron/fix-typo 
[3.9] Fix typo
 2014-03-04 17:36:27 +01:00
Romain Neutron
32534f7871 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
	tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-04 15:54:58 +01:00
Romain Neutron
c48b20edb7 Fix tests 2014-03-04 15:53:34 +01:00
Romain Neutron
8d2009cfef Add error reporting setting 
Conflicts:
	tests/classes/PhraseanetTestCase.php
 2014-03-04 15:40:33 +01:00
Nicolas Le Goff
05d982767b Fix tinymce build 2014-03-04 14:57:10 +01:00
Romain Neutron
4d1bd8417e Fix typo 2014-03-04 14:50:50 +01:00
Romain Neutron
2be779f30b Merge pull request #1012 from nlegoff/fix1714 
[Ready][3.8] Fix #1714 First status is not applied on document after upload
 2014-03-04 14:25:04 +01:00
Nicolas Le Goff
1ce11430fe Fix #1606 & #1712 Homepage does not display when deleting a feed 2014-03-04 14:16:26 +01:00
Nicolas Le Goff
e1ab77d4c3 Fix canva overflow for thumbnail preview 2014-03-04 12:24:22 +01:00
Nicolas Le Goff
85176bef9e Fix #1714 First status is not applied on document after upload 2014-03-04 12:11:18 +01:00
Nicolas Le Goff
6c3cdfc52e Merge pull request #1006 from romainneutron/fix-connection-master 
[Ready][3.9] Add reconnectable connection
 2014-03-04 11:19:44 +01:00
Nicolas Le Goff
8ccc1e0607 Merge pull request #1011 from romainneutron/search-engine-tests 
[Ready][3.9] Fix unit tests when running without phrasea2 extension
 2014-03-04 10:57:02 +01:00
Romain Neutron
4695054dcf Fix unit tests when running without phrasea2 extension 2014-03-03 19:26:44 +01:00