a203a4a1c7
add support to mount a specific folder from dropbox
2012-10-06 13:44:53 +02:00
54695b11eb
test case for dropbox storage
2012-10-06 13:43:34 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
68bb3809c7
LDAP: we're good for 0.3 now. No code change
2012-10-06 00:38:10 +02:00
4f7c7c615e
prevent xss attacks
2012-10-05 17:05:23 +02:00
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
c99f62891a
breadcrumbs fixed for public share view
2012-10-05 15:06:59 +02:00
0d081ac5ac
register download action for directories
2012-10-05 14:28:23 +02:00
ef8a4a1629
register download action for files
2012-10-05 14:28:23 +02:00
99f4d949c1
fix download link for single files in publicly shared directory
2012-10-05 14:28:23 +02:00
72a48ca35e
fix download of single publically shared files.
2012-10-05 12:01:18 +02:00
dcad7aec82
fixed download of complete publically shared folder
2012-10-05 11:38:00 +02:00
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
a611ce4f33
baseDir has to be the whole path to work with shared directories below the root directory.
2012-10-05 10:32:38 +02:00
b88a61c633
no content area, it overlaps the file list
2012-10-05 10:32:38 +02:00
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
4fd53eca06
[tx-robot] updated from transifex
2012-10-05 02:06:09 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
51321526e2
Prevent displaying errors if public link url parameters are incorrect
2012-10-03 16:14:54 -04:00
6fada7a4c0
[tx-robot] updated from transifex
2012-10-03 02:05:14 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
7abe1360b2
l18n support added to files_external/js
2012-10-02 23:09:28 +02:00
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +02:00
39735721ec
escape identifiers in queries
2012-10-02 14:11:25 +02:00
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
550813ce41
don't use the complete path but the basename if the file/foder has no extension. Otherwise
...
we can end up with different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
538c2662a9
Merge pull request #23 from lipemat/patch-1
...
Fix the File Upload Button in Chrome
Arrow was showing under the button in Chrome. With this commit it should be shown correctly.
2012-10-01 10:28:51 -07:00
33e9399ba3
LDAP: fix sharing doesn't work with ldap groups, oc-1819
2012-10-01 18:27:58 +02:00
b23ad579dc
Sharing: backward compatibility to links from OC 4.0.
2012-10-01 14:39:53 +02:00
d1010e58d8
Update apps/files/css/files.css
...
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
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
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
4e2f575938
Correctly fix oc-1016 and fix downloading of files
2012-09-28 21:18:20 +02:00
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
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
232936b99a
This .gitkeep is unneeded
2012-09-27 22:24:56 +02:00
3fa4b34a69
LDAP: comparison, not assignment. Thanks to Manuel Delgado
2012-09-27 19:52:52 +02:00
aa9ffd119a
check if file really exist before add/remove it
2012-09-27 12:37:23 +02:00
a56f2ec183
only upload valid ssl root certificates
2012-09-27 11:21:29 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
21c6cc45e6
take '\' on windows systems into account to prevent file deletion above upload direectory
2012-09-26 23:08:40 +02:00
9ab887fed5
fix security issue, don't allow to go back in the path
2012-09-26 21:35:14 +02:00
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
0192d920f0
Sharing: write update errors to logfile; do not die on errors
2012-09-26 12:27:43 +02:00
fcd70246db
Merge branch 'master' of github.com:owncloud/core
2012-09-26 10:50:06 +02:00
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
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
7b8c7aaf0d
Add missing Sharing permission
2012-09-25 18:01:56 +02:00
80fde2d8d1
Sharing update: take over reshares and thus don't fail
2012-09-25 12:14:20 +02:00
25499644e3
Merge branch 'master' of github.com:owncloud/core
2012-09-25 12:02:02 +02:00
90a1bd5721
seperate the form to set up the mount points and the form to upload ssl certificates
2012-09-25 12:01:09 +02:00
15e02726d7
Fix files_sharing update script, by making filesystem and users available
2012-09-25 11:47:53 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
7aca730f71
Small css fix for button new in files. fix oc-1638
2012-09-24 18:40:59 +00:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
b4de89e6b4
Sanitize download URL
...
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
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
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
8cfa618df5
Catch exceptions in upgrading files_sharing, skip the errors for now
2012-09-21 23:31:44 +02:00
11bdc8baa8
Fix the mimetype filter in OC_Share_Backend_File
2012-09-21 23:17:12 +02:00
ee77ef86d3
Check mimetype filter in file share backend
2012-09-21 21:32:09 +02:00
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
bcd3d1116c
Change background colour of upload button to be consistant with new button
2012-09-21 12:45:11 +00:00
2a7a928ae9
LDAP: replace expensive recursiveArraySearch with direct SQL search, leading to a performance boost. Imorives UX especially on directories with tons of users, solves complains on ML and probably fixes oc.1080
2012-09-21 13:03:28 +02:00
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
57c02d16ca
LDAP: add forgotten class, fixes oc-1803
2012-09-20 16:59:28 +02:00
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
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
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +02:00
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
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
f9127192da
Fix styling of public shared files download button
2012-09-19 19:51:52 +00:00
d7b878b303
Dynamicly resize public shared images
2012-09-19 19:46:49 +00:00
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
5f997021d1
Fix syntax bug
2012-09-19 21:29:16 +02:00
ee32d1aad5
Fix versioning of shared files
2012-09-19 21:29:16 +02:00
01ce2babd1
Fix sharing of single files, target name was not correct
2012-09-19 21:29:16 +02:00
f66c441f77
LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625
2012-09-19 15:37:05 +02:00
73ed13fe75
Increase click area of breadcrumb, fix oc-703
2012-09-19 12:31:02 +00:00
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
c199c4ad67
Merge branch 'master' of github.com:owncloud/core
2012-09-19 12:03:58 +02:00
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +02:00
1e880feab1
execute lastAction() before add new one
2012-09-19 11:56:31 +02:00
39e587b52c
Remove the content and table to prevent covering the download link
2012-09-19 00:27:53 -04:00
749b5b52ca
Show preview for public folder links
2012-09-18 23:56:14 -04:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
8a74a39c42
Fix oc-1769, renaming folders with extensions
2012-09-18 22:08:34 +00:00
842cd57fa7
use more oc file operations instead of plain PHP functions
2012-09-18 17:04:22 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
6444c27e6a
LDAP: fix MySQL-query with DUAL table by removing wrong backticks. Got broke when they were added to SQL queries.
2012-09-17 22:50:08 +02:00
b04c7175dc
Check if the versioned file exists before trying to do the versioning
...
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
597fed4fde
Fix oc-1726, cannot delete multiple files one by one without refresh
2012-09-17 15:29:15 +00:00
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +03:00
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +03:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
89fb5d47a4
Add chosen script and style, bug fix for oc-1745
2012-09-16 13:27:27 -04:00
f17555285e
Merge branch 'master' of https://github.com/owncloud/core
2012-09-16 17:14:04 +02:00
9d533fcd72
add a legend tag. it´s consistent and looks nicer
2012-09-16 17:13:16 +02:00
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +02:00
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
f8d907df71
Set configured to true after configuring Dropbox storage
2012-09-12 21:30:04 -04:00
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
10b74f9d05
Don't hide errors doing the versioning copy
2012-09-13 00:09:00 +02:00
87b7a23648
Don't get metadata directly from the 'cached' file cache after upload
2012-09-12 17:00:46 -04:00
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
ff6141b1e9
Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again
2012-09-10 21:57:13 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
deb1fbf9a1
Provide update script for files sharing
2012-09-09 18:29:47 -04:00
5c5955b31f
Disable link sharing for folders temporarily - next release
2012-09-09 14:52:03 -04:00
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
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
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
785aa751bb
Whitespace fixes
2012-09-07 14:10:43 +02:00
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
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
17dadd5c8a
Don't show the delete all action if delete permission is not granted
2012-09-07 00:02:22 -04:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 -04:00
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
a5211e31bc
Add permissions to new files/folders, bug fix for oc-1649
2012-09-05 21:47:09 -04:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
aa8cee1afa
I don't think this file was meant to be commited
2012-09-05 19:42:26 +02:00
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 -04:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
02f9de55a3
add translation string
2012-09-04 23:42:49 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
745f279fbc
make use of OC_User::getHome in files_external app
2012-09-04 15:56:00 +02:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
c6858fb5ca
Add additional html tags to public links template for previewers
2012-09-03 13:14:23 -04:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
29d1e8087d
Implement generateTarget for file sharing backend
2012-09-01 13:46:57 -04:00
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
73d0a2b8f7
use OC.PERMISSION_X to filter selected drag'n'drop elements
2012-08-31 01:11:10 +02:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
077e988136
oc-1548: prevent user from leaving the page while a file upload is in progress
2012-08-31 00:45:03 +02:00
26ef012418
use permissions to quickfix drag selections
2012-08-31 00:13:02 +02:00
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
7027742bd6
LDAP settings, add missing p tags
2012-08-30 15:06:33 +02:00
1a6f34865c
LDAP: on upgrade update user cols in database only when necessary
2012-08-30 15:03:02 +02:00
2440e500b8
LDAP: on upgrade set homeDirs of users where it is not set. Avoids new folders (empty), depending on the configuration
2012-08-30 14:55:07 +02:00
f2534e7428
Show notification that no preview is available if no previewer is found for a public link to a file
2012-08-29 21:12:23 -04:00
756b514fee
Check if file source exists before searching for link
2012-08-29 21:12:23 -04:00
898ca364a2
[tx-robot] updated from transifex
2012-08-30 02:06:45 +02:00
c958d5ba80
Fix filesystem setup for shared public link with logged in user
2012-08-29 21:35:55 +02:00
8d490b9880
Fix shared storage working with user backend defined data directories
2012-08-29 14:39:13 -04:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
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
224e55e590
LDAP: fix debug message with undefined variable
2012-08-29 19:37:18 +02:00
741a21292e
LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method.
2012-08-29 19:37:18 +02:00
8be8f6fff2
LDAP: Remove unnecessary debug output, fixes a Notice
2012-08-29 19:37:18 +02:00
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
b64229a89e
apply coding style
2012-08-29 01:39:42 +02:00
4c4aa92eef
LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master.
2012-08-29 01:23:51 +02:00
fe49cbafc7
apply coding style
2012-08-29 00:50:12 +02:00
f301bfd8c9
apply coding style
2012-08-29 00:36:27 +02:00
da44e5405a
Fix typo
2012-08-28 11:12:18 -04:00
c53310e49b
Remove unnecessary ajax file from files_sharing
2012-08-28 09:57:09 -04:00
1e2ba8398d
Remove old database xml file for files_sharing, bump version number
2012-08-28 09:55:24 -04:00
0a1f24142a
Change public file from get.php to public.php
2012-08-28 09:53:31 -04:00
42a9969304
LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use
2012-08-28 14:24:50 +02:00
549f69cbc1
marked as shipped app
2012-08-28 07:35:31 +02:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
6b5f1ffdb4
upload button improvement, better separation, fix wrap issue
2012-08-27 14:05:18 -07:00
c2290a542e
add deprecated warning
2012-08-27 22:58:50 +02:00
5985d00c6f
LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected.
2012-08-27 21:32:56 +02:00
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
184438224c
restore the webdavauth app
2012-08-26 17:51:01 +02:00
72e9a2ce57
moved to apps repository
2012-08-26 17:30:07 +02:00
32bad688bd
Wrong function
...
https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
2012-08-26 17:22:41 +02:00
2028c81161
OC_Util is better thank OCP\JSON because it'll redirect the user to the index.php instead of displaying an error
2012-08-26 16:08:58 +02:00
4885a52ba4
Check if app is enabled
2012-08-26 16:05:40 +02:00
bcd86bfd02
Remove some empty lines
2012-08-26 15:43:34 +02:00
726be04e5f
Use sanitizeHTML instead of strip_tags
2012-08-26 15:41:41 +02:00
922982f070
[tx-robot] updated from transifex
2012-08-26 02:22:02 +02:00
ad66d6d5e9
translation support for pdfviewer
2012-08-26 02:17:28 +02:00
8e090d8f67
added translation for odfviewer
2012-08-26 02:17:28 +02:00
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
814cb6bbfa
translation support for text editor and impress added
2012-08-26 00:39:23 +02:00
c82518cb0e
[tx-robot] updated from transifex
2012-08-26 00:12:05 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
e8ffd5c042
use limit parameter instead of LIMIT SQL for vcard
2012-08-25 02:27:43 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
ee04b626b4
Correct variable name.
2012-08-24 17:23:01 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
3148edbdef
Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders.
2012-08-24 10:01:46 -04:00
63d6884e23
Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de)
2012-08-24 15:00:53 +02:00
eadb894eff
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
2012-08-24 15:00:53 +02:00
9188d2a844
Add a missing exit();
2012-08-24 15:00:53 +02:00
4e5291c77a
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-24 15:00:53 +02:00
1d530192b9
Disable user enumeration
2012-08-24 15:00:53 +02:00
9917c611d3
Disable listing of all users
2012-08-24 15:00:52 +02:00
78e8cbd52c
Check if webfinger is enabled
2012-08-24 14:58:48 +02:00
ffb55d5a17
Don't return file handle if the mode supports writing and the file is not writable
...
Conflicts:
apps/files_sharing/sharedstorage.php
2012-08-24 14:58:48 +02:00
3644517b01
Missed an "echo"
2012-08-24 14:58:47 +02:00
4f7e4c20d2
Sanitize user input
2012-08-24 14:58:47 +02:00
2832311640
fix label for versioning in admin settings
2012-08-24 14:54:17 +02:00
5e9f92e5dd
Calendar: remove double html encoding
2012-08-24 14:54:17 +02:00
646bc1fc24
Contacts: Fix no active Addressbooks
2012-08-24 14:54:16 +02:00
2af7473651
LDAP: sanitize base, user and group trees. fixes oc-1302
2012-08-24 14:54:16 +02:00
46d6fd15e4
Implemented sharing api for CalDAV.
2012-08-24 14:26:06 +02:00
d1421ca5ab
White-space.
2012-08-24 13:49:56 +02:00
b716296203
Forgot to reenable the export plugin.
2012-08-24 05:04:45 +02:00
953f9d95f8
Implemented sharing api for CardDAV. Next step CalDAV.
2012-08-24 04:56:21 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
2cffcfbc03
Permission checking for shared addressbooks/contacts.
2012-08-23 22:03:36 +02:00
f568ba9c8c
Removed redundant __CLASS__ in logging.
2012-08-23 22:03:36 +02:00
fdb4c820d3
Fix for deleting queued contacts.
2012-08-23 22:03:35 +02:00
394617e0b6
Missing IM variable assignments.
2012-08-23 22:03:35 +02:00
Robin Appelman
Jenkins for ownCloud
Arthur Schiwon
Björn Schießle
Michael Gapczynski
Jörn Friedrich Dreyer
Frank Karlitschek
Lukas Reschke
Mat Lipe
Bart Visscher
Brice Maron
Tom Needham
scambra
icewind1991
Bernhard Posselt
Sam Tuke
Georg Ehrke
Jan-Christoph Borchardt
jfd
Thomas Tanghus