search

wardi / django-filebrowser-no-grappelli

django-filebrowser for default Django admin site. Based on https://github.com/sehmaschine/django-filebrowser v3.1 (before it was in git) Consider using https://github.com/smacker/django-filebrowser-no-grappelli which is based on a newer version
Other
150 stars 114 forks source link

Update with latest .py files from main filebrowser #13

Closed jessmooney closed 13 years ago

jessmooney commented 13 years ago

Hello,

I had experienced a problem overwriting files with the same name; I updated the code from your branch with the latest .py changes from http://code.google.com/p/django-filebrowser/, which appears to have resolved the issue.

I also changed the name of the addEvent method in AddFileBrowser.js to addFBEvent. I had a conflict with the name with some other third party scripts I was using, and thought this might be a common problem, so decided to change it to something more distinct.

Thank you, Jessica

wardi commented 13 years ago

with all the changes are collapsed in to one commit we lose all of upstream's history. I'll try to update my upstream branch and merge from there.