Thomas Müller
|
3eed060ec9
|
backport of #4357 to master
|
2013-08-27 23:53:04 +02:00 |
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
Jörn Friedrich Dreyer
|
7c9d999243
|
reduced complexity, added listing conflicts to dialog
|
2013-08-22 14:29:00 +02:00 |
|
Thomas Müller
|
101cfa2359
|
remove duplicate code
|
2013-08-22 00:09:43 +02:00 |
|
Jörn Friedrich Dreyer
|
bf04daff82
|
architecture too complex
|
2013-08-21 14:58:28 +02:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
|
Jörn Friedrich Dreyer
|
f94e603698
|
progress fixes
|
2013-08-16 11:40:55 +02:00 |
|
Thomas Müller
|
57f7ff2dbd
|
communicate size of newly created file back and update UI
|
2013-08-16 00:31:27 +02:00 |
Jan-Christoph Borchardt
|
2fd5178a00
|
adjust New file dialog for new styles
|
2013-08-15 12:50:26 +02:00 |
|
Jörn Friedrich Dreyer
|
9da49264ea
|
change filelist ui updates
|
2013-08-14 17:49:45 +02:00 |
|
Jörn Friedrich Dreyer
|
e1927d5bee
|
fix whitespace, check selected files before starting upload
|
2013-08-14 10:55:12 +02:00 |
|
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
Roman Geber
|
da0caadf4e
|
Added file-upload to GIT repo
Optimized CSS identifiers
|
2013-06-26 22:51:38 +02:00 |