8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
1c56539c01
Merge pull request #1551 from owncloud/fix_files_multiselect
...
Fix filelist shifting up one row on (multi)select
2013-02-10 02:54:12 -08:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
419eced65c
Remove hascontrols - use original positioning.
...
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
a93282ab16
Merge pull request #1507 from tripflex/master
...
remove float left from actions div class
fixes #1504
2013-02-07 12:49:14 -08:00
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
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
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
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
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
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
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
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
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
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
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
95352fbc15
Files: Dont get maxUploadSize if the filecache needs to be upgraded
2013-01-30 19:19:19 +01:00
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
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
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
86e5a9cd73
Files: fix sharing newly uploaded files
2013-01-28 21:09:18 +01:00
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
01b3c088a9
fix color change on click
2013-01-28 19:47:51 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
320233ec3d
merge conflict fixed
2013-01-28 15:10:00 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
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
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
10c428830e
Add create permission, fixes #780
2013-01-27 23:31:31 -05:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
6c882d9806
Remove outdated comments
2013-01-26 14:03:17 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
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
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
1817c7895b
allow to look into deleted directories
2013-01-22 15:33:54 +01:00
8259768732
introduce option to disable download action
2013-01-22 15:33:53 +01:00
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +01:00
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
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
1762378f67
Files: don't load fileactions.js when upgrading filecache
2013-01-21 22:07:55 +01:00
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 -08:00
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
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
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
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
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
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +01:00
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +01:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +01:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
bb43cf378b
Files: make sure keybinds js is loaded after files js
2013-01-16 21:36:25 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +01:00
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
a0d6f0e127
fixing undefined $eventSource
2013-01-06 23:36:31 +01:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
b673748151
Merge pull request #1063 from owncloud/translate_not_enough_space_available
...
add translation call for 'Not enough space available' upload error
2013-01-03 06:46:36 -08:00
fc64e8ec58
fix error when wrong dir was specified
2013-01-03 13:34:56 +01:00
f19787f84c
move $l to top
2013-01-03 12:00:07 +01:00
ea732e5b29
also translate 'No file was uploaded. Unknown error'
2013-01-03 11:57:17 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
e0e7c98100
Merge pull request #1041 from owncloud/fixing-856-master
...
Fixing #856 master
2013-01-02 14:58:54 -08:00
3ea9432d43
fixing undefined variable $l
2013-01-02 22:15:43 +01:00
0405edc798
add translation call for 'Not enough space available' upload error
2013-01-02 21:00:50 +01:00
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
a6733ff012
abort rename on ESC keyup
2013-01-02 16:17:30 +01:00
740b6623aa
show notification when renaming a file to ''
2013-01-02 16:17:30 +01:00
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +01:00
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +01:00
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +01:00
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
f70f9f3bc4
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
...
Replace %2F with / in breadcrumbs
2012-12-30 08:56:32 -08:00
Georg Ehrke
Jörn Friedrich Dreyer
Jenkins for ownCloud
Thomas Tanghus
Bart Visscher
Robin Appelman
Björn Schießle
Lukas Reschke
Myles McNamara
Michael Gapczynski
TheSFReader
Jan-Christoph Borchardt
Stefan Herbrechtsmeier
raghunayyar