summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionFlorin Peter2013-05-0110-35/+131
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-0110-11/+28
| |
* | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ↵Florin Peter2013-05-0164-488/+497
| | | | | | | | very unstable right now
* | Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-3064-497/+488
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * [tx-robot] updated from transifexJenkins for ownCloud2013-04-3013-17/+94
| |
| * Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
| |\ | | | | | | Reword sentence and move HTML out of translation
| | * Reword sentence and move HTML out of translationLukas Reschke2013-04-291-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2911-1/+27
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-04-286-0/+10
| |
| * Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-262-2/+5
| |\ | | | | | | Add an update notification
| | * Remove uneeded linkLukas Reschke2013-04-241-1/+1
| | |
| | * Clubbing Exact styles together.raghunayyar2013-04-241-5/+2
| | |
| | * Add an update notification on every page for admin usersLukas Reschke2013-04-242-0/+6
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2759-474/+318
| | |
| * | Merge pull request #2783 from Kondou-ger/improve_passwordresetscreenBart Visscher2013-04-262-12/+21
| |\ \ | | | | | | | | Improve the password reset screen.
| | * | Fis syntax error and add user icon.kondou2013-04-241-2/+3
| | | |
| | * | Oneliners, <br>, proper errors & print_unescaped()kondou2013-04-231-8/+6
| | | |
| | * | Don't split translation lineskondou2013-04-231-10/+4
| | | |
| | * | Fix syntax error.kondou2013-04-231-1/+1
| | | |
| | * | Improve the password reset screen.kondou2013-04-232-10/+26
| |/ / |/| | | | | | | | Fixing #2752
| * | Merge pull request #2787 from owncloud/fix-password-autocomplete-2632Bart Visscher2013-04-261-2/+12
| |\ \ | | | | | | | | turn off autocompletion for password field
| | * | modify password clone to password type right on submit to prevent the ↵Morris Jobke2013-04-191-1/+10
| | | | | | | | | | | | | | | | browser remind the content
| | * | turn off autocompletion for password fieldMorris Jobke2013-04-071-1/+2
| | | | | | | | | | | | | | | | refs #2632
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-261-0/+9
| | | |
| * | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groupsRaghu Nayyar2013-04-242-2/+8
| |\ \ \ | | | | | | | | | | Fixing #3095
| | * | | Add space around checkboxes.kondou2013-04-241-2/+4
| | | | |
| | * | | Fix #3095.kondou2013-04-242-2/+6
| |/ / / |/| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-241-2/+2
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-242-0/+6
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-231-1/+1
| |
* | Merge pull request #2983 from owncloud/style-detailsJan-Christoph Borchardt2013-04-222-37/+43
|\ \ | | | | | | Style details
| * | remove unnecessary border from navigation, looked strange with scrollbar and ↵Jan-Christoph Borchardt2013-04-171-1/+1
| | | | | | | | | | | | pushed the text over 1px
| * | move password warning more relevant below password field, un-nest log in warningJan-Christoph Borchardt2013-04-171-17/+15
| | |
| * | move warning and error states together in CSS, to be cleaned upJan-Christoph Borchardt2013-04-171-11/+18
| | |
| * | make textarea inherit ownCloud font instead of using monospaceJan-Christoph Borchardt2013-04-171-0/+1
| | |
| * | correct primary color to #1d2d44 where slightly wrongJan-Christoph Borchardt2013-04-171-8/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-201-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-181-1/+23
| | |
* | | Merge pull request #2925 from owncloud/navigation-icon-fixRaghu Nayyar2013-04-171-6/+29
|\ \ \ | |/ / |/| | fix navigation hover effect, documentation
| * | apply navigation hover effect directly to img and span, cleaner codeJan-Christoph Borchardt2013-04-171-3/+23
| | |
| * | additional commentsJan-Christoph Borchardt2013-04-141-3/+3
| | |
| * | fix navigation hover effect, documentationJan-Christoph Borchardt2013-04-141-5/+8
| | |
* | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_betterBart Visscher2013-04-171-0/+1
|\ \ \ | | | | | | | | Handle empty datafolder better.
| * | | Hint to default data directorykondou2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | not to before submitted data directory. Thanks to bartv2 for the heads up.
| * | | Handle empty datafolder better.kondou2013-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | If datafolder is erased, the default value will be shown as a placeholder. If installation is submitted without a datafolder the default value will be used.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-171-0/+117
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1653-157/+159
| | | |
* | | | Merge pull request #2934 from owncloud/shorten_css_colorcodesBernhard Posselt2013-04-151-4/+4
|\ \ \ \ | | | | | | | | | | Shorten CSS colorcodes
| * | | | Shorten CSS colorcodeskondou2013-04-151-4/+4
| | | | | | | | | | | | | | | | | | | | Only need to be three digits.
* | | | | Merge pull request #2769 from owncloud/octemplateThomas Tanghus2013-04-151-0/+101
|\ \ \ \ \ | |/ / / / |/| | | | Add octemplate jQuery plugin
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 18:13:41 +0000