4ab3614248
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
...
Trashbin for encryption keys now against master
2013-04-30 11:39:21 -07:00
b464970142
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
...
fix for infinite loop causing on files_encryption branch when testing
2013-04-29 17:05:41 -07:00
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
fbf9233648
fixing mimetype for "new" ms office formats
...
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
2013-04-30 02:38:05 +03:00
048569754a
Add compatibility function for outerHTML
2013-04-29 22:35:37 +02:00
f55aaad858
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
2013-04-29 15:43:48 +02:00
a5c72f1ad2
Merge pull request #3159 from owncloud/reword
...
Reword sentence and move HTML out of translation
2013-04-29 04:39:51 -07:00
cc9933be1c
Merge pull request #3160 from owncloud/remove-onclick
...
Remove onclick
2013-04-29 03:58:44 -07:00
2b36ad292d
[tx-robot] updated from transifex
2013-04-29 02:00:26 +02:00
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
e3c9554856
Reword sentence and move HTML out of translation
2013-04-29 00:13:23 +03:00
7a3ecd0429
delete and restore of versions and share-keys now works
...
fix restore of the same file name
2013-04-28 20:48:30 +02:00
5e11948598
added handling for share-keys
...
this works only with latest files_encryption branch up from 813641e6e8
2013-04-28 20:48:30 +02:00
26e5ef193d
restore fixed
2013-04-28 20:48:30 +02:00
228c501515
fixed some problems and broken code
2013-04-28 20:48:30 +02:00
680ba4bea1
restore encryption keys from trash bin (development snapshot)
2013-04-28 20:48:29 +02:00
cb65b7ca9d
move encryption keys to trash bin
2013-04-28 20:45:51 +02:00
1f194b7bdc
Merge pull request #3154 from owncloud/fix_3153
...
Change app identifier for core api routes
2013-04-28 03:51:21 -07:00
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
51a1f41225
Merge pull request #3121 from owncloud/ocs_fix_api_response
...
Fix the api response when a shipped and third party app both fail.
2013-04-27 10:05:06 -07:00
1e1a8b2f3c
Fix typo
2013-04-27 17:52:37 +01:00
66053693f8
Code style for ocs/routes.php
2013-04-27 17:51:36 +01:00
59db762dfa
Change app identifier for core api routes
2013-04-27 17:45:44 +01:00
d33f6b9af6
Use correct variable when checking auth
2013-04-27 17:45:23 +01:00
0e5eccbdbc
Merge pull request #3146 from owncloud/restart-hint
...
web_server_restart needs to be true to display the hint
2013-04-27 08:19:08 -07:00
86455d6ac3
Merge pull request #3145 from owncloud/magic_quotes_gpc-check
...
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
2bcb64e781
Merge pull request #3114 from owncloud/update-notification
...
Add an update notification
2013-04-26 21:12:38 -07:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
c05195a46d
Dont task external storages with creating their own root
2013-04-26 17:40:31 +02:00
8a838e0e03
Code style
2013-04-26 17:30:55 +02:00
7db5ec30c3
Add check for Magic Quotes
2013-04-26 16:32:58 +02:00
f5b0d904fb
web_server_restart needs to be true to display the hint
2013-04-26 16:21:56 +02:00
5474fea1f6
Merge pull request #3136 from owncloud/mount-cleanup
...
Separation of mount management
2013-04-26 06:55:21 -07:00
d825669265
Merge pull request #3002 from owncloud/priorize_common_languages
...
Priorize common languages.
2013-04-26 06:30:59 -07:00
686f836736
Merge pull request #3026 from owncloud/cli-no-session
...
Don't start the session when in cli mode
2013-04-26 06:20:39 -07:00
948e3d5b7c
Merge pull request #3028 from owncloud/simplyfy-resource-locating
...
Simplify resource locating in templatelayout
2013-04-26 05:56:09 -07:00
172499d5f3
Don't start the session when in cli mode
2013-04-26 14:53:59 +02:00
7e89a017bf
Merge pull request #2955 from owncloud/displaynames-numeric
...
Fix OC_User::getDisplaynames when using numeric user id's
2013-04-26 05:51:07 -07:00
67b6ee661d
Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen
...
Improve the password reset screen.
2013-04-26 05:33:09 -07:00
b46f6e4f97
Simplify app js locating for layout pages
2013-04-26 14:21:51 +02:00
ea4ae857a1
Simplify app css locating for layout pages
2013-04-26 14:21:50 +02:00
710acde9a1
Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
...
Overwrite host and webroot when forcessl is enabled
2013-04-26 05:10:49 -07:00
26e2672a5a
Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
...
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
d6978d0c45
[tx-robot] updated from transifex
2013-04-26 10:06:52 +02:00
9fe3022c93
adding resource type
2013-04-26 09:59:00 +02:00
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
bcd9a69033
Cache: seperate handing of numeric storage id's to it's own class
2013-04-26 00:00:18 +02:00
FlorinPeter
Jenkins for ownCloud
miicha
Thomas Tanghus
Florin Peter
Jan-Christoph Borchardt
Morris Jobke
Lukas Reschke
Björn Schießle
Frank Karlitschek
Tom Needham
Raghu Nayyar
Robin Appelman
Bart Visscher
icewind1991