Commit graph

743 commits

Author SHA1 Message Date
Iacopo Spalletti
2de4ba3778
Fix test 2016-05-18 08:00:00 +02:00
Iacopo Spalletti
80fb25dbd5
Set sites according to user permissions 2016-05-17 20:47:44 +02:00
Iacopo Spalletti
74fbf071df Merge pull request #252 from nephila/feature/merge_250
Merge #250
2016-05-13 10:37:15 +02:00
Iacopo Spalletti
429d6bd8f2
Minor addition 2016-05-13 08:54:08 +02:00
German Ilyin
5a8f9fdf03
Handle the case when there is no menu_structure in config 2016-05-13 08:49:03 +02:00
Iacopo Spalletti
fb89f3b239 Merge pull request #249 from nephila/feature/per_sites_restrictions
Implement per site restriction for users
2016-05-11 19:48:13 +02:00
Iacopo Spalletti
01880591b7
Implement per site restriction for users 2016-05-11 18:53:12 +02:00
Iacopo Spalletti
9c228df813
Merge branch 'develop' of github.com:nephila/djangocms-blog into develop 2016-05-11 17:22:40 +02:00
Iacopo Spalletti
aa94e531e7
Update migrations 2016-05-11 17:21:49 +02:00
Iacopo Spalletti
a15a2c300d Bump development version 2016-05-07 18:13:42 +02:00
Iacopo Spalletti
500750c330 Merge pull request #246 from frnhr/feature/fix_pagination_config
Fix pagination config
2016-05-05 14:16:24 +02:00
frnhr
f14f226581 a line in history 2016-05-05 13:37:57 +02:00
frnhr
0df9b47832 removed unused attribute 2016-05-04 21:38:14 +02:00
frnhr
4720e73497 the actual fix - all list views shuld look for app instance config before settings.py 2016-05-04 21:04:28 +02:00
frnhr
da1adf8812 Cosmetics - changed view class order 2016-05-04 21:01:33 +02:00
frnhr
e9398dd79b more DRY cosmetics 2016-05-04 21:00:45 +02:00
frnhr
7a2442d6ec dryed attribute model 2016-05-04 20:42:45 +02:00
Iacopo Spalletti
e5c61811e4
Update README [ci skip] 2016-05-03 08:38:01 +02:00
Iacopo Spalletti
3b9c484dcf
Update README [ci skip] 2016-05-03 08:37:18 +02:00
Iacopo Spalletti
e8f684e738
Bump develop version 2016-05-03 08:34:31 +02:00
Iacopo Spalletti
d9db4a795f Merge pull request #239 from nephila/feature/instant_articles_improved
Improve instant articles support
2016-05-03 08:33:26 +02:00
Iacopo Spalletti
b1b6c91050
Improve coverage 2016-05-03 07:33:04 +02:00
Iacopo Spalletti
3464dcf6f7 Merge pull request #243 from cnk-digital-solutions/develop
increased slug field length (default is 50)
2016-05-03 07:10:52 +02:00
Iacopo Spalletti
5669b28dc8
Add versioned dependency on django-meta-mixin to help transition 2016-05-03 07:10:40 +02:00
Petr Klus
8102dbd070 South migration file 2016-05-02 20:45:07 +02:00
Petr Klus
4ae9d2cc81 Slug field size update reflected in tests. 2016-05-02 17:44:39 +02:00
Petr Klus
674c0813b8 slug field migrations 2016-05-02 17:44:01 +02:00
Petr Klus
bde1f1f3ae increased slug field length (default is 50) 2016-05-02 17:00:45 +02:00
Iacopo Spalletti
517874892a
Fix compatibility issues 2016-05-01 22:07:39 +02:00
Iacopo Spalletti
6228e07fac
Merge branch 'develop' into feature/instant_articles_improved 2016-04-30 18:20:27 +02:00
Iacopo Spalletti
40c240ace9
Fix code lost in merge 2016-04-30 18:20:10 +02:00
Iacopo Spalletti
c356551302
Improve Instant Articles markup 2016-04-30 18:13:27 +02:00
Iacopo Spalletti
1118a8300b
Improve instant articles feed 2016-04-30 11:04:26 +02:00
Iacopo Spalletti
d58d9ab687
Update authors 2016-04-30 10:32:28 +02:00
Iacopo Spalletti
ebd32ebc91
Bump development version 2016-04-30 10:25:03 +02:00
Iacopo Spalletti
95efd8778c Merge pull request #236 from nephila/feature/instant_articles
preliminary work for FB instant articles
2016-04-30 10:24:28 +02:00
Iacopo Spalletti
547cd9e988
Separate testcases 2016-04-30 09:31:58 +02:00
Iacopo Spalletti
b0bb317be5
Add tests 2016-04-30 08:13:25 +02:00
Iacopo Spalletti
91df9a8b43
Fix code style 2016-04-30 08:13:25 +02:00
Iacopo Spalletti
050ce297bc
Better guid generation 2016-04-30 08:13:25 +02:00
Iacopo Spalletti
542774ce95
Add support for FB Instant Articles 2016-04-30 08:13:25 +02:00
Iacopo Spalletti
b595834f9d Merge pull request #238 from nephila/feature/meta_mixin_cleanup
Remove meta_mixin references
2016-04-30 08:13:15 +02:00
Iacopo Spalletti
335a12bdd5
Remove meta_mixin references 2016-04-30 00:55:27 +02:00
Iacopo Spalletti
4024a860dd Merge pull request #235 from nephila/feature/silence_wizards_errors
Silence wizard registration errors
2016-04-29 14:59:53 +02:00
Iacopo Spalletti
3ae4bc0ce7 Use different base name for wizard
Thanks to Sylvain Fankhauser for analysis
2016-04-29 12:48:12 +02:00
Iacopo Spalletti
88b8e0c738 Merge pull request #237 from nephila/feature/move_menus
Add some compatibility for cms menu and filer
2016-04-29 12:12:19 +02:00
Iacopo Spalletti
9ae6ffe632
Fix filer version 2016-04-29 11:04:58 +02:00
Iacopo Spalletti
6d74c26eed
Add some compatibility for cms menu and filer 2016-04-29 10:12:41 +02:00
Iacopo Spalletti
e44b5eb953 Merge pull request #234 from nephila/feature/fix_onsite
Fix onsite filter
2016-04-29 09:19:37 +02:00
Iacopo Spalletti
5883132b40
Add test for on_site filter 2016-04-26 19:33:10 +02:00