Commit graph

760 commits

Author SHA1 Message Date
Iacopo Spalletti
0a5814c0f5
Fix django CMS repo urls 2016-05-27 22:35:07 +02:00
Iacopo Spalletti
a6ef74cfdd
Fix tox dependencies 2016-05-27 00:12:54 +02:00
Iacopo Spalletti
511bd66226
Fix view name 2016-05-26 23:31:46 +02:00
Iacopo Spalletti
edcb354840 Merge pull request #263 from nephila/feature/fbarts
More instant articles fixes
2016-05-26 08:29:56 +02:00
Iacopo Spalletti
bba4333549
Code style 2016-05-26 00:54:27 +02:00
Iacopo Spalletti
0d704914ef
Update i18n 2016-05-26 00:53:34 +02:00
Iacopo Spalletti
84cf78b6ed
Use fixed timezone 2016-05-26 00:52:09 +02:00
Iacopo Spalletti
7918f0d513
Tentative fixes 2016-05-22 16:18:16 +02:00
Iacopo Spalletti
4c338b03d5 Merge pull request #262 from nephila/feature/fix_thumbnails
Fix support for new filer ThumbnailOption
2016-05-22 16:17:29 +02:00
Iacopo Spalletti
603b1dabc2 Merge pull request #261 from nephila/feature/fix_sites
Fix site handling
2016-05-22 15:12:29 +02:00
Iacopo Spalletti
fffc2a633e
Fix support for new filer ThumbnailOption 2016-05-22 13:34:08 +02:00
Iacopo Spalletti
758989ad24
Fix site handling 2016-05-22 12:08:39 +02:00
Iacopo Spalletti
dab04569e5
Test on django CMS 3.3 2016-05-19 08:15:58 +02:00
Iacopo Spalletti
f446727834
Bump develop version 2016-05-19 08:04:19 +02:00
Iacopo Spalletti
0431db5006
Update translations 2016-05-19 08:04:00 +02:00
Iacopo Spalletti
f6f921e5a5 Merge pull request #254 from nephila/feature/filter_sites
Set sites according to user permissions
2016-05-18 09:07:11 +02:00
Iacopo Spalletti
315e4f85a2 Note about python / django / django CMS compatibility 2016-05-18 08:34:03 +02:00
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