wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12846 commits 157 branches 562 tags 714 MiB
Commit graph

1083 commits

Author SHA1 Message Date
Bart Visscher
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
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
Thomas Müller
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
Lukas Reschke
ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer
5e16510a53 hide upload progress bar and cancel action in IE < 10 2013-01-18 22:06:42 +01:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Jan-Christoph Borchardt
b81a7aa078 fix up content and content-wrapper merge ... 2013-01-18 19:58:50 +07:00
Thomas Mueller
130c9cad03 relative storage info without decimals 2013-01-17 16:52:57 +01:00
Thomas Mueller
b7d3bf5f81 rename space -> storage 2013-01-17 16:49:10 +01:00
Jenkins for ownCloud
433fa19268 [tx-robot] updated from transifex 2013-01-17 00:27:40 +01:00
Robin Appelman
bb43cf378b Files: make sure keybinds js is loaded after files js 2013-01-16 21:36:25 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca [tx-robot] updated from transifex 2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc Cache: more efficient upgrading 2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Bart Visscher
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
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt
6182b1353b merge master into navigation 2013-01-15 20:40:38 +07:00
Jenkins for ownCloud
fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
9eb16e06f7 Merge pull request #1135 from owncloud/allow_default_click_behaviour 
allow default click behaviour
 2013-01-14 11:24:02 -08:00
Thomas Müller
51a4240051 Merge pull request #1170 from owncloud/correctIndention 
Remove ugly indentation - Trivial
 2013-01-14 04:59:53 -08:00
Jenkins for ownCloud
c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Jenkins for ownCloud
981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Thomas Mueller
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
Thomas Mueller
938254a1c0 load jquery-visibility 2013-01-11 16:45:32 +01:00
Thomas Mueller
362860c5b5 adding jquery-visibility 
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
 2013-01-11 16:44:25 +01:00
