Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Releases/1.1.x #303

Merged
merged 87 commits into from Aug 14, 2017
Merged

Releases/1.1.x #303

merged 87 commits into from Aug 14, 2017

Conversation

jrief
Copy link
Owner

@jrief jrief commented Aug 1, 2017

No description provided.

jrief added 30 commits June 6, 2017 12:09
@jrief
PoF for uploading image via Ajax
a1dc8dc
@jrief
refactored fileupload into private files
93a097b
@jrief
Replace Django’s ImageField by private one
e94ab7d
@jrief
add build step
fb25a63
@jrief
do configuration via app_settings
054ecbf
@jrief
use area_label instead of button_label
cd3c53b
@jrief
handle removal of deleted images
2fd2db8
@jrief
add easy-thumbails to deps
00049ae
@jrief
add easy-thumbails to deps
5fc4d5b
@jrief
Merge remote-tracking branch 'origin/features/upload-image' into feat…
e7fd2c4 
…ures/upload-image
@jrief
allow new fields and widgets only in combination with easy_thumbnails
2cc76df
@jrief
add compiled files to project
585b345
@jrief
add CSS class while uploading
3128ca6
@jrief
cryptographically sign temp_name
85104c1
@jrief
add docs on how to integrate file-uploads
d549d1a
@jrief
update docs
b9abef1
@jrief
added unit tests for fileupload
3eb77c1
@jrief
open image file as binary
bd4aad7
@jrief
open image file as binary
5ffe9e0
@jrief
Merge remote-tracking branch 'origin/features/upload-image' into feat…
486a3b9 
…ures/upload-image
@jrief
commit compiled files
51d9faa
@jrief
fixed anotations from @adrienbrunet
119af28
@jrief
refactored demos using a side menu
3cb8a33
@jrief
Merge remote-tracking branch 'origin/features/upload-image' into feat…
4fd0282 
…ures/refactor-example

# Conflicts:
#	examples/server/forms/model_scope.py
#	examples/server/tests/test_fileupload.py
#	examples/server/urls.py
@jrief
added image upload using Django model
e7227be
@jrief
added example to upload image
67cd54d
@jrief
initial untested revision of djngFormsSet directive
6d31a92
@jrief
ups, some merge conflicts slipped through
c6e82c4
@jrief
import testing models by default
8272981
@jrief
fixed all unit tests locally
12fc249
jrief and others added 3 commits August 1, 2017 09:47
@jrief
added all classes from django.form.fields
03251a4
@jrief
Converted get_ng_widget_context into NgWidgetMixin class. Override wi…
0376e8b 
…dget.__class__ to new class that includes NgWidgetMixin instead of overwriting get_context method.
@jrief
Merge branch 'master' into features/upload-image
5048a78 
# Conflicts:
#	djng/__init__.py
#	docs/changelog.rst
This was referenced Aug 1, 2017
Closed
Closed
craftycorvid
craftycorvid approved these changes Aug 7, 2017
View reviewed changes
Copy link
Contributor

@craftycorvid craftycorvid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good on a read-over.
Haven't had a chance to test it on my environment yet as it requires several code changes.

@jrief
Copy link
Owner Author

jrief commented Aug 8, 2017

Thanks for your review!

Haven't had a chance to test it on my environment yet as it requires several code changes.

that would be more interesting btw., because I don't know how the changes affect third party apps. The only change you should be required to do is to refactor your imports from from django.forms import fields to from djng.forms import fields

@jrief
call for sponsors
68a4522
@jrief
added templatetag djng_locale_script
32efdc0
@jrief
fixed links in image shields
e101455
@jrief
unit test for new templatetag
7ab5ddf
@jrief
Bump to version 1.1.0
f3a60a7
@jrief
fix typo in templatetag
67cd4a1
@jrief
fix order of Javascript includes
72b428c
@jrief
bump to 1.1.dev0
0057634
@jrief
Merge branch 'releases/1.1.x' into drafts/examples-1.1
726fb82 
# Conflicts:
#	.gitignore
#	djng/__init__.py
#	examples/server/forms/model_scope.py
#	examples/server/templates/three-way-data-binding.html
#	examples/server/tests/test_fileupload.py
#	tox.ini
@jrief
use form fields from djng
a5dba87
@jrief
deactivate image upload
e02ba67
@jrief
minor styling issues
2b18045
@jrief
full working example for imag eand file upload
2a3dc81
@jrief
remove legacy files
5069f4f
@jrief
reuse plain form
eb8089a
@jrief
allow all host names
97bdd8e
@jrief
requirements for Django-1.11
ede9180
@jrief
set STATIC_ROOT
b909ca1
@jrief
Merge branch 'releases/1.1.x' of github.com:jrief/django-angular into…
a6765f8 
… releases/1.1.x

Conflicts:
	examples/requirements.txt
@jrief
use <code> for styling
cf154a8
@jrief
Merge branch 'releases/1.1.x' of github.com:jrief/django-angular into…
02d2e5a 
… releases/1.1.x
@jrief jrief merged commit 02d2e5a into master Aug 14, 2017
@jrief jrief deleted the releases/1.1.x branch August 14, 2017 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craftycorvid craftycorvid craftycorvid approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jrief @craftycorvid @SilvaJulian