1544 Commits

Author	SHA1	Message	Date
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
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
Jenkins for ownCloud	2b36ad292d	[tx-robot] updated from transifex	2013-04-29 02:00:26 +02:00
Lukas Reschke	e3c9554856	Reword sentence and move HTML out of translation	2013-04-29 00:13:23 +03:00
Jenkins for ownCloud	901e0c598d	[tx-robot] updated from transifex	2013-04-28 02:01:38 +02: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
Bart Visscher	67b6ee661d	Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen ... Improve the password reset screen.	2013-04-26 05:33:09 -07:00
Bart Visscher	26e2672a5a	Merge pull request #2787 from owncloud/fix-password-autocomplete-2632 ... turn off autocompletion for password field	2013-04-26 01:59:20 -07:00
Jenkins for ownCloud	7ea2f785f4	[tx-robot] updated from transifex	2013-04-26 01:58:21 +02:00
Lukas Reschke	b6fee2d257	Remove uneeded link	2013-04-24 22:39:04 +03:00
raghunayyar	175fc0c737	Clubbing Exact styles together.	2013-04-24 23:47:39 +05:30
Lukas Reschke	d41b600725	Add an update notification on every page for admin users	2013-04-24 18:47:38 +02:00
Raghu Nayyar	063e1238bf	Merge pull request #3096 from owncloud/add_missing_space_for_new_groups ... Fixing #3095	2013-04-24 09:33:37 -07:00
Jenkins for ownCloud	88fd3b088d	[tx-robot] updated from transifex	2013-04-24 17:46:20 +02:00
kondou	6f5501bbc8	Fis syntax error and add user icon.	2013-04-24 14:17:13 +02:00
kondou	e15afcb011	Add space around checkboxes.	2013-04-24 11:58:12 +02:00
kondou	e8bb998ecc	Fix #3095.	2013-04-24 11:13:12 +02:00
Jenkins for ownCloud	a7b4469b2e	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00
kondou	1e2efdddc9	Oneliners, <br>, proper errors & print_unescaped()	2013-04-23 12:38:25 +02:00
kondou	0d3afadab2	Don't split translation lines	2013-04-23 12:31:13 +02:00
kondou	06dfc95122	Fix syntax error.	2013-04-23 12:31:13 +02:00
kondou	f1bcf6ef02	Improve the password reset screen. ... Fixing #2752	2013-04-23 12:31:13 +02:00
Jenkins for ownCloud	05ab9d2de7	[tx-robot] updated from transifex	2013-04-23 02:00:31 +02:00
Jan-Christoph Borchardt	c7a17efc01	Merge pull request #2983 from owncloud/style-details ... Style details	2013-04-22 07:12:19 -07:00
Jenkins for ownCloud	03c7a52bc5	[tx-robot] updated from transifex	2013-04-20 02:02:09 +02:00
Morris Jobke	938b12236a	modify password clone to password type right on submit to prevent the browser remind the content	2013-04-19 10:06:18 +02:00
Jenkins for ownCloud	cbd8b792d9	[tx-robot] updated from transifex	2013-04-18 02:09:28 +02:00
Raghu Nayyar	a3e5da834b	Merge pull request #2925 from owncloud/navigation-icon-fix ... fix navigation hover effect, documentation	2013-04-17 10:20:36 -07:00
Jan-Christoph Borchardt	d83adb8b84	remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px	2013-04-17 17:36:30 +02:00
Jan-Christoph Borchardt	3d47c62a20	apply navigation hover effect directly to img and span, cleaner code	2013-04-17 17:23:12 +02:00
Jan-Christoph Borchardt	c8cafcefe4	move password warning more relevant below password field, un-nest log in warning	2013-04-17 17:16:15 +02:00
Jan-Christoph Borchardt	21bcb95e2a	move warning and error states together in CSS, to be cleaned up	2013-04-17 17:15:34 +02:00
Jan-Christoph Borchardt	9f58166339	make textarea inherit ownCloud font instead of using monospace	2013-04-17 16:30:42 +02:00
Jan-Christoph Borchardt	ca323e56c2	correct primary color to #1d2d44 where slightly wrong	2013-04-17 11:55:27 +02:00
Bart Visscher	f3c06ae4e4	Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better ... Handle empty datafolder better.	2013-04-17 00:44:14 -07:00
Jenkins for ownCloud	37868818ff	[tx-robot] updated from transifex	2013-04-17 02:29:17 +02:00
kondou	3ab97312b8	Hint to default data directory ... not to before submitted data directory. Thanks to bartv2 for the heads up.	2013-04-16 09:54:34 +02:00
Jenkins for ownCloud	d0b3e8aceb	[tx-robot] updated from transifex	2013-04-16 02:17:30 +02:00
Bernhard Posselt	c829a9c156	Merge pull request #2934 from owncloud/shorten_css_colorcodes ... Shorten CSS colorcodes	2013-04-15 14:46:51 -07:00
Thomas Tanghus	3f7643ef46	Merge pull request #2769 from owncloud/octemplate ... Add octemplate jQuery plugin	2013-04-15 13:42:35 -07:00
Thomas Tanghus	155582ab70	Updated docs.	2013-04-15 22:10:29 +02:00
kondou	0f86ed3ad5	Shorten CSS colorcodes ... Only need to be three digits.	2013-04-15 21:07:45 +02:00
Bernhard Posselt	19526c9cf6	also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly	2013-04-15 20:29:45 +02:00
Jenkins for ownCloud	e13e4c412f	[tx-robot] updated from transifex	2013-04-15 02:12:43 +02:00
Jan-Christoph Borchardt	846f77ed92	additional comments	2013-04-14 19:30:16 +02:00