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

733 commits

Author SHA1 Message Date
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
Felix Moeller
36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Jenkins for ownCloud
bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller
6a00a6b9ed Make Jenkins more happy. 
This is NoSpaceAfterComma
 2012-10-23 00:28:12 +02:00
Jenkins for ownCloud
d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Robin Appelman
5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman
f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Jenkins for ownCloud
f5043c0661 [tx-robot] updated from transifex 2012-10-19 02:08:00 +02:00
Robin Appelman
9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Thomas Müller
e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes 
Date l10n fixes
 2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Jenkins for ownCloud
519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb Merge pull request #37 from scambra/js-interpolation-l10n 
use interpolation for some translations in js
 2012-10-17 13:28:46 -07:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f Update Sabre to version 1.7.1 2012-10-17 16:17:36 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
scambra
c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
scambra
5ecce8bfb7 Translate modification date when file is created/uploaded, use same strings as lib/template.php 2012-10-16 20:25:11 +02:00
Jenkins for ownCloud
c3823aa864 [tx-robot] updated from transifex 2012-10-16 02:08:21 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Robin Appelman
5b2f3c7f72 fix blocking drag & drop upload of folders 2012-10-12 15:30:16 +02:00
Lukas Reschke
e5f2d46c6f Sanitize user input 2012-10-12 14:10:05 +02:00
Jenkins for ownCloud
b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman
fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Jenkins for ownCloud
673e3dae3f [tx-robot] updated from transifex 2012-10-11 02:07:32 +02:00
Björn Schießle
41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Thomas Müller
29fa9dfb79 Merge pull request #25 from visit1985/uploadfilesize 
fixed max possible upload size for files app in admin screen
 2012-10-10 00:41:19 -07:00
Jenkins for ownCloud
fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Jenkins for ownCloud
f1fc73ea5b [tx-robot] updated from transifex 2012-10-09 02:07:41 +02:00
Björn Schießle
32e2d7ef8f check if ID was assigned 2012-10-08 17:47:02 +02:00
Björn Schießle
277dd2b0a9 remove debug output 2012-10-08 17:32:04 +02:00
Björn Schießle
2923d24921 add data-id directly after upload/creation to the file list (bugfix for #1917) 2012-10-08 17:30:35 +02:00
Björn Schießle
4dba91838f add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views. 2012-10-08 10:28:29 +02:00
Jenkins for ownCloud
b934668b9e [tx-robot] updated from transifex 2012-10-08 02:07:01 +02:00
Michael Gapczynski
4b446f3edd Revert part of 5beca59b, fixes file upload bug oc-1926 2012-10-07 17:17:37 -04:00
Michael Göhler
7f2208b9a1 fixed max possible upload size for files app in admin screen 
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
 2012-10-07 00:31:07 +02:00
Jenkins for ownCloud
35c5f71989 [tx-robot] updated from transifex 2012-10-06 02:06:49 +02:00
Björn Schießle
4f7c7c615e prevent xss attacks 2012-10-05 17:05:23 +02:00
Björn Schießle
5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle
f4136854b6 stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename" 2012-10-05 11:15:32 +02:00
Björn Schießle
5beca59b9c check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist) 2012-10-05 10:32:38 +02:00
Jenkins for ownCloud
5c042d88ad [tx-robot] updated from transifex 2012-10-04 02:07:35 +02:00
Jenkins for ownCloud
32a6b3b862 [tx-robot] updated from transifex 2012-10-02 23:18:26 +02:00
Björn Schießle
92b37119e3 remove textbox after pressing "enter" even if the name is the same 2012-10-02 18:38:17 +02:00
Jörn Friedrich Dreyer
39735721ec escape identifiers in queries 2012-10-02 14:11:25 +02:00
Frank Karlitschek
3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number. 
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
 2012-10-02 12:10:45 +02:00
Jenkins for ownCloud
f0c4356392 [tx-robot] updated from transifex 2012-10-02 02:06:08 +02:00
Mat Lipe
d1010e58d8 Update apps/files/css/files.css 
Fixed a strange comment issue
 2012-10-01 06:43:31 -05:00
Mat Lipe
2330dd5f21 Update apps/files/css/files.css 
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
 2012-09-30 20:02:52 -05:00
Jenkins for ownCloud
27bd9df027 [tx-robot] updated from transifex 2012-09-28 23:36:09 +02:00
Bart Visscher
dbdf3bde7c Implement route for download in OC_Search_Provider_File 2012-09-28 22:20:17 +02:00
Bart Visscher
c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
Bart Visscher
4e2f575938 Correctly fix oc-1016 and fix downloading of files 2012-09-28 21:18:20 +02:00
Bart Visscher
bf1057143c Merge branch 'master' into routing 
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
 2012-09-28 15:38:49 +02:00
