Skip to content

Commit 66e3aaf

Browse files
committed
Merge branch 'master' into file-upload-v2
Conflicts: src/css/main.css src/js/controllers/main.js
2 parents 557549e + 7b73ace commit 66e3aaf

25 files changed

+1229
-34
lines changed

API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## angular-filemanager API v2 docs
1+
## angular-filemanager API docs [multiple file support]
22

33
#### Listing (URL: fileManagerConfig.listUrl, Method: POST)
44

README.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ A very smart filemanager to manage your files in the browser developed in Angula
44

55
[![Build Status](https://travis-ci.org/joni2back/angular-filemanager.svg?branch=master)](https://travis-ci.org/joni2back/angular-filemanager)
66

7-
#### I'm working on multiple file support / drag and drop features. API should be changed. For more information / contribute, see "[click-changes](https://github.com/joni2back/angular-filemanager/tree/click-changes)" branch.
8-
97
### Support
108
This project is under free license. If you want to support the angular-filemanager development or just thank it's main maintainer by paying a beer, you can make a donation by clicking the following button [![Donate](https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XRB7EW72PS982)
119

1210

1311
#### [Try the DEMO](http://angular-filemanager.zendelsolutions.com/)
1412
---------
15-
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot1.png)
16-
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot2.png)
17-
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot3.png)
13+
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/click-changes/screenshot.gif)
1814

1915
### Features
20-
- Multilanguage (English / Spanish / Portuguese / French / German)
16+
- Multilanguage (English / 简体中文 / Spanish / Portuguese / French / German / Slovak / Hebrew)
2117
- Multiple templates (List / Icons)
2218
- Multiple file upload
19+
- Multiple file support
2320
- Search files
2421
- Directory tree navigation
2522
- Copy, Move, Rename (Interactive UX)
@@ -28,8 +25,6 @@ This project is under free license. If you want to support the angular-filemanag
2825
- Mobile support
2926

3027
### TODO
31-
- Improve the docs
32-
- Multiple file selector
3328
- Drag and drop
3429
- Dropbox and Google Drive compatibility
3530
- Extend backend bridges (PHP, Java, Python, Node, .Net)
@@ -101,7 +96,7 @@ This project is under free license. If you want to support the angular-filemanag
10196
config.set({
10297
appName: 'my angular-filemanager',
10398
allowedActions: angular.extend(defaults.allowedActions, {
104-
remove: true
99+
remove: false
105100
})
106101
});
107102
}]);
@@ -119,3 +114,5 @@ For transparency into our release cycle and in striving to maintain backward com
119114

120115
### Copyright and license
121116
Code and documentation released under [the MIT license](https://github.com/joni2back/angular-filemanager/blob/master/LICENSE).
117+
118+

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-filemanager",
3-
"version": "1.4.8",
3+
"version": "1.5.0",
44
"homepage": "https://github.com/joni2back/angular-filemanager",
55
"authors": [
66
"Jonas Sciangula Street <joni2back@gmail.com>"

0 commit comments

Comments
 (0)