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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|