Jenkins for ownCloud
5144d26088 [tx-robot] updated from transifex 2012-09-28 02:06:03 +02:00
Jenkins for ownCloud
09aa95586a [tx-robot] updated from transifex 2012-09-27 02:03:09 +02:00
Robin Appelman
cfbca40fbe fix sharing for newly uploaded or created files 2012-09-26 13:25:11 +02:00
Jenkins for ownCloud
2c00f8c850 [tx-robot] updated from transifex 2012-09-26 13:22:37 +02:00
Björn Schießle
fcd70246db Merge branch 'master' of github.com:owncloud/core 2012-09-26 10:50:06 +02:00
Björn Schießle
c3c6e52104 - take webdav namespace for properties into account 
- change update routine to add the namesapce to all stored properties
 2012-09-26 10:48:30 +02:00
Jenkins for ownCloud
5855355faa [tx-robot] updated from transifex 2012-09-26 02:06:37 +02:00
Jenkins for ownCloud
e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Brice Maron
7aca730f71 Small css fix for button new in files. fix oc-1638 2012-09-24 18:40:59 +00:00
Jenkins for ownCloud
ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Robin Appelman
a22a5d6807 some js style fixes 2012-09-23 03:16:52 +02:00
Jenkins for ownCloud
81ecabb19c [tx-robot] updated from transifex 2012-09-23 02:04:41 +02:00
Jenkins for ownCloud
08132587d1 [tx-robot] updated from transifex 2012-09-22 02:01:19 +02:00
Jenkins for ownCloud
01160d0fb4 [tx-robot] updated from transifex 2012-09-22 01:18:31 +02:00
Thomas Müller
d5055639b2 Merge pull request #15 from scambra/delete-fixes 
use post to delete files, get has a limit and fails with many files
 2012-09-21 16:11:11 -07:00
Thomas Müller
ac69974d73 Merge pull request #17 from scambra/4.5-l10n-fixes 
Fix some untranslated strings
 2012-09-21 16:09:30 -07:00
Tom Needham
bcd3d1116c Change background colour of upload button to be consistant with new button 2012-09-21 12:45:11 +00:00
scambra
107b641708 translate rename and history actions 2012-09-21 12:30:13 +02:00
Jenkins for ownCloud
8f2c76d3da [tx-robot] updated from transifex 2012-09-21 02:04:56 +02:00
Frank Karlitschek
6c644a0c83 change the new button color on mouse over so that the user understands that the button is actually two buttons. 2012-09-20 14:59:28 +02:00
icewind1991
4ea128ee43 Merge pull request #13 from scambra/safari-fixes 
fix js success callback on safari when uploading files
 2012-09-20 02:24:27 -07:00
scambra
1b411df83e use post to delete files, get has a limit and fails with many files 2012-09-20 08:28:35 +02:00
scambra
aee8949c92 fix js success callback on safari when uploading files 2012-09-20 08:02:55 +02:00
Jenkins for ownCloud
7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Bernhard Posselt
1c643ce4bc made upload button the same height in chrome and firefox 
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
 2012-09-19 22:10:13 +00:00
scambra
2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Tom Needham
73ed13fe75 Increase click area of breadcrumb, fix oc-703 2012-09-19 12:31:02 +00:00
Björn Schießle
223bf3e47c fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15) 2012-09-19 14:05:09 +02:00
Björn Schießle
c199c4ad67 Merge branch 'master' of github.com:owncloud/core 2012-09-19 12:03:58 +02:00
Björn Schießle
6596094a28 add generated unique file name to the uploadingFiles list instead of the original name 2012-09-19 12:02:36 +02:00
Björn Schießle
1e880feab1 execute lastAction() before add new one 2012-09-19 11:56:31 +02:00
Jenkins for ownCloud
b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Tom Needham
8a74a39c42 Fix oc-1769, renaming folders with extensions 2012-09-18 22:08:34 +00:00
Jenkins for ownCloud
06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Tom Needham
597fed4fde Fix oc-1726, cannot delete multiple files one by one without refresh 2012-09-17 15:29:15 +00:00
Thomas Müller
21bffbfb69 Enhanced space handling - thx fmms 2012-09-17 11:14:44 +03:00
Thomas Müller
7a7d2a06b3 Adding a few more string to translation 2012-09-17 10:54:06 +03:00
Jenkins for ownCloud
dbd2dea689 [tx-robot] updated from transifex 2012-09-17 02:07:23 +02:00
Robin Appelman
7da3492ab5 show the size of new files when using New->From Url 2012-09-16 17:05:08 +02:00
Jenkins for ownCloud
6568671bdc [tx-robot] updated from transifex 2012-09-16 02:03:40 +02:00
Jenkins for ownCloud
fbdefd5601 [tx-robot] updated from transifex 2012-09-15 02:05:52 +02:00
Jenkins for ownCloud
e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Jenkins for ownCloud
bb0b438ace [tx-robot] updated from transifex 2012-09-13 02:03:54 +02:00
Michael Gapczynski
87b7a23648 Don't get metadata directly from the 'cached' file cache after upload 2012-09-12 17:00:46 -04:00
Jenkins for ownCloud
8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Jenkins for ownCloud
6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
bd720bdf4c [tx-robot] updated from transifex 2012-09-10 02:04:59 +02:00
Robin Appelman
a050915167 move breadcrumb css to core so we can reuse it 2012-09-09 03:00:01 +02:00
Jenkins for ownCloud
5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Bart Visscher
5eba579827 Merge branch 'master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
 2012-09-07 15:51:44 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Michael Gapczynski
