22a8e7ad55
LDAP: remove restriction from group names to be in line with core behaviour again
2013-05-03 14:11:06 +02:00
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
9c3b83e28c
Fix retrieval of users with multiple backends
2013-05-03 13:50:14 +02:00
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
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
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
f47cecc651
Merge pull request #3220 from owncloud/gitignore-themes
...
ignore themes
2013-05-02 09:14:33 -07:00
8a2ac273eb
don't ignore themes README
2013-05-02 11:51:29 -04:00
371b0d9583
ignore themes
2013-05-02 11:47:38 -04:00
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
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
ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
f363044b3a
Merge pull request #3203 from qzio/patch-1
...
typo fix in a comment.
2013-05-01 04:47:19 -07:00
7f58b0ef7c
typo fix in a comment.
2013-05-01 12:29:15 +03:00
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
3579ba1e41
Merge branch 'master' into files_encryption
...
Conflicts:
apps/user_ldap/l10n/nn_NO.php
core/l10n/es.php
core/l10n/et_EE.php
core/l10n/ja_JP.php
core/l10n/nn_NO.php
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_encryption.po
l10n/cy_GB/files_external.po
l10n/cy_GB/files_sharing.po
l10n/cy_GB/files_trashbin.po
l10n/cy_GB/lib.po
l10n/cy_GB/settings.po
l10n/de_DE/core.po
l10n/es/core.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/gl/core.po
l10n/it/core.po
l10n/ja_JP/core.po
l10n/ja_JP/settings.po
l10n/nn_NO/core.po
l10n/nn_NO/user_ldap.po
l10n/pt_BR/core.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/zh_TW/files_sharing.po
settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
06a5cf70f7
fix duplicate login behavior if user not setup
2013-05-01 02:01:16 +02:00
9f8f052f0d
merged files_trashbin
2013-05-01 01:52:06 +02:00
04b0843bb4
fixed some tests
2013-05-01 01:43:56 +02:00
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
d8e6db5608
Sort priorized languages as defined in the array
...
Also add russian and arabic to the common languages.
2013-05-01 00:34:13 +02:00
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
5deba29bdf
fixed public-keys mount point error
2013-05-01 00:09:55 +02:00
b08179d406
fixed tests after merge against master
2013-04-30 23:58:53 +02:00
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
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
b1c4464eda
improved key length tests
2013-04-30 01:54:19 +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
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
882a747b47
rename folder to tests
2013-04-30 00:34:05 +02:00
d22795d68b
fixed test for crypt and keymanager
...
disabled encryption file proxy in test/lib/cache/file.php
2013-04-29 23:41:49 +02:00
c52fe12537
fixed missing parameter
2013-04-29 23:37:08 +02: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
Arthur Schiwon
Björn Schießle
Jenkins for ownCloud
Tom Needham
Morris Jobke
Michael Gapczynski
Frank Karlitschek
Jan-Christoph Borchardt
Bernhard Posselt
Sam Tuke
joel hansson
Florin Peter
kondou
Robin Appelman
miicha
Thomas Tanghus
Florin Peter