Sam Tuke
|
bf69677933
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js
apps/files/js/keyboardshortcuts.js
apps/files/l10n/da.php
apps/files/l10n/el.php
apps/files/l10n/eu.php
apps/files/l10n/hu_HU.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/gl.php
apps/files_external/l10n/uk.php
apps/files_external/personal.php
apps/files_external/settings.php
apps/files_external/templates/settings.php
apps/files_sharing/public.php
apps/user_ldap/l10n/gl.php
apps/user_ldap/l10n/uk.php
apps/user_ldap/lib/access.php
apps/user_webdavauth/l10n/eo.php
apps/user_webdavauth/l10n/eu.php
apps/user_webdavauth/l10n/fr.php
apps/user_webdavauth/l10n/gl.php
apps/user_webdavauth/l10n/sl.php
apps/user_webdavauth/l10n/tr.php
apps/user_webdavauth/l10n/uk.php
apps/user_webdavauth/l10n/zh_CN.php
core/ajax/share.php
core/css/styles.css
core/l10n/ca.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/eu.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/is.php
core/l10n/it.php
core/l10n/nl.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ru.php
core/l10n/sl.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/zh_CN.php
core/templates/installation.php
core/templates/login.php
l10n/ar/files_external.po
l10n/ar/settings.po
l10n/bg_BG/files_external.po
l10n/bg_BG/settings.po
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/settings.po
l10n/da/files.po
l10n/da/files_external.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files_external.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files_external.po
l10n/de_DE/settings.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/el/settings.po
l10n/eo/core.po
l10n/eo/files_external.po
l10n/eo/settings.po
l10n/eo/user_webdavauth.po
l10n/es/core.po
l10n/es/files_external.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files_external.po
l10n/es_AR/settings.po
l10n/et_EE/files_external.po
l10n/et_EE/settings.po
l10n/et_EE/user_webdavauth.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/eu/settings.po
l10n/eu/user_webdavauth.po
l10n/fa/files_external.po
l10n/fa/settings.po
l10n/fi_FI/files_external.po
l10n/fi_FI/settings.po
l10n/fr/core.po
l10n/fr/files_external.po
l10n/fr/settings.po
l10n/fr/user_webdavauth.po
l10n/gl/core.po
l10n/gl/files_external.po
l10n/gl/settings.po
l10n/gl/user_ldap.po
l10n/gl/user_webdavauth.po
l10n/he/core.po
l10n/he/files_external.po
l10n/he/settings.po
l10n/hi/files_external.po
l10n/hi/settings.po
l10n/hr/files_external.po
l10n/hr/settings.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/ia/files_external.po
l10n/ia/settings.po
l10n/id/files_external.po
l10n/id/settings.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_encryption.po
l10n/is/files_external.po
l10n/is/files_sharing.po
l10n/is/files_versions.po
l10n/is/lib.po
l10n/is/settings.po
l10n/is/user_ldap.po
l10n/is/user_webdavauth.po
l10n/it/core.po
l10n/it/files_external.po
l10n/it/settings.po
l10n/ja_JP/core.po
l10n/ja_JP/files_external.po
l10n/ja_JP/settings.po
l10n/ka_GE/files_external.po
l10n/ka_GE/settings.po
l10n/ko/core.po
l10n/ko/files_external.po
l10n/ko/settings.po
l10n/ko/user_ldap.po
l10n/ko/user_webdavauth.po
l10n/ku_IQ/files_external.po
l10n/ku_IQ/settings.po
l10n/lb/files_external.po
l10n/lb/settings.po
l10n/lt_LT/files_external.po
l10n/lt_LT/settings.po
l10n/lv/files_external.po
l10n/lv/settings.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/mk/settings.po
l10n/ms_MY/files_external.po
l10n/ms_MY/settings.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/nb_NO/settings.po
l10n/nl/core.po
l10n/nl/files_external.po
l10n/nl/settings.po
l10n/nn_NO/files_external.po
l10n/nn_NO/settings.po
l10n/oc/files_external.po
l10n/oc/settings.po
l10n/pl/core.po
l10n/pl/files_external.po
l10n/pl/settings.po
l10n/pl_PL/files_external.po
l10n/pl_PL/settings.po
l10n/pt_BR/core.po
l10n/pt_BR/files_external.po
l10n/pt_BR/settings.po
l10n/pt_PT/core.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ro/settings.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/settings.po
l10n/ru_RU/files.po
l10n/ru_RU/files_external.po
l10n/ru_RU/settings.po
l10n/si_LK/files_external.po
l10n/si_LK/settings.po
l10n/sk_SK/core.po
l10n/sk_SK/files_external.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_webdavauth.po
l10n/sl/core.po
l10n/sl/files_external.po
l10n/sl/settings.po
l10n/sl/user_webdavauth.po
l10n/sq/core.po
l10n/sq/files_external.po
l10n/sq/settings.po
l10n/sq/user_ldap.po
l10n/sq/user_webdavauth.po
l10n/sr/core.po
l10n/sr/files_external.po
l10n/sr/settings.po
l10n/sr@latin/files_external.po
l10n/sr@latin/settings.po
l10n/sv/files_external.po
l10n/sv/settings.po
l10n/ta_LK/files_external.po
l10n/ta_LK/settings.po
l10n/ta_LK/user_ldap.po
l10n/ta_LK/user_webdavauth.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_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/th_TH/settings.po
l10n/th_TH/user_webdavauth.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/settings.po
l10n/tr/user_webdavauth.po
l10n/uk/core.po
l10n/uk/files_external.po
l10n/uk/settings.po
l10n/uk/user_ldap.po
l10n/uk/user_webdavauth.po
l10n/vi/core.po
l10n/vi/files_external.po
l10n/vi/settings.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/core.po
l10n/zh_CN/files_external.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_webdavauth.po
l10n/zh_HK/core.po
l10n/zh_HK/files_external.po
l10n/zh_HK/settings.po
l10n/zh_HK/user_ldap.po
l10n/zh_HK/user_webdavauth.po
l10n/zh_TW/core.po
l10n/zh_TW/files_external.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
l10n/zh_TW/user_webdavauth.po
l10n/zu_ZA/files_external.po
l10n/zu_ZA/settings.po
lib/base.php
lib/filecache.php
lib/files.php
lib/helper.php
lib/l10n.php
lib/request.php
lib/util.php
settings/ajax/togglegroups.php
settings/js/users.js
settings/l10n/ar.php
settings/l10n/de_DE.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es_AR.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hi.php
settings/l10n/ko.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/ta_LK.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/templates/help.php
|
2013-01-02 17:14:23 +00:00 |
Jörn Friedrich Dreyer
|
166da88b73
|
Merge pull request #945 from owncloud/fix_app_management_in_ie8
since @tanghus and @DeepDiver1975 gave me their 👍 I'll merge this now: Fix app management in ie8
|
2013-01-02 08:17:28 -08:00 |
Robin Appelman
|
54f6f1e6b7
|
phpdoc fixes for public api
|
2013-01-02 16:38:20 +01:00 |
|
Jörn Friedrich Dreyer
|
5b07e722cb
|
combine ie8 fix with debug check
|
2013-01-02 12:21:30 +01:00 |
|
Jörn Friedrich Dreyer
|
ed06070741
|
omit type attribute in script tag to use fallback (text/javascript)
|
2013-01-02 12:13:07 +01:00 |
|
Jörn Friedrich Dreyer
|
e998da06d1
|
fix broken console.log in ie8
|
2013-01-02 12:13:07 +01:00 |
Jenkins for ownCloud
|
516464ba94
|
[tx-robot] updated from transifex
|
2013-01-02 00:05:14 +01:00 |
|
Jenkins for ownCloud
|
c6064a542c
|
[tx-robot] updated from transifex
|
2013-01-01 00:04:42 +01:00 |
|
Jenkins for ownCloud
|
329bddab48
|
[tx-robot] updated from transifex
|
2012-12-31 00:05:31 +01:00 |
Lukas Reschke
|
f70f9f3bc4
|
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
Replace %2F with / in breadcrumbs
|
2012-12-30 08:56:32 -08:00 |
|
Jenkins for ownCloud
|
66e57f5fb1
|
[tx-robot] updated from transifex
|
2012-12-30 00:05:52 +01:00 |
|
Thomas Müller
|
36da34e5f6
|
Merge pull request #902 from owncloud/storage-wording
Storage wording
|
2012-12-28 23:19:52 -08:00 |
Michael Gapczynski
|
b5b48428ab
|
Replace %2F with / in breadcrumbs
|
2012-12-28 19:41:37 -05:00 |
|
Michael Gapczynski
|
f922f836ce
|
Change old variable name $default_quota to $defaultQuota
|
2012-12-28 19:14:33 -05:00 |
|
Jenkins for ownCloud
|
9aefbea074
|
[tx-robot] updated from transifex
|
2012-12-29 00:08:28 +01:00 |
|
Jenkins for ownCloud
|
e9c51b319e
|
[tx-robot] updated from transifex
|
2012-12-28 00:20:34 +01:00 |
|
Jenkins for ownCloud
|
27f9ea2abb
|
[tx-robot] updated from transifex
|
2012-12-27 00:05:17 +01:00 |
|
Jenkins for ownCloud
|
b7257b2524
|
[tx-robot] updated from transifex
|
2012-12-26 00:12:10 +01:00 |
|
Jenkins for ownCloud
|
5d59ac0739
|
[tx-robot] updated from transifex
|
2012-12-25 00:11:11 +01:00 |
|
Jenkins for ownCloud
|
7d52c39419
|
[tx-robot] updated from transifex
|
2012-12-24 00:12:16 +01:00 |
Frank Karlitschek
|
15da11effe
|
Merge pull request #845 from owncloud/sqlite_error
Try to fix #836
|
2012-12-22 15:22:09 -08:00 |
|
Jenkins for ownCloud
|
0656b41747
|
[tx-robot] updated from transifex
|
2012-12-23 00:10:23 +01:00 |
|
Jenkins for ownCloud
|
05fda76776
|
[tx-robot] updated from transifex
|
2012-12-22 00:26:25 +01:00 |
|
Thomas Müller
|
7e78f8e15a
|
moving logic from template to the 'controller'
THX @VicDeo
|
2012-12-21 00:48:12 +01:00 |
|
Jenkins for ownCloud
|
3e39c39d6a
|
[tx-robot] updated from transifex
|
2012-12-21 00:11:31 +01:00 |
|
Thomas Müller
|
986f5d9f3e
|
fixing variable name
|
2012-12-21 00:04:58 +01:00 |
|
Michael Gapczynski
|
84ba66e9b7
|
Merge pull request #978 from owncloud/logout-icon
fix logout icon, hopefully also #969
|
2012-12-20 14:51:36 -08:00 |
Bart Visscher
|
5fb4ed2d92
|
Merge pull request #935 from owncloud/ignore_autogenerated_testfiles
ignore autogenerated testfiles and folders
|
2012-12-20 07:25:57 -08:00 |
|
Thomas Müller
|
24e0a2a358
|
remove unused code
|
2012-12-20 15:45:10 +01:00 |
|
Thomas Müller
|
436df6b67d
|
enable translations for quota sizes 'none' and 'default'
|
2012-12-20 15:35:36 +01:00 |
Jan-Christoph Borchardt
|
bdc8d0098a
|
Merge pull request #869 from owncloud/files-styles
Files styles
|
2012-12-20 05:39:09 -08:00 |
|
Jan-Christoph Borchardt
|
1cbd04a2c4
|
fix logout icon, hopefully also #969
|
2012-12-20 13:49:43 +01:00 |
|
Jan-Christoph Borchardt
|
86d510ba28
|
fix switched values from previous commit
|
2012-12-20 13:30:57 +01:00 |
|
Jan-Christoph Borchardt
|
31aa317952
|
Merge pull request #970 from owncloud/fixing-950-master
within the user administratio page some translations have been missing
|
2012-12-20 04:15:51 -08:00 |
|
Jan-Christoph Borchardt
|
373b69d835
|
Merge pull request #974 from owncloud/fixing-120-master
setting the timezone is now part of the login process
|
2012-12-20 04:02:22 -08:00 |
|
Bart Visscher
|
8e44404ae0
|
Merge pull request #925 from owncloud/fix_issue_918
Trigger the last action before continuing with a file upload
|
2012-12-20 03:30:50 -08:00 |
|
Bart Visscher
|
fb6b03e922
|
Merge pull request #914 from owncloud/incorporate-qa-tools-used-by-ci
Migration of build files from Jenkins
|
2012-12-20 03:06:26 -08:00 |
|
Jan-Christoph Borchardt
|
babc0e4ac6
|
fix Firefox issues with file actions position and multiselect bar width
|
2012-12-20 12:02:19 +01:00 |
|
Jan-Christoph Borchardt
|
aa5f726f14
|
use slightly darker color for file actions background, fix fugly look for selected rows
|
2012-12-20 11:24:25 +01:00 |
|
Jan-Christoph Borchardt
|
c05ea8cfc3
|
fix file actions messing with file row height on narrower screens
|
2012-12-20 11:14:27 +01:00 |
|
Thomas Müller
|
a1bf6b54e6
|
remove timezone.js
|
2012-12-20 11:14:21 +01:00 |
|
Thomas Müller
|
7d811e57e6
|
setting the timezone is now part of the login process and true part of the core.
|
2012-12-20 11:10:45 +01:00 |
|
Jan-Christoph Borchardt
|
5107ccbeda
|
move CSS from JS to CSS
|
2012-12-20 10:53:50 +01:00 |
|
Thomas Müller
|
cc9061d20d
|
adding missing translations for various strings + fixing tool tip on delete
|
2012-12-20 09:59:09 +01:00 |
|
Jenkins for ownCloud
|
ecf82d2218
|
[tx-robot] updated from transifex
|
2012-12-20 00:13:09 +01:00 |
|
Thomas Müller
|
bca02f4b40
|
[l18n] fixing typos in source text
|
2012-12-19 23:43:07 +01:00 |
|
Frank Karlitschek
|
96100fb447
|
Merge pull request #888 from owncloud/add_curl_proxy
add curl proxy support.
|
2012-12-19 10:02:18 -08:00 |
|
Frank Karlitschek
|
1933f858a6
|
Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy
|
2012-12-19 18:51:09 +01:00 |
root
|
a64a923d56
|
call it "proxy" instead of "curlproxy"
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
|
2012-12-19 18:50:19 +01:00 |
|
Frank Karlitschek
|
f012135992
|
make it more readable as deepdiver suggested
|
2012-12-19 18:50:19 +01:00 |