Thomas Mueller
3d33e8f845 fixing indent - sorryy wrong setting on the IDE :-( 
replace missing calls to OC.Notification.show
 2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40 adding accidentally removed line - THX @bartv2 2013-01-11 14:55:49 +01:00
Thomas Mueller
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
Thomas Mueller
364b1cd391 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 10:00:12 +01:00
Thomas Mueller
23896a7290 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 09:53:12 +01:00
Jenkins for ownCloud
d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Thomas Müller
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
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer
780fb37758 allow default click behaviour 2013-01-09 15:21:55 +01:00
Jörn Friedrich Dreyer
a40c95242f more translations 2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f Merge pull request #938 from owncloud/fix_minor_files_annoyances 
Fix minor files annoyances
 2013-01-08 15:02:06 -08:00
Thomas Mueller
7b9e6d2f2c fixing string concatenation in javascript 
refs ae54364d7c
 2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Jenkins for ownCloud
0b007235b9 [tx-robot] updated from transifex 2013-01-07 00:06:32 +01:00
Thomas Mueller
a0d6f0e127 fixing undefined $eventSource 2013-01-06 23:36:31 +01:00
Thomas Mueller
9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +01:00
Thomas Mueller
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
Thomas Mueller
07b3b23a39 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:28:21 +01:00
Thomas Mueller
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
Thomas Mueller
6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Robin Appelman
a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +01:00
Jenkins for ownCloud
934d9dcc42 [tx-robot] updated from transifex 2013-01-05 00:03:58 +01:00
Thomas Mueller
ba475d4862 javascript notification functions have been moved to js.js for common use 2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
9cd7bb2c8d reverse z-index of a and input to make upload work again in ie8/9 2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer
de496ed16d remove initial iframe, is added automatically by jquery upload mechanism 2013-01-04 13:47:47 +01:00
Jenkins for ownCloud
90f39cd703 [tx-robot] updated from transifex 2013-01-04 13:23:31 +01:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Thomas Müller
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
Jörn Friedrich Dreyer
fc64e8ec58 fix error when wrong dir was specified 2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer
f19787f84c move $l to top 2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer
ea732e5b29 also translate 'No file was uploaded. Unknown error' 2013-01-03 11:57:17 +01:00
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Müller
e0e7c98100 Merge pull request #1041 from owncloud/fixing-856-master 
Fixing #856 master
 2013-01-02 14:58:54 -08:00
Thomas Mueller
3ea9432d43 fixing undefined variable $l 2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer
0405edc798 add translation call for 'Not enough space available' upload error 2013-01-02 21:00:50 +01:00
Jörn Friedrich Dreyer
03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer
a6733ff012 abort rename on ESC keyup 2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
740b6623aa show notification when renaming a file to '' 2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
8148c187a3 whitespace cleanup 2013-01-02 16:07:10 +01:00
Thomas Mueller
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
Thomas Mueller
48c7bed59b make usedSpacePercent available in the files app 2013-01-02 15:06:49 +01:00
Jenkins for ownCloud
329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Lukas Reschke
f70f9f3bc4 Merge pull request #1043 from owncloud/fix_breadcrumb_slashes 
Replace %2F with / in breadcrumbs
 2012-12-30 08:56:32 -08:00
Jenkins for ownCloud
66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Michael Gapczynski
b5b48428ab Replace %2F with / in breadcrumbs 2012-12-28 19:41:37 -05:00
Thomas Mueller
a3206b4e97 only show the max possible upload of 2GB on a 32 bit system. 
for a 64 bit system we have no such limitation
refs #856

Conflicts:
	apps/files/templates/admin.php
 2012-12-28 22:17:38 +01:00
Thomas Mueller
7b72424a39 Revert "fixed max possible upload size for files app in admin screen" 
This reverts commit 7f2208b9a1.

Conflicts:
	apps/files/admin.php
 2012-12-28 22:14:32 +01:00
Jenkins for ownCloud
e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Jenkins for ownCloud
05fda76776 [tx-robot] updated from transifex 2012-12-22 00:26:25 +01:00
Thomas Müller
39d874cd90 the maximum upload size is now part of the response of the upload and delete operation. 
the maximum upload size is updated within the browser once an upload or delete operation has been finished
 2012-12-20 17:16:53 +01:00
Jan-Christoph Borchardt
bdc8d0098a Merge pull request #869 from owncloud/files-styles 
Files styles
 2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt
86d510ba28 fix switched values from previous commit 2012-12-20 13:30:57 +01:00
Jan-Christoph Borchardt
373b69d835 Merge pull request #974 from owncloud/fixing-120-master 
setting the timezone is now part of the login process
 2012-12-20 04:02:22 -08:00
Bart Visscher
8e44404ae0 Merge pull request #925 from owncloud/fix_issue_918 
Trigger the last action before continuing with a file upload
 2012-12-20 03:30:50 -08:00
Jan-Christoph Borchardt
babc0e4ac6 fix Firefox issues with file actions position and multiselect bar width 2012-12-20 12:02:19 +01:00
Jan-Christoph Borchardt
aa5f726f14 use slightly darker color for file actions background, fix fugly look for selected rows 2012-12-20 11:24:25 +01:00
Jan-Christoph Borchardt
c05ea8cfc3 fix file actions messing with file row height on narrower screens 2012-12-20 11:14:27 +01:00
Thomas Müller
a1bf6b54e6 remove timezone.js 2012-12-20 11:14:21 +01:00
Thomas Müller
7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +01:00
Jan-Christoph Borchardt
5107ccbeda move CSS from JS to CSS 2012-12-20 10:53:50 +01:00
Frank Karlitschek
7c5150ce32 Merge pull request #913 from owncloud/fix_settings 
cleaning up the settings
 2012-12-18 15:27:52 -08:00
Jenkins for ownCloud
982e46cd29 [tx-robot] updated from transifex 2012-12-19 00:04:14 +01:00
Jan-Christoph Borchardt
586cc9a83b merge master into navigation 2012-12-18 15:41:58 +01:00
Jenkins for ownCloud
a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Thomas Müller
b8f749420b Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download 
fix utf8 filenames in ie download response header according to rfc5987, ...
 2012-12-17 14:53:15 -08:00
Jörn Friedrich Dreyer
b6eb95349e fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http 2012-12-17 16:46:07 +01:00
Thomas Müller
d085fdf8ea Merge pull request #842 from owncloud/restrict_keyboard_shortcuts 
prevent keyboardshortcuts from catching events outside the main doc - e....
 2012-12-17 07:38:53 -08:00
Michael Gapczynski
915126cae8 Trigger last action before continuing with creating a new file/folder/from link 2012-12-16 16:25:08 -05:00
Michael Gapczynski
2607c565b0 Trigger the last action before continuing with a file upload, fixes issue #918 2012-12-16 16:19:51 -05:00
Frank Karlitschek
30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher
6ff38624a7 Merge pull request #875 from owncloud/multiplefiles_json 
use json when deleting multiply files instead of using ; as delimiter
 2012-12-14 16:26:09 -08:00
Jenkins for ownCloud
6d7ae463df [tx-robot] updated from transifex 2012-12-14 00:17:42 +01:00
Robin Appelman
1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Robin Appelman
fda7d932ef remove unneeded line 2012-12-13 22:12:27 +01:00
Jan-Christoph Borchardt
e0ada2c24f bring back fixed multiselect bar so it’s visible when scrolled down, fix #746 2012-12-13 19:44:55 +01:00
Jan-Christoph Borchardt
316a29f7ac fix new button popup looking blurry 2012-12-13 19:04:27 +01:00
Robin Appelman
6a2b41e5e8 use json encoding when deleting multiply files instead of using ; as delimiter 2012-12-13 18:11:00 +01:00
Jan-Christoph Borchardt
e7c4a2c8e1 ungreenify new & upload buttons 2012-12-13 00:12:21 +01:00
Thomas Mueller
e8897c2b7e prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup 2012-12-12 12:55:29 +01:00
Jenkins for ownCloud
bac4e011dc [tx-robot] updated from transifex 2012-12-12 00:14:08 +01:00
Robin Appelman
7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Jenkins for ownCloud
f7f462f273 [tx-robot] updated from transifex 2012-12-11 00:04:40 +01:00
Jenkins for ownCloud
a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Thomas Müller
9a3a83e16a Merge pull request #282 from butonic/fix_new_and_upload_button_html_css 
fix_new_and_upload_button_html_css
 2012-12-09 01:25:50 -08:00
Jenkins for ownCloud
e3e4dcf77b [tx-robot] updated from transifex 2012-12-09 00:12:41 +01:00
Jörn Friedrich Dreyer
787e8b86d9 cleanup CSS whitespace and remove extra input[type='checkbok'] 2012-12-07 17:41:52 +01:00
Jörn Friedrich Dreyer
80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
2ec96c7a63 fix new li icons jumping when replacing p with input 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
8cf1e560bb add IE9 CSS checkbox fixes 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
810e02099e upload button HTML, CSS & JS cleanup 2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer
6864b28e47 rmeove vendor prefix for box-shadow 2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer
76395057d4 fix_new_and_upload_button_html_css 2012-12-07 15:32:24 +01:00
Thomas Müller
380db4a29e Merge pull request #640 from esthepiking/master 
Keyboard Shortcuts
 2012-12-06 13:42:14 -08:00
Robin Appelman
98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Erik Sargent
f0213735fc Code clean up 2012-12-05 08:23:28 -07:00
Jenkins for ownCloud
524f3c3c0b [tx-robot] updated from transifex 2012-12-05 00:04:55 +01:00
Erik Sargent
93208d0fe9 Remove rename 2012-12-04 09:40:17 -07:00
Jenkins for ownCloud
a53a946c20 [tx-robot] updated from transifex 2012-12-04 00:07:11 +01:00
Robin Appelman
be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Jenkins for ownCloud
f4d7955fe6 [tx-robot] updated from transifex 2012-12-03 00:05:40 +01:00
Robin Appelman
72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +01:00
Jenkins for ownCloud
c7c5e2a2e2 [tx-robot] updated from transifex 2012-12-01 00:03:27 +01:00
Erik Sargent
47fa3a8fe0 event.ctrlKey 2012-11-30 10:11:25 -07:00
Erik Sargent
5d13b0533d event.ctrlKey 2012-11-30 10:10:00 -07:00
Erik Sargent
2160663309 ctrl issue fix 2012-11-30 08:43:24 -07:00
Bart Visscher
8aba5874db Merge pull request #644 from butonic/checkstyle_fixes 
fix checkstyle for files app
 2012-11-30 04:10:31 -08:00
Robin Appelman
dbbb357f62 add upgrade path from old cache to preserve file id's 2012-11-30 01:41:30 +01:00
Erik Sargent
6060d063a9 Cleanup 2012-11-29 16:52:41 -07:00
Robin Appelman
d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jenkins for ownCloud
16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Jörn Friedrich Dreyer
3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Erik Sargent
b6e3460871 documentation 2012-11-29 10:21:20 -07:00
Erik Sargent
fd4aecf525 cleanup 2012-11-29 10:18:34 -07:00
Robin Appelman
bcb27c81d4 use new obEnd function instead of ob_end_clean 2012-11-29 18:01:21 +01:00
Erik Sargent
dafe028c11 Rename 2012-11-28 21:00:11 -07:00
Erik Sargent
a73a263543 Enter 2012-11-28 19:58:42 -07:00
Erik Sargent
8802dac02a Arrow key navigation 2012-11-28 17:32:05 -07:00
Erik Sargent
8722d3751c Keys array 2012-11-28 10:36:54 -07:00
Erik Sargent
b78dc3f48a keycode naming 2012-11-28 10:22:20 -07:00
Bart Visscher
9717cdb42e Merge pull request #601 from butonic/add_drag_shadow_in_firefox 
show drag shadow in firefox by using helper:'clone'
 2012-11-28 09:00:12 -08:00
Erik Sargent
0c6b53c25e no message 2012-11-28 09:55:38 -07:00
Erik Sargent
fa858d7149 initial setup 2012-11-28 09:50:54 -07:00
Erik Sargent
ccb9bb4be0 initial setup 2012-11-28 09:50:49 -07:00
Erik Sargent
5f03c306da initial setup 2012-11-28 09:50:40 -07:00
Jenkins for ownCloud
1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Jörn Friedrich Dreyer
9a441d3e3a show drag shadow in firefox by using helper:'clone' 2012-11-27 17:38:21 +01:00
Jenkins for ownCloud
d251f04b98 [tx-robot] updated from transifex 2012-11-27 00:10:47 +01:00
Arthur Schiwon
74cf3b5dfb use normalizePath to have a proper target path 2012-11-26 14:35:13 +01:00
Arthur Schiwon
776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Arthur Schiwon
fdc7a8b204 make sure path starts with / 2012-11-26 14:34:09 +01:00
Jenkins for ownCloud
7892204077 [tx-robot] updated from transifex 2012-11-26 00:02:04 +01:00
Robin Appelman
03fd43a239 Merge branch 'master' into filesystem 2012-11-25 15:38:17 +01:00
Robin Appelman
eaf8399aaf make sure the output buffer is closed when handeling webdav 2012-11-25 14:45:13 +01:00
Jenkins for ownCloud
1857d5f914 [tx-robot] updated from transifex 2012-11-25 00:03:37 +01:00
Michael Gapczynski
c47bf9bbce Add checks for storage object 2012-11-24 16:42:54 -05:00
Jenkins for ownCloud
dde3342398 [tx-robot] updated from transifex 2012-11-24 00:03:00 +01:00
Robin Appelman
555dec2d92 merge master into filesystem 2012-11-23 16:20:56 +01:00
Thomas Müller
db2be74b4d Merge pull request #479 from owncloud/fix_438 
Do the url encoding once, only in breadcrumbs template
 2012-11-23 03:07:02 -08:00
Thomas Müller
b5b7a67f8a Merge pull request #480 from owncloud/fix_435_and_437 
Also reject names with \ in the name
 2012-11-23 03:05:52 -08:00
Thomas Müller
97ed467224 Merge pull request #418 from libasys/Fix-IE8-fileactions-binding 
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
 2012-11-23 02:16:21 -08:00
Robin Appelman
95057e727d merge master into filesystem 2012-11-23 00:40:58 +01:00
Robin Appelman
8fb4dfd2ea use background scanner 2012-11-23 00:20:46 +01:00
Jenkins for ownCloud
3688376a6f [tx-robot] updated from transifex 2012-11-23 00:03:17 +01:00
Jörn Friedrich Dreyer
a81d7cd79f introduce Files.containsInvalidCharacters(), use when creating or renaming files 2012-11-22 13:03:17 +01:00
Thomas Mueller
cd495bf9ba some more invalid characters have been added 2012-11-22 11:52:05 +01:00
Bart Visscher
1793e85a52 Also reject names with \ in the name 
fixes issues #435 and #437
 2012-11-22 11:52:05 +01:00
blizzz
d4ec77e08b Merge pull request #482 from eMerzh/fix_prevent_shared_folder 
Show error message to prevent adding a shared folder in the root dir fix...
 2012-11-22 02:40:23 -08:00
Robin Appelman
97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Jenkins for ownCloud
9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Jenkins for ownCloud
568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Robin Appelman
a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Jenkins for ownCloud
e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Bart Visscher
20c24f234f Do the url encoding once, only in breadcrumbs template 
fixes issue #438
 2012-11-16 16:12:28 +01:00
Brice Maron
02bc440900 Show error message to prevent adding a shared folder in the root dir fix #468 2012-11-16 14:59:14 +00:00
Thomas Mueller
4a3b5125cf adding comments on the form array indexes 2012-11-16 11:58:33 +01:00
Thomas Mueller
2b192a75c4 normalize the path once in upload.php is enough - THX Robin for this hint 2012-11-16 11:50:57 +01:00
Thomas Mueller
7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Robin Appelman
f94d62380f Merge branch 'master' into filesystem 2012-11-15 21:27:24 +01:00
Björn Schießle
8a93cc14f6 port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.' 2012-11-15 17:16:18 +01:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
libasys
eda9ce4cf8 Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered. 2012-11-14 16:05:24 +01:00
Jenkins for ownCloud
9c36326e47 [tx-robot] updated from transifex 2012-11-14 00:03:38 +01:00
Jenkins for ownCloud
ac22cd4ab0 [tx-robot] updated from transifex 2012-11-13 00:07:19 +01:00
icewind1991
66dfe270c6 Merge pull request #319 from owncloud/fileactions_newfile 
Add fileactions to new files and folders
 2012-11-12 14:57:06 -08:00
Jörn Friedrich Dreyer
bbef5b377e add i18n for cancel button 2012-11-12 10:52:28 +01:00
Thomas Tanghus
56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Jenkins for ownCloud
7ec0efe5c2 [tx-robot] updated from transifex 2012-11-10 00:02:29 +01:00
Jenkins for ownCloud
b33a443088 [tx-robot] updated from transifex 2012-11-09 10:07:45 +01:00
Jenkins for ownCloud
cb57a20ec2 [tx-robot] updated from transifex 2012-11-09 00:03:49 +01:00
Robin Appelman
41a61bc637 fix undefined index when loading files app 2012-11-08 21:36:13 +01:00
Robin Appelman
d4858527c2 fix rename parameter order 2012-11-08 21:35:30 +01:00
Georg Ehrke
84084b9430 Merge pull request #261 from owncloud/fix_opera_file_delete 
fix file delete in opera - fixes #188
 2012-11-08 08:55:19 -08:00
Robin Appelman
091ff02362 merge master into filesystem 2012-11-08 17:32:00 +01:00
Jenkins for ownCloud
c8f24fa3c9 [tx-robot] updated from transifex 2012-11-08 00:03:43 +01:00
Robin Appelman
37fe9800b6 add actions to newly created files and folders 
closes #231
 2012-11-07 22:13:52 +01:00
Robin Appelman
42935c5564 reuse jquery object when adding files to the file list 2012-11-07 22:06:05 +01:00
Robin Appelman
e14054610f Revert "fix blocking drag & drop upload of folders" 
Fixes #150

This reverts commit 5b2f3c7f72.
 2012-11-07 21:59:18 +01:00
Robin Appelman
961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Björn Schießle
7b51a4e5f9 Merge pull request #306 from owncloud/crumb_drop_fix 
extract the right file name for drag&drop.
 2012-11-07 05:46:18 -08:00
Björn Schießle
168a2c7b6b get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name. 2012-11-07 14:10:10 +01:00
Thomas Müller
d42d88d391 Merge pull request #289 from zimba12/master 
Move function that relativizes dates from Files app to core
 2012-11-07 03:43:59 -08:00
Jenkins for ownCloud
3e01fe1dbb [tx-robot] updated from transifex 2012-11-07 00:02:51 +01:00
Alessandro Cosentino
50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
Jenkins for ownCloud
4d052c1eee [tx-robot] updated from transifex 2012-11-06 00:01:40 +01:00
Arthur Schiwon
85d6a08ae9 prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups 2012-11-05 20:47:26 +01:00
Georg Ehrke
bb0164c9fc fix file delete in opera - fixes #188 2012-11-05 18:42:44 +01:00
Robin Appelman
34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Robin Appelman
4f32f49fb1 this line shouldn't be here 2012-11-04 21:00:36 +01:00
Robin Appelman
f187aa6c93 some more code reuse for fileactions 
also fixes an issue where some fileactions always worked on the last file in the list
 2012-11-04 20:48:38 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Jenkins for ownCloud
17d466b03b [tx-robot] updated from transifex 2012-11-04 00:01:42 +01:00
Jenkins for ownCloud
2f0fd84477 [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
Robin Appelman
4a5a36577e merge master into filesystem 2012-11-02 21:42:29 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Jan-Christoph Borchardt
b05666219e Merge branch 'master' into navigation 2012-11-02 13:36:01 +01:00
Lukas Reschke
d9e9761099 Fix a typo 2012-11-02 00:16:40 +01:00
Lukas Reschke
0f02b7dea6 Add CSRF token 2012-11-02 00:09:28 +01:00
Jenkins for ownCloud
627509875e [tx-robot] updated from transifex 2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt
e66482430e Files: change wording 'From url' to 'From link' 2012-11-01 18:09:16 +01:00
Jan-Christoph Borchardt
01bd0efc36 Merge branch 'master' into navigation 2012-11-01 16:58:06 +01:00
Robin Appelman
51ba12890d Merge branch 'master' into filesystem 2012-11-01 16:16:02 +01:00
Björn Schießle
a9ce43de41 adapted comments to the code changes 2012-11-01 00:20:50 +01:00
Björn Schießle
3878950af4 load logging apps for webdav connections 
Backport of de1b95c
 2012-11-01 00:20:43 +01:00
Jörn Friedrich Dreyer
b76306c144 Merge pull request #155 from owncloud/token-expired-IE 
Send the requesttoken as form value
 2012-10-31 04:50:18 -07:00
Thomas Müller
f851738169 Merge pull request #152 from scambra/webdav-quota 
checking quota in webdav
 2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Lukas Reschke
116fa64294 Change IE8 to "older IE versions" 
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
 2012-10-30 17:29:26 +01:00
Lukas Reschke
ee1e4a7602 Send the requesttoken as form value 
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.

Fixes #110 and related to #122
 2012-10-30 17:19:49 +01:00
Jan-Christoph Borchardt
3db43a9980 Merge branch 'master' into navigation 2012-10-30 14:23:38 +01:00
scambra
d9c14292a4 fix checking quota in webdav, adding a sabredav plugin 2012-10-30 10:32:30 +01:00
blizzz
629d33967c Merge pull request #142 from denis-b/patch-2 
fix moving (in) dirs containing "+"
 2012-10-29 09:25:09 -07:00
denis-b
2aa5a185d4 Update apps/files/ajax/move.php 
fix moving dirs containing "+"
 2012-10-29 16:46:22 +01:00
denis-b
b563935498 Update apps/files/index.php 
fix dirnames containing "+" not displayed
 2012-10-29 16:44:50 +01:00
Bart Visscher
ccbf4e993c Use files remote webdav in compatibility files/webdav.php 2012-10-29 15:04:56 +01:00
Bart Visscher
ab4ade0d24 Remove fixme, problem is solved already 2012-10-29 15:04:55 +01:00
Jenkins for ownCloud
dbb4e74c79 [tx-robot] updated from transifex 2012-10-29 00:02:45 +01:00
Michael Gapczynski
60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt
d7abd44dea merge breadcrumb root into navigation 2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt
7af8c6c3cb first version of breadcrumb 'root', still have a weird feeling about this 2012-10-28 16:05:31 +01:00
Robin Appelman
0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Georg Ehrke
4fd0514f0a don't move file into subdirectory if a file with the same name already exists (fixes #92) 2012-10-28 15:23:40 +01:00
Jan-Christoph Borchardt
cf2a504d42 Merge branch 'master' into navigation 2012-10-28 14:10:10 +01:00
Robin Appelman
fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Robin Appelman
d9ef6da2e4 code style 2012-10-28 12:47:42 +01:00
Bart Visscher
d6953fa5ed Remove wrongly committed files 2012-10-27 17:45:15 +02:00
Jan-Christoph Borchardt
b595ea6efc first icon update. Next step: make sprited hover state (like for home already) 2012-10-27 17:44:24 +02:00
Bart Visscher
894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' 
Conflicts:
	lib/base.php
 2012-10-27 16:33:10 +02:00
Robin Appelman
8973124574 Merge branch 'master' into filesystem 2012-10-27 15:31:27 +02:00
Bart Visscher
939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Robin Appelman
38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Robin Appelman
dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Robin Appelman
cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud
3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Jan-Christoph Borchardt
3eea7aac13 first base on navigation rework, less obtrusive, icons need to be updated, settings moved 2012-10-26 23:38:36 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman
ad5957207d merge master into filesystem 2012-10-26 18:29:24 +02:00
Jan-Christoph Borchardt
f477fda785 separate buttons for new file and upload 2012-10-26 18:16:42 +02:00
Robin Appelman
0e2bf8d373 Merge branch 'master' into filesystem 2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Bart Visscher
43ac43d7af dir in newfile has to start with / 2012-10-25 08:37:13 +02:00
Lukas Reschke
515e1b467e Merge pull request #81 from fmms/master 
Codestyle add some needed spaces.
 2012-10-24 10:16:32 -07:00
Lukas Reschke
694b1d397d Revert e1a4fe9890 2012-10-24 17:58:52 +02:00
Robin Appelman
5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Björn Schießle
07e08d5928 urldecode target directory 2012-10-24 15:37:51 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Lukas Reschke
a7eb56c799 Merge pull request #76 from fmms/master 
checkstyle: some more cleanups
 2012-10-23 23:48:27 -07:00
Jenkins for ownCloud
f33af71eb0 [tx-robot] updated from transifex 2012-10-24 02:08:34 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke
e1a4fe9890 Fix urlencoding in the breadcrumb 2012-10-23 17:50:36 +02:00
Lukas Reschke
73f85c3b81 Merge pull request #62 from fmms/master 
More Checkstyle warnings
 2012-10-23 08:07:01 -07:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes 
check free space using folder's owner
 2012-10-23 07:02:21 -07:00
Arthur Schiwon
6a2a915559 Files: urldecode urlencoded dir names, fixes oc-2111 2012-10-23 13:50:24 +02:00