73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Michael Gapczynski
17dadd5c8a Don't show the delete all action if delete permission is not granted 2012-09-07 00:02:22 -04:00
Jenkins for ownCloud
a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Michael Gapczynski
d936590f77 Don't pass content for a new text file from UI, fixes bug oc-1660 2012-09-06 16:01:51 -04:00
Michael Gapczynski
837eb1871d Don't delete the file anymore to replace it in the UI, just overwrite it 2012-09-05 22:13:50 -04:00
Michael Gapczynski
a5211e31bc Add permissions to new files/folders, bug fix for oc-1649 2012-09-05 21:47:09 -04:00
Jenkins for ownCloud
af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Michael Gapczynski
a26ea6d65c Implement support for replacing files during upload with the actions: replace, suggest name, and cancel 2012-09-05 00:12:25 -04:00
Thomas Mueller
02f9de55a3 add translation string 2012-09-04 23:42:49 +02:00
Bart Visscher
f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Jenkins for ownCloud
b867b738e8 [tx-robot] updated from transifex 2012-09-04 02:03:21 +02:00
Jenkins for ownCloud
d386e0172a [tx-robot] updated from transifex 2012-09-03 02:07:40 +02:00
Jenkins for ownCloud
2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Jenkins for ownCloud
c0c48cb3ee [tx-robot] updated from transifex 2012-09-01 13:37:28 +02:00
Jenkins for ownCloud
ab090d5277 [tx-robot] updated from transifex 2012-09-01 02:04:00 +02:00
Jenkins for ownCloud
75cd7eacf8 [tx-robot] updated from transifex 2012-08-31 02:07:19 +02:00
Jörn Friedrich Dreyer
73d0a2b8f7 use OC.PERMISSION_X to filter selected drag'n'drop elements 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer
ca8120e9f4 unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer
3ba27e624f unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:11:10 +02:00
Thomas Mueller
077e988136 oc-1548: prevent user from leaving the page while a file upload is in progress 2012-08-31 00:45:03 +02:00
Jörn Friedrich Dreyer
26ef012418 use permissions to quickfix drag selections 2012-08-31 00:13:02 +02:00
Bart Visscher
b483f2aab8 Merge branch 'master' into routing 
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
 2012-08-30 21:49:28 +02:00
Jenkins for ownCloud
898ca364a2 [tx-robot] updated from transifex 2012-08-30 02:06:45 +02:00
Bart Visscher
db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Bart Visscher
cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
 2012-08-29 20:16:39 +02:00
Jenkins for ownCloud
9338d093f9 [tx-robot] updated from transifex 2012-08-29 02:06:48 +02:00
Thomas Mueller
b64229a89e apply coding style 2012-08-29 01:39:42 +02:00
Thomas Mueller
fe49cbafc7 apply coding style 2012-08-29 00:50:12 +02:00
Thomas Mueller
f301bfd8c9 apply coding style 2012-08-29 00:36:27 +02:00
Jenkins for ownCloud
8374a49cc1 [tx-robot] updated from transifex 2012-08-28 02:03:56 +02:00
Jan-Christoph Borchardt
6b5f1ffdb4 upload button improvement, better separation, fix wrap issue 2012-08-27 14:05:18 -07:00
Jenkins for ownCloud
faf702b9e6 [tx-robot] updated from transifex 2012-08-26 19:47:33 +02:00
Jenkins for ownCloud
bae07faa34 [tx-robot] updated from transifex 2012-08-26 01:20:16 +02:00
Jenkins for ownCloud
c82518cb0e [tx-robot] updated from transifex 2012-08-26 00:12:05 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 03:14:26 +02:00
Jenkins for ownCloud
f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00