Björn Schießle
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
Jenkins for ownCloud
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
Lukas Reschke
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
Myles McNamara
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
Thomas Tanghus
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
Björn Schießle
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
Jenkins for ownCloud
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
Michael Gapczynski
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Thomas Tanghus
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Müller
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
Robin Appelman
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Thomas Tanghus
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
Thomas Müller
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
TheSFReader
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
TheSFReader
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
TheSFReader
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
Jenkins for ownCloud
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
Michael Gapczynski
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Thomas Mueller
c1072d0c09
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-31 23:26:40 +01:00
Thomas Mueller
2af6d74bc1
Merge branch 'master' into fixing-js-errors-public-link-master
...
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Stefan Herbrechtsmeier
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
Robin Appelman
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
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
Jörn Friedrich Dreyer
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +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
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +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
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +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
Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Thomas Mueller
11e88f4939
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-28 09:48:03 +01:00
Thomas Mueller
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +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
raghunayyar
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
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
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
Thomas Mueller
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
cdd07b3339
introducing class OCA/files/lib/Helper with new function to build an array with storage stats
...
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
2013-01-19 00:31:09 +01:00
Jenkins for ownCloud
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f
Remove uneeded file
...
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00