summaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Expand)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-292-14/+122
|\
| * Reimplement filesummary in JSkondou2013-08-281-0/+110
| * backport of #4357 to masterThomas Müller2013-08-271-14/+12
* | use random string as id for checkboxGeorg Ehrke2013-08-261-1/+2
* | fix background size in filelist.jsGeorg Ehrke2013-08-261-1/+1
* | Merge master into oc_previewGeorg Ehrke2013-08-262-204/+13
|\|
| * remove duplicate codeThomas Müller2013-08-222-198/+7
* | fix preview issue when uploading a file with parenthesesGeorg Ehrke2013-08-261-1/+3
* | move path generation for previews to dedicated functionGeorg Ehrke2013-08-232-3/+8
* | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-233-10/+11
|\|
| * Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-203-10/+11
| |\
| | * Merge branch 'master' into fix_jslint_kondoukondou2013-08-184-338/+329
| | |\
| | * | Fix a syntax error & have if-conds in an own linekondou2013-08-012-2/+6
| | * | Fix some JSLint warningskondou2013-07-313-15/+14
* | | | Merge master into oc_previewGeorg Ehrke2013-08-195-324/+338
|\| | |
| * | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-0/+14
| |\ \ \
| | * \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-173-26/+24
| | |\ \ \
| | * | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-151-1/+1
| | * | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-121-0/+14
| * | | | | Add _many_ newlines at the end of fileskondou2013-08-181-1/+1
| | |_|_|/ | |/| | |
| * | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-172-310/+314
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | communicate size of newly created file back and update UIThomas Müller2013-08-162-310/+314
| * | | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-152-11/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-301-1/+1
| | * | | Replace delete icon with spinnerVictor Dubiniuk2013-07-291-5/+3
| | * | | Merge branch 'master' into delete-fixThomas Müller2013-07-232-5/+2
| | |\| |
| | * | | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
| | * | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+1
| | * | | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-181-4/+1
| * | | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-151-2/+3
| |\ \ \ \
| | * | | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-081-2/+3
| | | |_|/ | | |/| |
* | | | | vertically center rename input boxJan-Christoph Borchardt2013-08-171-1/+1
* | | | | use jQuery.get instead of jQuery.ajaxGeorg Ehrke2013-08-161-6/+2
* | | | | adjust New file dialog for new stylesJan-Christoph Borchardt2013-08-151-1/+1
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-142-12/+5
|\| | | |
| * | | | Reword a phrasekondou2013-08-141-1/+1
| * | | | Use plural translationskondou2013-08-092-13/+6
| |/ / /
* | | | increase row height to 50px, properly position everything, checkboxes, action...Jan-Christoph Borchardt2013-08-141-1/+1
* | | | lazy load preview iconsGeorg Ehrke2013-08-142-7/+15
* | | | don't use hardcoded size for previewGeorg Ehrke2013-08-141-1/+3
* | | | style fixesGeorg Ehrke2013-07-301-1/+1
* | | | Merge branch 'master' into oc_previewThomas Müller2013-07-302-6/+14
|\| | |
| * | | remove whitespacesBjoern Schiessle2013-07-291-1/+1
| * | | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-262-2/+11
| | |/ | |/|
| * | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-182-5/+2
| |/
| * add new file above summary if it is the first file in the listBjörn Schießle2013-07-121-0/+2
* | merge conflicts ...Georg Ehrke2013-07-104-160/+421
|\|
| * Merge pull request #3903 from owncloud/nonpublic-uploadingThomas Müller2013-07-011-1/+1
| |\
| | * fix detection of public upload in filelist.jsRobin Appelman2013-07-011-1/+1
| * | Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-011-5/+36
| |\ \ | | |/ | |/|