Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Jenkins for ownCloud
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
Tom Needham
cb5a69dd22
Merge pull request #3216 from owncloud/fix-api-3rdparty
...
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
Thomas Müller
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
Morris Jobke
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
Frank Karlitschek
f47cecc651
Merge pull request #3220 from owncloud/gitignore-themes
...
ignore themes
2013-05-02 09:14:33 -07:00
Jan-Christoph Borchardt
8a2ac273eb
don't ignore themes README
2013-05-02 11:51:29 -04:00
Jan-Christoph Borchardt
371b0d9583
ignore themes
2013-05-02 11:47:38 -04:00
Bernhard Posselt
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
Bernhard Posselt
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
Bernhard Posselt
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
Frank Karlitschek
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
Michael Gapczynski
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
Michael Gapczynski
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
Jenkins for ownCloud
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
Michael Gapczynski
657ff34c6c
Merge pull request #3147 from owncloud/storage-mkdir-root
...
Dont task external storages with creating their own root
2013-05-01 16:35:44 -07:00
Frank Karlitschek
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
Morris Jobke
f363044b3a
Merge pull request #3203 from qzio/patch-1
...
typo fix in a comment.
2013-05-01 04:47:19 -07:00
joel hansson
7f58b0ef7c
typo fix in a comment.
2013-05-01 12:29:15 +03:00
Jenkins for ownCloud
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
Robin Appelman
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
FlorinPeter
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
FlorinPeter
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
Jenkins for ownCloud
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
miicha
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
Florin Peter
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
Jan-Christoph Borchardt
a5c72f1ad2
Merge pull request #3159 from owncloud/reword
...
Reword sentence and move HTML out of translation
2013-04-29 04:39:51 -07:00
Morris Jobke
cc9933be1c
Merge pull request #3160 from owncloud/remove-onclick
...
Remove onclick
2013-04-29 03:58:44 -07:00
Jenkins for ownCloud
2b36ad292d
[tx-robot] updated from transifex
2013-04-29 02:00:26 +02:00
Lukas Reschke
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
Lukas Reschke
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
Lukas Reschke
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
Lukas Reschke
e3c9554856
Reword sentence and move HTML out of translation
2013-04-29 00:13:23 +03:00
Florin Peter
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
Florin Peter
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
Florin Peter
26e5ef193d
restore fixed
2013-04-28 20:48:30 +02:00
Florin Peter
228c501515
fixed some problems and broken code
2013-04-28 20:48:30 +02:00
Björn Schießle
680ba4bea1
restore encryption keys from trash bin (development snapshot)
2013-04-28 20:48:29 +02:00
Björn Schießle
cb65b7ca9d
move encryption keys to trash bin
2013-04-28 20:45:51 +02:00
Frank Karlitschek
1f194b7bdc
Merge pull request #3154 from owncloud/fix_3153
...
Change app identifier for core api routes
2013-04-28 03:51:21 -07:00
Jenkins for ownCloud
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
Lukas Reschke
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
Tom Needham
1e1a8b2f3c
Fix typo
2013-04-27 17:52:37 +01:00
Tom Needham
66053693f8
Code style for ocs/routes.php
2013-04-27 17:51:36 +01:00
Tom Needham
59db762dfa
Change app identifier for core api routes
2013-04-27 17:45:44 +01:00
Tom Needham
d33f6b9af6
Use correct variable when checking auth
2013-04-27 17:45:23 +01:00
Morris Jobke
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
Morris Jobke
86455d6ac3
Merge pull request #3145 from owncloud/magic_quotes_gpc-check
...
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
Raghu Nayyar
2bcb64e781
Merge pull request #3114 from owncloud/update-notification
...
Add an update notification
2013-04-26 21:12:38 -07:00
Jenkins for ownCloud
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00