Commit Graph

6516 Commits

Author SHA1 Message Date
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
93c8ea03d3 Merge pull request #629 from nlegoff/fix_tags_edit
[3.8] Remove regexp control for validating tags
2013-09-09 00:48:35 -07:00
Nicolas Le Goff
319c1a90c2 Remove regexp control for validating tags 2013-09-06 20:32:52 +02:00
Romain Neutron
084ad221dc Merge branch '3.8' 2013-09-05 14:38:55 +02:00
Romain Neutron
516433c6e4 Update locales template 2013-09-05 14:38:30 +02:00
Romain Neutron
268299f8e0 Merge pull request #627 from nlegoff/remove_plurals
[3.8] Fix translation issues
2013-09-05 05:31:19 -07:00
Nicolas Le Goff
ed514432ca Fix translation issues 2013-09-05 14:29:42 +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
Romain Neutron
a37b7c9080 Merge pull request #628 from nlegoff/fix_1436
[3.8] Fix #1436 Css issue
2013-09-05 04:57:09 -07:00
Nicolas Le Goff
35c64bb4c5 Fix #1436 Css issue 2013-09-05 13:55:20 +02:00
Romain Neutron
a5b58730fd Merge pull request #624 from romainneutron/fix-1434
[3.8] Update dependencies, especially PHP-FFMpeg and Media-Alchemyst
2013-09-05 04:49:46 -07: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
5575a8ec73 Updated sqlite 2013-09-05 13:44:14 +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
40b1e9e663 Restored proxies 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
998e0c68ea Fixed errors, restored sessionrepository as it should be 2013-09-05 13:44:13 +02:00
Andrey
0fb4e8e0ee Restored usage of querybuilder in feedrepository 2013-09-05 13:44:13 +02:00
Andrey
5b0925996d Restored methods in repositories 2013-09-05 13:44:13 +02:00
Andrey
d8cac877e6 Restored repositories 2013-09-05 13:44:13 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
58550a2410 Replaced error messages 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
1b8c2433b0 replaced a dql request with querybuilder one 2013-09-05 13:44:12 +02:00
Andrey
731170343b changed file path in publications 2013-09-05 13:44:11 +02:00
Andrey
887af14a82 More camelcase 2013-09-05 13:44:11 +02:00
Andrey
3cf477f5b8 Removed a few remaining underscores 2013-09-05 13:44:11 +02:00
Andrey
b555c6212e Replaced underscores in aggregate 2013-09-05 13:44:11 +02:00
Andrey
4fe6de5ffc Replaced underscores in repositories 2013-09-05 13:44:10 +02:00
Andrey
c1910a188e Replaced underscores in variable names to make them camelcase 2013-09-05 13:44:10 +02:00
Andrey
42830efef5 Removed findbyuser methods 2013-09-05 13:44:10 +02:00
Andrey
f36173aea9 replaced missing methods in test files 2013-09-05 13:44:10 +02:00
Andrey
090f230dd9 replaced repository methods with query-builder ones 2013-09-05 13:44:10 +02:00
Andrey
3b3d08a9e1 removed findbyfeedanduser method 2013-09-05 13:44:09 +02:00
Andrey
3f09a919ed removed findallpublic method 2013-09-05 13:44:09 +02:00
Andrey
06bf968e39 Fixed codestyle by removing extra assignments 2013-09-05 13:44:09 +02:00
Andrey
c732d4139a Fixed exception issues 2013-09-05 13:44:09 +02:00
Andrey
444d45b25c Fixed codestyle and replaced static with self in link generator classes 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
f8c4041733 Removed yaml files 2013-09-05 13:44:08 +02:00
Andrey
7796c55ab7 Renamed and fixed entry update/delete bindings 2013-09-05 13:44:08 +02:00
Andrey
578eab4901 Replaced record_24 with record_1 2013-09-05 13:44:08 +02:00
Andrey
92f2ceb756 Removed extra tables from xml conf 2013-09-05 13:44:07 +02:00
Andrey
85aa5959bd Fixed minor mapping errors
Fixed mapping error in FeedItem

Fixed merging error
2013-09-05 13:44:07 +02:00
Andrey
4e58500fe9 Added forgotten namespace in feeditem 2013-09-05 13:44:07 +02:00