Björn Schießle
|
54eeb8b8fc
|
fix merge conflict
|
2013-01-31 10:55:59 +01:00 |
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
|
Robin Appelman
|
95352fbc15
|
Files: Dont get maxUploadSize if the filecache needs to be upgraded
|
2013-01-30 19:19:19 +01:00 |
|
Björn Schießle
|
9ca0a93847
|
make spinner title translatable
|
2013-01-30 16:20:13 +01:00 |
|
Björn Schießle
|
1592764a60
|
show a spinner instead of the delete button while moving files to the trash bin
|
2013-01-30 14:32:20 +01:00 |
Jörn Friedrich Dreyer
|
81a398c22c
|
use $.trim() for IE8
|
2013-01-30 13:29:24 +01:00 |
|
Jörn Friedrich Dreyer
|
99dfaee1f6
|
reset checkbox after getting selected files instead of ofter dragging, speed up revert
|
2013-01-30 12:59:35 +01:00 |
|
Jörn Friedrich Dreyer
|
1d0ee61f3a
|
use post instead of get
|
2013-01-30 12:59:35 +01:00 |
|
Jörn Friedrich Dreyer
|
0089b17749
|
add multselect dnd
|
2013-01-30 12:59:34 +01:00 |
|
Thomas Müller
|
5761bd771f
|
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
hide upload progress bar and cancel action in IE < 10
|
2013-01-30 02:48:12 -08:00 |
|
Jenkins for ownCloud
|
68266e70f2
|
[tx-robot] updated from transifex
|
2013-01-30 00:25:41 +01:00 |
|
Björn Schießle
|
d10e137939
|
icons added; empty trash bin message added
|
2013-01-29 10:03:04 +01:00 |
Michael Gapczynski
|
5143660cd3
|
Merge pull request #1324 from owncloud/permanent-share-icons
Permanently display shared status icons
|
2013-01-28 20:17:40 -08:00 |
|
Jenkins for ownCloud
|
8c4931a645
|
[tx-robot] updated from transifex
|
2013-01-29 00:06:20 +01:00 |
|
Robin Appelman
|
86e5a9cd73
|
Files: fix sharing newly uploaded files
|
2013-01-28 21:09:18 +01:00 |
|
Robin Appelman
|
7207211f3a
|
change required ownCloud version to 4.91
|
2013-01-28 19:58:24 +01:00 |
Jan-Christoph Borchardt
|
01b3c088a9
|
fix color change on click
|
2013-01-28 19:47:51 +01:00 |
|
Robin Appelman
|
74f6f85628
|
merge master into filesystem
|
2013-01-28 19:37:58 +01:00 |
|
Björn Schießle
|
320233ec3d
|
merge conflict fixed
|
2013-01-28 15:10:00 +01:00 |
|
Björn Schießle
|
8067a1394e
|
fix merge conflicts
|
2013-01-28 11:18:04 +01:00 |
|
Thomas Müller
|
31d83fddc4
|
Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
|
2013-01-28 00:29:46 -08:00 |
|
Michael Gapczynski
|
10c428830e
|
Add create permission, fixes #780
|
2013-01-27 23:31:31 -05:00 |
|
Robin Appelman
|
bca5ce724e
|
Merge branch 'master' into filesystem
|
2013-01-28 02:35:51 +01:00 |
|
Jenkins for ownCloud
|
b655444709
|
[tx-robot] updated from transifex
|
2013-01-28 00:05:43 +01:00 |
|
Jenkins for ownCloud
|
00a28062e1
|
[tx-robot] updated from transifex
|
2013-01-27 00:06:21 +01:00 |
|
Robin Appelman
|
930b9b9cd0
|
merge master into filesystem
|
2013-01-26 18:49:45 +01:00 |
Lukas Reschke
|
2e42c6f54f
|
Use HTML5 data attribute + fix undefined variable
|
2013-01-26 14:07:35 +01:00 |
|
Lukas Reschke
|
6c882d9806
|
Remove outdated comments
|
2013-01-26 14:03:17 +01:00 |
|
Thomas Müller
|
276d98b9dd
|
Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
|
2013-01-26 04:15:40 -08:00 |
|
Jenkins for ownCloud
|
af4411e33d
|
[tx-robot] updated from transifex
|
2013-01-26 00:10:07 +01:00 |
|
Lukas Reschke
|
047f1988c3
|
Merge branch 'master' into no-inline-js
|
2013-01-25 16:11:07 +01:00 |
|
Jenkins for ownCloud
|
6832dddf39
|
[tx-robot] updated from transifex
|
2013-01-25 00:05:56 +01:00 |
|
Jenkins for ownCloud
|
3ff32eba25
|
[tx-robot] updated from transifex
|
2013-01-24 00:07:38 +01:00 |
|
Lukas Reschke
|
c8bbbb48d3
|
Merge master...
|
2013-01-23 11:30:40 +01:00 |
|
Jenkins for ownCloud
|
c986dbe573
|
[tx-robot] updated from transifex
|
2013-01-23 00:06:18 +01:00 |
|
Björn Schießle
|
367aadb3b7
|
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
|
2013-01-22 18:34:59 +01:00 |
|
Björn Schießle
|
16ae902e31
|
no undo notification for deleted file, we use the trash bin instead
|
2013-01-22 17:43:46 +01:00 |
|
Björn Schießle
|
1817c7895b
|
allow to look into deleted directories
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
8259768732
|
introduce option to disable download action
|
2013-01-22 15:33:53 +01:00 |
|
Björn Schießle
|
dfab3d3d7f
|
call the trash bin view
|
2013-01-22 15:33:53 +01:00 |
|
Björn Schießle
|
9bacb0e179
|
rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view
|
2013-01-22 15:33:53 +01:00 |
|
Björn Schießle
|
9d77317de8
|
add trash button to web interface
|
2013-01-22 15:32:57 +01:00 |
|
Lukas Reschke
|
bd5ff29716
|
Merge branch 'master' into no-inline-js
|
2013-01-22 11:50:33 +01:00 |
|
Robin Appelman
|
f2d0eeae83
|
Merge branch 'master' into filesystem
|
2013-01-22 00:19:44 +01:00 |
|
Lukas Reschke
|
8223117569
|
Remove closing tag
|
2013-01-21 22:29:27 +01:00 |
|
Robin Appelman
|
1762378f67
|
Files: don't load fileactions.js when upgrading filecache
|
2013-01-21 22:07:55 +01:00 |
|
Lukas Reschke
|
0d02caa684
|
No inline JS in apps
|
2013-01-21 20:34:28 +01:00 |
|
Jenkins for ownCloud
|
aede26d996
|
[tx-robot] updated from transifex
|
2013-01-21 00:05:34 +01:00 |
|
Robin Appelman
|
83d6221322
|
merge master into filesytem
|
2013-01-20 03:11:04 +01:00 |