Florin Peter
|
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 |
Jenkins for ownCloud
|
6163a85668
|
[tx-robot] updated from transifex
|
2013-05-01 02:02:59 +02:00 |
|
Florin Peter
|
3c100af132
|
revert changes to fbbc76f281 because master is very unstable right now
|
2013-05-01 01:38:06 +02:00 |
|
Florin Peter
|
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 |
|
Jenkins for ownCloud
|
5764bf088e
|
[tx-robot] updated from transifex
|
2013-04-30 01:59:18 +02:00 |
|
Jenkins for ownCloud
|
2b36ad292d
|
[tx-robot] updated from transifex
|
2013-04-29 02:00:26 +02:00 |
|
Jenkins for ownCloud
|
901e0c598d
|
[tx-robot] updated from transifex
|
2013-04-28 02:01:38 +02:00 |
|
Jenkins for ownCloud
|
7b2c64236c
|
[tx-robot] updated from transifex
|
2013-04-27 02:24:29 +02:00 |
|
Jenkins for ownCloud
|
7ea2f785f4
|
[tx-robot] updated from transifex
|
2013-04-26 01:58:21 +02:00 |
|
Jenkins for ownCloud
|
a0df5903b0
|
[tx-robot] updated from transifex
|
2013-04-25 01:55:56 +02:00 |
|
Jenkins for ownCloud
|
88fd3b088d
|
[tx-robot] updated from transifex
|
2013-04-24 17:46:20 +02:00 |
|
Jenkins for ownCloud
|
a7b4469b2e
|
[tx-robot] updated from transifex
|
2013-04-24 02:01:20 +02:00 |
Markus Goetz
|
6141b24d96
|
External Storage: Check for curl in PHP
If no curl is found, disable the storage that needs it.
|
2013-04-23 12:36:30 +02:00 |
|
Jenkins for ownCloud
|
05ab9d2de7
|
[tx-robot] updated from transifex
|
2013-04-23 02:00:31 +02:00 |
|
Jenkins for ownCloud
|
cbd8b792d9
|
[tx-robot] updated from transifex
|
2013-04-18 02:09:28 +02:00 |
|
Jenkins for ownCloud
|
37868818ff
|
[tx-robot] updated from transifex
|
2013-04-17 02:29:17 +02:00 |
|
Jenkins for ownCloud
|
19afc216cf
|
[tx-robot] updated from transifex
|
2013-04-13 02:15:54 +02:00 |
|
Jenkins for ownCloud
|
c06bc81c79
|
[tx-robot] updated from transifex
|
2013-04-10 02:09:39 +02:00 |
|
Jenkins for ownCloud
|
5ef389610f
|
[tx-robot] updated from transifex
|
2013-04-09 02:14:02 +02:00 |
|
Jenkins for ownCloud
|
ccde0212b1
|
[tx-robot] updated from transifex
|
2013-04-08 02:18:28 +02:00 |
Lukas Reschke
|
6552996734
|
Set file perms to 0640 of mount.json - fixes #2718
|
2013-04-06 13:21:21 +03:00 |
|
Jenkins for ownCloud
|
c745bfa821
|
[tx-robot] updated from transifex
|
2013-04-05 00:22:48 +02:00 |
|
Jenkins for ownCloud
|
10e37e1553
|
[tx-robot] updated from transifex
|
2013-04-03 00:04:02 +02:00 |
|
Jenkins for ownCloud
|
cfd8b911b6
|
[tx-robot] updated from transifex
|
2013-03-31 00:03:46 +01:00 |
|
Jenkins for ownCloud
|
5e74ec26a8
|
[tx-robot] updated from transifex
|
2013-03-30 00:06:29 +01:00 |
Arthur Schiwon
|
599778b153
|
Files External: show display names instead of internal user names in Settings UI
|
2013-03-27 19:07:33 +01:00 |
|
Jenkins for ownCloud
|
0c666cb764
|
[tx-robot] updated from transifex
|
2013-03-27 00:11:05 +01:00 |
|
Jenkins for ownCloud
|
63e3f978ab
|
[tx-robot] updated from transifex
|
2013-03-20 00:02:44 +01:00 |
|
Jenkins for ownCloud
|
63ca84e7bc
|
[tx-robot] updated from transifex
|
2013-03-19 00:05:52 +01:00 |
|
Jenkins for ownCloud
|
1427af4a22
|
[tx-robot] updated from transifex
|
2013-03-16 22:18:26 +01:00 |
sherbrecher
|
ec45a8433d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
apps/files_external/templates/settings.php
|
2013-03-15 17:50:02 +01:00 |
|
sherbrecher
|
d2b3a9fb3b
|
Update settings.php
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
|
2013-03-15 15:09:55 +01:00 |
|
Jenkins for ownCloud
|
9a0cb2ccaa
|
[tx-robot] updated from transifex
|
2013-03-14 00:06:29 +01:00 |
|
Jenkins for ownCloud
|
f3a2daaa9d
|
[tx-robot] updated from transifex
|
2013-03-13 00:06:21 +01:00 |
|
Jenkins for ownCloud
|
569c7ab138
|
[tx-robot] updated from transifex
|
2013-03-12 00:14:05 +01:00 |
Robin Appelman
|
be4806d031
|
Store the global mount configuration file in the datadir
|
2013-03-10 02:25:03 +01:00 |
|
Jenkins for ownCloud
|
308c85090e
|
[tx-robot] updated from transifex
|
2013-03-08 00:26:35 +01:00 |
|
Jenkins for ownCloud
|
97222b1de5
|
[tx-robot] updated from transifex
|
2013-03-07 00:16:59 +01:00 |
|
Jenkins for ownCloud
|
c1a32b5073
|
[tx-robot] updated from transifex
|
2013-03-06 00:08:33 +01:00 |
Bernhard Posselt
|
10b108ed8a
|
Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
|
2013-03-04 12:59:39 -08:00 |
|
Jenkins for ownCloud
|
844e18a8b1
|
[tx-robot] updated from transifex
|
2013-03-03 00:06:56 +01:00 |
|
Lukas Reschke
|
d3e88e6a8c
|
Remove uneeded sanitizeHTML
|
2013-03-02 12:44:53 +01:00 |
j-ed
|
2aaf38b5d3
|
Update app.php
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
|
2013-03-02 12:12:33 +01:00 |
|
Jenkins for ownCloud
|
c9d9c381ec
|
[tx-robot] updated from transifex
|
2013-03-02 00:05:42 +01:00 |
|
Lukas Reschke
|
5e7970f761
|
Merge master
|
2013-03-01 23:11:03 +01:00 |
|
Jenkins for ownCloud
|
d20fd7e9a6
|
[tx-robot] updated from transifex
|
2013-03-01 00:07:02 +01:00 |
|
Lukas Reschke
|
dee16deacd
|
Merge master
|
2013-02-28 20:03:06 +01:00 |
|
Jenkins for ownCloud
|
a93b5b47a1
|
[tx-robot] updated from transifex
|
2013-02-28 00:05:40 +01:00 |
|
Lukas Reschke
|
236507a19f
|
[files_external] From echo to p
|
2013-02-27 21:31:27 +01:00 |
Michael Gapczynski
|
766a301a6b
|
Merge pull request #1031 from owncloud/external_storage_ui_feedback
External Storage UI Improvements
|
2013-02-27 10:00:22 -08:00 |