hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,382 Commits 268 Branches 107 Tags
df56eb4da7f5480c4e35b10c7528973a362dafa3
Commit Graph

1970 Commits

Author SHA1 Message Date
Romain Neutron
860294481a Merge branch '3.8' 2013-09-16 10:05:00 +02:00
Romain Neutron
537c41fc09 Rename php file 2013-09-16 10:04:40 +02:00
Romain Neutron
12b01438fd Merge branch '3.8' 2013-09-16 09:59:11 +02:00
Romain Neutron
6cbc1f048d Fix merge 2013-09-16 09:58:34 +02:00
Romain Neutron
f85641efd1 Fix archive task default settings 2013-09-14 02:10:12 +02:00
Romain Neutron
2727f939ee Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-14 02:10:12 +02:00
Romain Neutron
e8bf678fc2 Cleanup CS 2013-09-14 02:10:11 +02:00
Romain Neutron
6c7c196a20 Add Office Plugin client id and secret 2013-09-14 02:10:11 +02:00
Romain Neutron
d2947d8fbc Enable navigator by default 2013-09-14 02:08:51 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
4d6cace14a Merge pull request #637 from romainneutron/fix-archive-task 
[3.8] Fix archive task default settings
 2013-09-13 13:32:11 -07:00
Romain Neutron
76e16be497 Fix strict standards 2013-09-13 19:51:31 +02:00
Romain Neutron
28367c9007 Fix archive task default settings 2013-09-13 10:42:17 +02:00
Romain Neutron
2c7073182a Fix CS 2013-09-12 13:55:31 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Romain Neutron
a7b36af01a Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-11 16:02:55 +02:00
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
a0dba36e67 Enable navigator by default 2013-09-09 13:05:55 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Andrey
d1d678668a Added missing line 2013-09-05 13:45:14 +02:00
Andrey
c1c8327260 Replaced SQL connection for sqlite tests 2013-09-05 13:44:15 +02:00
Andrey
6e970837a1 Added closes to patch, removed timestampable listener from 320f 2013-09-05 13:44:15 +02:00
Andrey
8f63938149 Added migration patch 2013-09-05 13:44:14 +02:00
Andrey
c0bd291f7a Add Doctrine schema pre-upgrades 2013-09-05 13:44:14 +02:00
Andrey
a148cef063 Added more flushes to a patch 2013-09-05 13:44:13 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
1baf81040f Fixed a typo 2013-09-05 13:44:12 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 2013-09-05 13:44:12 +02:00
Andrey
c732d4139a Fixed exception issues 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
d40a6c0a0d Fixed feed error in patch 320f 2013-09-05 13:44:06 +02:00
Andrey
56a8aa33f8 Updated patch 302f 2013-09-05 13:44:05 +02:00
Andrey
d8d9ab7607 Removed remaining occurrences to Feed_, adapted patch_320f 2013-09-05 13:44:05 +02:00
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Andrey
affdfe7a0a Implement RSSFeeds, fixed controllers implementation, fixed tests 2013-09-05 13:44:02 +02:00
Romain Neutron
ba980d5f34 Fix tmp directories cleanup 2013-09-04 17:14:53 +02:00
Romain Neutron
c53017b1ab Merge pull request #620 from romainneutron/thesaurus-object-typehint 
[3.9] Add typehint on thesaurus functions
 2013-09-04 08:12:12 -07:00
Romain Neutron
79f8c82478 Merge pull request #619 from romainneutron/sleep 
[3.9] Remove sleep calls
 2013-09-04 06:36:48 -07:00
Romain Neutron
ec4d5ce5b2 Add typehint on thesaurus functions 2013-09-04 15:30:46 +02:00
Romain Neutron
5ed53ccda3 Remove sleep calls 2013-09-04 14:51:00 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
7c9fbd48e1 Remove tests in loops 2013-09-04 14:20:35 +02:00
Romain Neutron
def7a2d66c Remove debug statements 2013-09-04 14:12:56 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
c8d415c562 Merge branch '3.8' 2013-09-02 17:22:18 +02:00