962 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
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
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	d825669265	Merge pull request #3002 from owncloud/priorize_common_languages ... Priorize common languages.	2013-04-26 06:30:59 -07:00
Jenkins for ownCloud	7ea2f785f4	[tx-robot] updated from transifex	2013-04-26 01:58:21 +02:00
Morris Jobke	e6f84397aa	Merge pull request #3098 from jerrac/displaynamesaveontimeout ... On the Personal Settings page, made the display name save like the email address saves	2013-04-25 14:10:16 -07:00
Bart Visscher	63b2699720	Merge pull request #3094 from owncloud/log-ajax ... fix logical issue while retrieving log via ajax	2013-04-25 01:21:59 -07:00
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
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
David Reagan	4bee02f75c	Fixed comment in personal.js. Changed message text in changedisplayname.php.	2013-04-23 14:31:35 -07:00
David Reagan	7312cbec91	Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.	2013-04-23 12:45:12 -07:00
Morris Jobke	8fab7d5afb	fix syntax layout	2013-04-23 18:15:34 +02:00
Morris Jobke	e78a464002	remove log sort in admin section ... doesn't work anymore, because now the datetime is saved as string (ref #2975)	2013-04-23 14:56:33 +02:00
Morris Jobke	b9b2e0269a	fix logical issue while retrieving log via ajax	2013-04-23 14:40:21 +02:00
Jenkins for ownCloud	f6808617b3	[tx-robot] updated from transifex	2013-04-22 02:00:20 +02:00
kondou	7a2be0c5dc	Make divider not selectable ... Very hacky	2013-04-19 00:39:42 +02:00
kondou	79218be1d2	Priorize common languages.	2013-04-18 15:14:42 +02:00
Jenkins for ownCloud	cbd8b792d9	[tx-robot] updated from transifex	2013-04-18 02:09:28 +02:00
Morris Jobke	867a527148	Merge pull request #2975 from owncloud/log-date ... use date and time instead of timestamp in log	2013-04-17 06:49:46 -07:00
Bernhard Posselt	4679e789e1	also adjust template properly for log date fix	2013-04-17 15:31:05 +02:00
Bernhard Posselt	f7e29eabf2	fix admin log display and use a more readable format	2013-04-17 14:05:51 +02:00
Jenkins for ownCloud	37868818ff	[tx-robot] updated from transifex	2013-04-17 02:29:17 +02:00
David Reagan	0dd6f16e0b	Removed extra id from jquery selectors. Remove console.log call. Removed commented code.	2013-04-16 13:22:04 -07:00
David Reagan	6d812ada05	Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.	2013-04-16 13:03:41 -07:00
Jenkins for ownCloud	d0b3e8aceb	[tx-robot] updated from transifex	2013-04-16 02:17:30 +02:00
Jenkins for ownCloud	e13e4c412f	[tx-robot] updated from transifex	2013-04-15 02:12:43 +02:00
Thomas Tanghus	f480596b94	Merge pull request #2896 from owncloud/app-enable-fix ... Add span tag while enabling or disbling apps as well.	2013-04-13 06:57:42 -07:00
Jenkins for ownCloud	19afc216cf	[tx-robot] updated from transifex	2013-04-13 02:15:54 +02:00
raghunayyar	5228eb8a18	Add span tag while enabling or disbling apps as well.	2013-04-12 18:15:59 +05:30
Bernhard Posselt	18c873d1e5	Merge pull request #2554 from owncloud/hide-toggle-checkbox ... Implements Hide / Display for the Password Toggle Button	2013-04-11 01:18:40 -07:00
raghunayyar	3d008b2ff3	New Password in Personal Password Page loads fine.	2013-04-11 12:34:46 +05:30
Jenkins for ownCloud	b02db643d0	[tx-robot] updated from transifex	2013-04-11 02:10:41 +02:00
Robin Appelman	1abc264873	Add the quota change listeners to newly added user entries in the user list	2013-04-10 14:12:54 +02:00
Jenkins for ownCloud	c06bc81c79	[tx-robot] updated from transifex	2013-04-10 02:09:39 +02:00
Robin Appelman	27f710d860	Users: fix "Other.." quota option for the default quota	2013-04-09 12:47:08 +02:00
Bernhard Posselt	bfe48ba99e	Merge pull request #2800 from owncloud/fixing-2743-master ... fixes #2743 - use public OC_User::getDisplayName instead of OC_User::det...	2013-04-09 00:17:01 -07:00
Jenkins for ownCloud	5ef389610f	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
Thomas Mueller	ce54d00b5c	fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName	2013-04-08 23:11:33 +02:00
Jenkins for ownCloud	ccde0212b1	[tx-robot] updated from transifex	2013-04-08 02:18:28 +02:00
Bart Visscher	46a552fd56	Merge pull request #2738 from Kondou-ger/fix_alert_issues ... Fixed things in alert-messages	2013-04-06 08:24:43 -07:00
kondou	de2e546617	Translate 'Error' in core	2013-04-06 16:52:55 +02:00
Jenkins for ownCloud	6798b6dc34	[tx-robot] updated from transifex	2013-04-06 00:05:32 +02:00