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
8,227 Commits 268 Branches 107 Tags
f196155049259e65805a19946e73a3bd4c7f9525
Commit Graph

1303 Commits

Author SHA1 Message Date
Nicolas Le Goff
10421b3819 Refactor mocha tests kickstarter 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
cf2105865b Fix tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
2e40205bc3 Remove deletion of target for tree links 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
218da9a091 Add tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
4f66003425 Fix url path 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
b354b063ee Remove hard code url 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
212c4fdf09 Add sucriberManager Test 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
5d3fd6f987 Add hasCallbacks method 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
ba2a73d8c2 Add squire js to mock require js module 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
5df7c37bf0 Throws exception instead of returning null 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
0299250097 Refactor require.js config 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
1e2cc2692e Replace hasSession by isConnected 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
af526beb41 Remove unused && improve dependencies detection 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
e5106abd0b Load sinon & sinochai from tmp assets 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
1b0aac5963 Bind subscriberManager object to task manager application 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
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
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
8d2009cfef Add error reporting setting 
Conflicts:
	tests/classes/PhraseanetTestCase.php
 2014-03-04 15:40:33 +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
Romain Neutron
46141b3cc6 Add error reporting setting 2014-03-03 17:31:13 +01:00
Romain Neutron
6ba1e61546 Reduce connection overhead 2014-03-03 15:10:39 +01:00
Romain Neutron
c641ab7841 Merge branch '3.8' 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
 2014-02-28 19:37:54 +01:00
Nicolas Le Goff
88f179ae80 Remove prod/bridge/manager hardcoded urls 2014-02-28 13:10:33 +01:00
Nicolas Le Goff
c38c3eaa09 Remove dev dependencies from package tasks 2014-02-27 19:23:59 +01:00
Romain Neutron
c3ec4ab857 Merge pull request #900 from nlegoff/replace_demand 
[3.9] Migrate registration table to doctrine entity && refactor registration API
 2014-02-27 16:08:17 +01:00
Romain Neutron
ce94b80d58 Merge branch '3.8' 
Conflicts:
	lib/conf.d/minifyGroupsConfig.php
	templates/web/overview.html.twig
 2014-02-26 13:17:30 +01:00
Romain Neutron
dd29540578 Update flowplayer version 2014-02-26 12:22:36 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
fe2300e6ca Fix #1639 logs error in mocha phantom js 2014-02-13 12:02:58 +01:00
Nicolas Le Goff
aa0bf78ac9 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
 2014-02-06 17:39:41 +01:00
Nicolas Le Goff
1d9f2ae721 Fix #1687 Css inline issue for registration collection name 2014-02-06 15:18:53 +01:00
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
 2014-02-05 19:42:22 +01:00
Nicolas Le Goff
ac4b973115 Merge pull request #930 from romainneutron/fix-report-css 
[3.8] Fix report css assets
 2014-02-05 19:29:30 +01:00
Romain Neutron
5038e788c7 Fix report css assets 2014-02-05 17:17:57 +01:00
Nicolas Le Goff
3b9b5a3240 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
 2014-02-05 15:25:52 +01:00
Nicolas Le Goff
58c5a8513d Merge pull request #923 from romainneutron/upload-css 
[3.8] Fix upload box CSS
 2014-02-05 14:14:04 +01:00
Romain Neutron
03fc818fe4 Fix upload box CSS 2014-02-05 13:07:46 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
 2014-02-04 11:30:23 +01:00
Nicolas Le Goff
8f9745d874 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	templates/web/client/index.html.twig
 2014-02-04 11:25:59 +01:00
Romain Neutron
6159b357ae Fix less bootstrap path variables 2014-02-03 22:01:24 +01:00
Nicolas Le Goff
2c42f7e3dc Merge pull request #915 from romainneutron/error-logs 
[3.8] Error logs
 2014-02-03 10:47:09 -08:00
Romain Neutron
039e44b151 Fix css themes 2014-02-03 16:53:48 +01:00
Romain Neutron
2c9f542728 Move jquery context menu files to their directory 2014-02-03 16:16:53 +01:00