464 Commits

Author	SHA1	Message	Date
Michael Gapczynski	617449b230	Change URL from gitorious to github	2012-08-26 21:38:53 -04:00
Michael Gapczynski	d6bb04a74e	Move jquery.inview from contacts app to core	2012-08-26 17:55:51 -04:00
Jenkins for ownCloud	faf702b9e6	[tx-robot] updated from transifex	2012-08-26 19:47:33 +02:00
Jenkins for ownCloud	bae07faa34	[tx-robot] updated from transifex	2012-08-26 01:20:16 +02:00
Georg Ehrke	80374c7cb2	fix UI bug with subadmins	2012-08-25 14:35:24 +02:00
Jörn Friedrich Dreyer	4f5eff2b6f	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 03:14:26 +02:00
Jenkins for ownCloud	f57d527a7c	[tx-robot] updated from transifex	2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer	c8255a170c	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support ... Conflicts: 3rdparty/Sabre/CardDAV/Plugin.php 3rdparty/smb4php/smb.php apps/bookmarks/ajax/addBookmark.php apps/bookmarks/ajax/editBookmark.php apps/bookmarks/appinfo/migrate.php apps/calendar/ajax/calendar/edit.form.php apps/calendar/ajax/changeview.php apps/calendar/ajax/import/import.php apps/calendar/ajax/settings/guesstimezone.php apps/calendar/ajax/settings/setfirstday.php apps/calendar/ajax/settings/settimeformat.php apps/calendar/ajax/share/changepermission.php apps/calendar/ajax/share/share.php apps/calendar/ajax/share/unshare.php apps/calendar/appinfo/app.php apps/calendar/appinfo/remote.php apps/calendar/appinfo/update.php apps/calendar/appinfo/version apps/calendar/js/calendar.js apps/calendar/l10n/da.php apps/calendar/l10n/de.php apps/calendar/l10n/fi_FI.php apps/calendar/l10n/gl.php apps/calendar/l10n/he.php apps/calendar/l10n/hr.php apps/calendar/l10n/ja_JP.php apps/calendar/l10n/lb.php apps/calendar/l10n/lt_LT.php apps/calendar/l10n/nb_NO.php apps/calendar/l10n/pl.php apps/calendar/l10n/pt_PT.php apps/calendar/l10n/ro.php apps/calendar/l10n/ru.php apps/calendar/l10n/sv.php apps/calendar/l10n/zh_CN.php apps/calendar/l10n/zh_TW.php apps/calendar/lib/app.php apps/calendar/lib/calendar.php apps/calendar/lib/object.php apps/calendar/lib/share.php apps/calendar/templates/part.choosecalendar.rowfields.php apps/calendar/templates/part.import.php apps/calendar/templates/settings.php apps/contacts/ajax/activation.php apps/contacts/ajax/addressbook/delete.php apps/contacts/ajax/contact/add.php apps/contacts/ajax/contact/addproperty.php apps/contacts/ajax/contact/delete.php apps/contacts/ajax/contact/deleteproperty.php apps/contacts/ajax/contact/saveproperty.php apps/contacts/ajax/createaddressbook.php apps/contacts/ajax/cropphoto.php apps/contacts/ajax/currentphoto.php apps/contacts/ajax/importaddressbook.php apps/contacts/ajax/oc_photo.php apps/contacts/ajax/savecrop.php apps/contacts/ajax/selectaddressbook.php apps/contacts/ajax/updateaddressbook.php apps/contacts/ajax/uploadimport.php apps/contacts/ajax/uploadphoto.php apps/contacts/appinfo/migrate.php apps/contacts/appinfo/remote.php apps/contacts/css/contacts.css apps/contacts/import.php apps/contacts/index.php apps/contacts/js/contacts.js apps/contacts/l10n/ca.php apps/contacts/l10n/cs_CZ.php apps/contacts/l10n/da.php apps/contacts/l10n/de.php apps/contacts/l10n/el.php apps/contacts/l10n/eo.php apps/contacts/l10n/es.php apps/contacts/l10n/et_EE.php apps/contacts/l10n/eu.php apps/contacts/l10n/fa.php apps/contacts/l10n/fi_FI.php apps/contacts/l10n/fr.php apps/contacts/l10n/he.php apps/contacts/l10n/hr.php apps/contacts/l10n/hu_HU.php apps/contacts/l10n/ia.php apps/contacts/l10n/it.php apps/contacts/l10n/ja_JP.php apps/contacts/l10n/ko.php apps/contacts/l10n/lb.php apps/contacts/l10n/mk.php apps/contacts/l10n/nb_NO.php apps/contacts/l10n/nl.php apps/contacts/l10n/pl.php apps/contacts/l10n/pt_BR.php apps/contacts/l10n/pt_PT.php apps/contacts/l10n/ro.php apps/contacts/l10n/ru.php apps/contacts/l10n/sk_SK.php apps/contacts/l10n/sl.php apps/contacts/l10n/sv.php apps/contacts/l10n/th_TH.php apps/contacts/l10n/tr.php apps/contacts/l10n/zh_CN.php apps/contacts/l10n/zh_TW.php apps/contacts/lib/addressbook.php apps/contacts/lib/hooks.php apps/contacts/lib/vcard.php apps/contacts/photo.php apps/contacts/templates/part.contact.php apps/contacts/templates/part.contacts.php apps/contacts/templates/part.cropphoto.php apps/contacts/templates/part.importaddressbook.php apps/contacts/templates/part.selectaddressbook.php apps/contacts/thumbnail.php apps/files/ajax/download.php apps/files/ajax/newfile.php apps/files/ajax/timezone.php apps/files/appinfo/update.php apps/files/appinfo/version apps/files/index.php apps/files/js/fileactions.js apps/files/js/filelist.js apps/files/js/files.js apps/files/l10n/ar.php apps/files/l10n/bg_BG.php apps/files/l10n/ca.php apps/files/l10n/cs_CZ.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/el.php apps/files/l10n/eo.php apps/files/l10n/es.php apps/files/l10n/et_EE.php apps/files/l10n/eu.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/he.php apps/files/l10n/hr.php apps/files/l10n/hu_HU.php apps/files/l10n/ia.php apps/files/l10n/id.php apps/files/l10n/it.php apps/files/l10n/ja_JP.php apps/files/l10n/ko.php apps/files/l10n/lb.php apps/files/l10n/lt_LT.php apps/files/l10n/mk.php apps/files/l10n/ms_MY.php apps/files/l10n/nb_NO.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sk_SK.php apps/files/l10n/sl.php apps/files/l10n/sr.php apps/files/l10n/sr@latin.php apps/files/l10n/sv.php apps/files/l10n/th_TH.php apps/files/l10n/tr.php apps/files/l10n/uk.php apps/files/l10n/zh_CN.php apps/files/l10n/zh_TW.php apps/files_archive/js/archive.js apps/files_encryption/lib/cryptstream.php apps/files_encryption/lib/proxy.php apps/files_encryption/tests/proxy.php apps/files_external/appinfo/app.php apps/files_external/lib/smb.php apps/files_external/lib/streamwrapper.php apps/files_external/tests/config.php apps/files_external/tests/smb.php apps/files_sharing/ajax/email.php apps/files_sharing/ajax/getitem.php apps/files_sharing/ajax/setpermissions.php apps/files_sharing/ajax/share.php apps/files_sharing/ajax/toggleresharing.php apps/files_sharing/ajax/unshare.php apps/files_sharing/ajax/userautocomplete.php apps/files_sharing/js/settings.js apps/files_sharing/js/share.js apps/files_sharing/lib_share.php apps/files_sharing/settings.php apps/files_sharing/sharedstorage.php apps/files_sharing/templates/settings.php apps/files_versions/ajax/rollbackVersion.php apps/files_versions/versions.php apps/gallery/ajax/thumbnail.php apps/gallery/appinfo/app.php apps/gallery/appinfo/update.php apps/gallery/appinfo/version apps/gallery/css/styles.css apps/gallery/index.php apps/gallery/js/pictures.js apps/gallery/l10n/ca.php apps/gallery/l10n/cs_CZ.php apps/gallery/l10n/de.php apps/gallery/l10n/el.php apps/gallery/l10n/es.php apps/gallery/l10n/fi_FI.php apps/gallery/l10n/fr.php apps/gallery/l10n/it.php apps/gallery/l10n/pl.php apps/gallery/l10n/pt_PT.php apps/gallery/l10n/ru.php apps/gallery/l10n/sl.php apps/gallery/l10n/sv.php apps/gallery/l10n/th_TH.php apps/gallery/l10n/tr.php apps/gallery/l10n/zh_CN.php apps/gallery/lib/album.php apps/gallery/lib/hooks_handlers.php apps/gallery/lib/managers.php apps/gallery/lib/photo.php apps/gallery/lib/tiles.php apps/gallery/lib/tiles_test.php apps/gallery/templates/index.php apps/media/lib_ampache.php apps/media/lib_collection.php apps/media/lib_media.php apps/remoteStorage/lib_remoteStorage.php apps/tasks/ajax/addtaskform.php apps/tasks/ajax/edittask.php apps/user_ldap/appinfo/update.php apps/user_ldap/group_ldap.php apps/user_ldap/lib_ldap.php apps/user_ldap/settings.php apps/user_ldap/templates/settings.php apps/user_ldap/user_ldap.php apps/user_migrate/appinfo/app.php apps/user_migrate/templates/settings.php apps/user_webfinger/host-meta.php config/config.sample.php core/js/js.js core/l10n/da.php core/l10n/de.php core/l10n/fi_FI.php core/l10n/gl.php core/l10n/he.php core/l10n/hr.php core/l10n/id.php core/l10n/ja_JP.php core/l10n/lb.php core/l10n/lt_LT.php core/l10n/nb_NO.php core/l10n/pl.php core/l10n/pt_PT.php core/l10n/ro.php core/l10n/ru.php core/l10n/sv.php core/lostpassword/index.php core/templates/layout.user.php core/templates/login.php db_structure.xml index.php l10n/af/calendar.po l10n/af/contacts.po l10n/af/core.po l10n/af/files.po l10n/af/settings.po l10n/ar/calendar.po l10n/ar/contacts.po l10n/ar/core.po l10n/ar/files.po l10n/ar/media.po l10n/ar/settings.po l10n/bg_BG/calendar.po l10n/bg_BG/contacts.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/media.po l10n/bg_BG/settings.po l10n/ca/calendar.po l10n/ca/contacts.po l10n/ca/core.po l10n/ca/files.po l10n/ca/gallery.po l10n/ca/settings.po l10n/cs_CZ/calendar.po l10n/cs_CZ/contacts.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/gallery.po l10n/cs_CZ/settings.po l10n/da/calendar.po l10n/da/contacts.po l10n/da/core.po l10n/da/files.po l10n/da/settings.po l10n/de/calendar.po l10n/de/contacts.po l10n/de/core.po l10n/de/files.po l10n/de/gallery.po l10n/de/settings.po l10n/el/calendar.po l10n/el/contacts.po l10n/el/core.po l10n/el/files.po l10n/el/gallery.po l10n/el/settings.po l10n/eo/calendar.po l10n/eo/contacts.po l10n/eo/core.po l10n/eo/files.po l10n/eo/media.po l10n/eo/settings.po l10n/es/calendar.po l10n/es/contacts.po l10n/es/core.po l10n/es/files.po l10n/es/gallery.po l10n/es/settings.po l10n/et_EE/calendar.po l10n/et_EE/contacts.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/eu/calendar.po l10n/eu/contacts.po l10n/eu/core.po l10n/eu/files.po l10n/eu/settings.po l10n/fa/calendar.po l10n/fa/contacts.po l10n/fa/core.po l10n/fa/files.po l10n/fa/settings.po l10n/fi_FI/calendar.po l10n/fi_FI/contacts.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/gallery.po l10n/fi_FI/settings.po l10n/fr/calendar.po l10n/fr/contacts.po l10n/fr/core.po l10n/fr/files.po l10n/fr/gallery.po l10n/fr/media.po l10n/fr/settings.po l10n/gl/calendar.po l10n/gl/contacts.po l10n/gl/core.po l10n/gl/files.po l10n/gl/settings.po l10n/he/calendar.po l10n/he/contacts.po l10n/he/core.po l10n/he/files.po l10n/he/settings.po l10n/hr/calendar.po l10n/hr/contacts.po l10n/hr/core.po l10n/hr/files.po l10n/hr/settings.po l10n/hu_HU/calendar.po l10n/hu_HU/contacts.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/settings.po l10n/hy/calendar.po l10n/hy/contacts.po l10n/hy/core.po l10n/hy/files.po l10n/hy/settings.po l10n/ia/calendar.po l10n/ia/contacts.po l10n/ia/core.po l10n/ia/files.po l10n/ia/settings.po l10n/id/calendar.po l10n/id/contacts.po l10n/id/core.po l10n/id/files.po l10n/id/settings.po l10n/it/calendar.po l10n/it/contacts.po l10n/it/core.po l10n/it/files.po l10n/it/gallery.po l10n/it/settings.po l10n/ja_JP/calendar.po l10n/ja_JP/contacts.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/settings.po l10n/ko/calendar.po l10n/ko/contacts.po l10n/ko/core.po l10n/ko/files.po l10n/ko/settings.po l10n/lb/calendar.po l10n/lb/contacts.po l10n/lb/core.po l10n/lb/files.po l10n/lb/settings.po l10n/lt_LT/calendar.po l10n/lt_LT/contacts.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/settings.po l10n/mk/calendar.po l10n/mk/contacts.po l10n/mk/core.po l10n/mk/files.po l10n/mk/settings.po l10n/ms_MY/calendar.po l10n/ms_MY/contacts.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/settings.po l10n/nb_NO/calendar.po l10n/nb_NO/contacts.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/settings.po l10n/nl/calendar.po l10n/nl/contacts.po l10n/nl/core.po l10n/nl/files.po l10n/nl/settings.po l10n/nn_NO/calendar.po l10n/nn_NO/contacts.po l10n/nn_NO/core.po l10n/nn_NO/files.po l10n/nn_NO/settings.po l10n/pl/calendar.po l10n/pl/contacts.po l10n/pl/core.po l10n/pl/files.po l10n/pl/gallery.po l10n/pl/settings.po l10n/pt_BR/calendar.po l10n/pt_BR/contacts.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/settings.po l10n/pt_PT/calendar.po l10n/pt_PT/contacts.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/gallery.po l10n/pt_PT/settings.po l10n/ro/calendar.po l10n/ro/contacts.po l10n/ro/core.po l10n/ro/files.po l10n/ro/settings.po l10n/ru/calendar.po l10n/ru/contacts.po l10n/ru/core.po l10n/ru/files.po l10n/ru/gallery.po l10n/ru/settings.po l10n/sk_SK/calendar.po l10n/sk_SK/contacts.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/settings.po l10n/sl/calendar.po l10n/sl/contacts.po l10n/sl/core.po l10n/sl/files.po l10n/sl/gallery.po l10n/sl/settings.po l10n/sr/calendar.po l10n/sr/contacts.po l10n/sr/core.po l10n/sr/files.po l10n/sr/settings.po l10n/sr@latin/calendar.po l10n/sr@latin/contacts.po l10n/sr@latin/core.po l10n/sr@latin/files.po l10n/sr@latin/settings.po l10n/sv/calendar.po l10n/sv/contacts.po l10n/sv/core.po l10n/sv/files.po l10n/sv/gallery.po l10n/sv/media.po l10n/sv/settings.po l10n/templates/bookmarks.pot l10n/templates/calendar.pot l10n/templates/contacts.pot l10n/templates/core.pot l10n/templates/files.pot l10n/templates/gallery.pot l10n/templates/media.pot l10n/templates/settings.pot l10n/th_TH/calendar.po l10n/th_TH/contacts.po l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/gallery.po l10n/th_TH/settings.po l10n/tr/calendar.po l10n/tr/contacts.po l10n/tr/core.po l10n/tr/files.po l10n/tr/gallery.po l10n/tr/settings.po l10n/uk/calendar.po l10n/uk/contacts.po l10n/uk/core.po l10n/uk/files.po l10n/uk/media.po l10n/uk/settings.po l10n/zh_CN/calendar.po l10n/zh_CN/contacts.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/gallery.po l10n/zh_CN/settings.po l10n/zh_TW/calendar.po l10n/zh_TW/contacts.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/settings.po lib/app.php lib/base.php lib/connector/sabre/file.php lib/connector/sabre/locks.php lib/connector/sabre/node.php lib/db.php lib/filecache.php lib/fileproxy/quota.php lib/files.php lib/filestorage/local.php lib/filesystemview.php lib/group/database.php lib/helper.php lib/installer.php lib/json.php lib/l10n.php lib/migrate.php lib/mimetypes.fixlist.php lib/ocs.php lib/preferences.php lib/public/json.php lib/public/util.php lib/template.php lib/user.php lib/user/database.php lib/util.php lib/vcategories.php ocs/providers.php settings/admin.php settings/ajax/lostpassword.php settings/ajax/removeuser.php settings/ajax/setbackgroundjobsmode.php settings/ajax/setlanguage.php settings/ajax/setquota.php settings/ajax/togglegroups.php settings/apps.php settings/css/settings.css settings/js/apps.js settings/js/users.js settings/l10n/bg_BG.php settings/l10n/ca.php settings/l10n/cs_CZ.php settings/l10n/da.php settings/l10n/de.php settings/l10n/el.php settings/l10n/eo.php settings/l10n/es.php settings/l10n/et_EE.php settings/l10n/eu.php settings/l10n/fa.php settings/l10n/fi_FI.php settings/l10n/fr.php settings/l10n/gl.php settings/l10n/he.php settings/l10n/hr.php settings/l10n/hu_HU.php settings/l10n/it.php settings/l10n/ja_JP.php settings/l10n/ko.php settings/l10n/lt_LT.php settings/l10n/mk.php settings/l10n/ms_MY.php settings/l10n/nb_NO.php settings/l10n/nl.php settings/l10n/nn_NO.php settings/l10n/pl.php settings/l10n/pt_BR.php settings/l10n/pt_PT.php settings/l10n/ru.php settings/l10n/sk_SK.php settings/l10n/sl.php settings/l10n/sv.php settings/l10n/th_TH.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php settings/templates/admin.php settings/templates/users.php	2012-08-25 00:05:07 +02:00
Georg Ehrke	4d3c45a826	backport 1bccc80996	2012-08-24 15:00:53 +02:00
Jenkins for ownCloud	07a889631e	[tx-robot] updated from transifex	2012-08-24 02:07:18 +02:00
Jenkins for ownCloud	082ed4ab71	[tx-robot] updated from transifex	2012-08-23 02:07:35 +02:00
Jenkins for ownCloud	e6d87b2c4b	[tx-robot] updated from transifex	2012-08-22 02:08:16 +02:00
Jenkins for ownCloud	b819aa33f7	[tx-robot] updated from transifex	2012-08-21 02:09:12 +02:00
Jenkins for ownCloud	f893d21660	[tx-robot] updated from transifex	2012-08-20 02:03:51 +02:00
Jenkins for ownCloud	36474e5681	[tx-robot] updated from transifex	2012-08-20 02:01:32 +02:00
Robin Appelman	eb42148210	fix error in check if app is installed	2012-08-18 23:15:38 +02:00
Lukas Reschke	d54390b1a0	Optimized image size	2012-08-18 13:56:04 +02:00
Jenkins for ownCloud	f1cabdd8e0	[tx-robot] updated from transifex	2012-08-18 02:04:07 +02:00
Georg Ehrke	ced234a81a	rename subadmin to group admin	2012-08-17 16:00:24 +02:00
Jenkins for ownCloud	1e6dc67517	[tx-robot] updated from transifex	2012-08-16 02:09:15 +02:00
Jenkins for ownCloud	da3896808a	[tx-robot] updated from transifex	2012-08-15 02:07:20 +02:00
Jenkins for ownCloud	355a1adb3a	[tx-robot] updated from transifex	2012-08-12 02:04:58 +02:00
Jakob Sack	0c69e64b86	Backgroundjobs: Fix template	2012-08-12 00:44:25 +02:00
Jakob Sack	2bc8d3e5d6	Backgroundjobs: interface improvements	2012-08-12 00:37:14 +02:00
Michael Gapczynski	a5a5ab2318	Add type text to new user, fixes display issue	2012-08-11 16:29:41 -04:00
Michael Gapczynski	651245effa	Use limit and offset for subadmin users	2012-08-11 16:25:28 -04:00
Michael Gapczynski	400533af2c	Start with 30 users, this fills my screen	2012-08-11 16:25:27 -04:00
Michael Gapczynski	9d2ae5fa1f	Add infinite scrolling to Settings -> Users, still a little buggy	2012-08-11 16:25:27 -04:00
Michael Gapczynski	baa0b4d530	Cast subadmin groups as strings	2012-08-11 16:25:27 -04:00
Jakob Sack	bd90b7eaca	Backgroundjobs: Fix bug in admin interface	2012-08-11 17:37:53 +02:00
Jenkins for ownCloud	39b9052c2f	[tx-robot] updated from transifex	2012-08-11 02:05:58 +02:00
Jakob Sack	9ad31e5f81	Backgroundjobs: use correct var name in template	2012-08-10 01:44:38 +02:00
Jakob Sack	7c766cdfe0	Backgroundjobs: fix bugs in template	2012-08-10 01:42:30 +02:00
Jakob Sack	7055d2aa2b	Backgroundjobs: improve admin form	2012-08-10 01:36:33 +02:00
Jakob Sack	2b5f005547	Backgroundjobs: Forgot to require lib/base.php	2012-08-09 21:29:45 +02:00
Jakob Sack	1ce2cd73ff	Add first version of backgroundjobs settings	2012-08-09 10:41:10 +02:00
Jenkins for ownCloud	a9f894ce11	[tx-robot] updated from transifex	2012-08-07 02:07:50 +02:00
Jenkins for ownCloud	9ca8d20a99	[tx-robot] updated from transifex	2012-08-06 02:02:50 +02:00
Jenkins for ownCloud	6fbc4f712a	[tx-robot] updated from transifex	2012-08-05 19:02:23 +02:00
Thomas Tanghus	07fd517fda	Make 3rd party label a bit smaller.	2012-08-05 02:54:18 +02:00
Thomas Tanghus	a138b4d04e	Some more pixel pushing.	2012-08-05 01:57:13 +02:00
Thomas Tanghus	ce866a5bdb	CSS tweaks for app settings.	2012-08-05 01:42:17 +02:00
Thomas Tanghus	c6b337c3dd	Return possibly changed appid.	2012-08-05 01:42:17 +02:00
Thomas Tanghus	97853a1ae5	Restructure JS code and small fixes.	2012-08-04 23:48:36 +02:00
Michael Gapczynski	f95ca36b49	Listen to correct undo click for undoing deleting users	2012-08-04 17:03:36 -04:00
Michael Gapczynski	1ec27399a7	Show delete tipsy for users	2012-08-04 17:00:16 -04:00
Michael Gapczynski	002ad4ba16	Tweak users delete notification	2012-08-04 16:44:26 -04:00
Thomas Tanghus	f17876d093	Remove unused code.	2012-08-04 21:25:41 +02:00
Alessandro Cosentino	95fc7f4cb7	Merge branch 'master' of gitorious.org:owncloud/owncloud	2012-08-04 14:35:27 -04:00
Alessandro Cosentino	84aa7c7b54	link of Add your app was broken	2012-08-04 14:34:57 -04:00
Thomas Tanghus	e1d4f85102	Wait with csrf check for now.	2012-08-04 20:26:28 +02:00
Thomas Tanghus	d19803654f	And add the file goddammit	2012-08-04 20:25:20 +02:00
Thomas Tanghus	24af2e8078	Load OCS apps in an ajax call to avoid blocking the WUI.	2012-08-04 20:16:32 +02:00
Alessandro Cosentino	226af11f33	reset version number when not specified - again bug oc-1433	2012-08-04 13:08:55 -04:00
Alessandro Cosentino	627ea9efe4	fixes bug oc-1433	2012-08-04 12:39:23 -04:00
Georg Ehrke	1bccc80996	hide morelog button if there are no more log entries - bugfix for oc-1398	2012-08-04 17:38:31 +02:00
Jenkins for ownCloud	d7e77f6426	[tx-robot] updated from transifex	2012-08-04 02:04:21 +02:00
Jenkins for ownCloud	91e828c6ce	[tx-robot] updated from transifex	2012-08-02 02:06:16 +02:00
Georg Ehrke	47e4793c30	little fix for previous commit	2012-08-01 18:04:06 +02:00
Georg Ehrke	8766b3286b	fix a subadmin UI bug	2012-08-01 18:03:08 +02:00
Jenkins for ownCloud	36ccaf51ed	[tx-robot] updated from transifex	2012-07-31 22:57:24 +02:00
Michael Gapczynski	41a74e3dd2	Check if size isset, try to fix used space calculation again, fixs bug oc-1331 ... Conflicts: settings/personal.php	2012-07-30 10:07:19 -04:00
Michael Gapczynski	164fc1c981	Fix used space calculation if shared folder does not exist, fixes bug oc-1331 ... Conflicts: settings/personal.php	2012-07-30 10:07:19 -04:00
Jenkins for ownCloud	3430dcd367	[tx-robot] updated from transifex	2012-07-30 02:05:41 +02:00
Jenkins for ownCloud	18f6552a08	[tx-robot] updated from transifex	2012-07-29 02:06:29 +02:00
Jenkins for ownCloud	fa4052d6f1	[tx-robot] updated from transifex	2012-07-28 02:05:38 +02:00
Michael Gapczynski	7050f0fa67	Cast groups as string, fixes bug oc-1309. Thanks to nderambure.	2012-07-26 23:54:25 -04:00
Michael Gapczynski	d1dee28437	Check if size isset, try to fix used space calculation again, fixs bug oc-1331	2012-07-26 20:45:58 -04:00
Jenkins for ownCloud	0a9c33e151	[tx-robot] updated from transifex	2012-07-27 02:04:26 +02:00
Georg Ehrke	ebe4d1f0ee	Merge branch 'subadmin'	2012-07-26 16:50:02 +02:00
Georg Ehrke	e1d14ab461	Merge branch 'master' into subadmin	2012-07-26 16:47:05 +02:00
Michael Gapczynski	0810f92894	Fix used space calculation if shared folder does not exist, fixes bug oc-1331	2012-07-26 10:30:33 -04:00
Jenkins for ownCloud	ba0ea21074	[tx-robot] updated from transifex	2012-07-26 08:04:12 +02:00
Jenkins for ownCloud	42c22bee36	[tx-robot] updated from transifex	2012-07-26 08:03:10 +02:00
Georg Ehrke	88f66460a3	some js improvements for subadmins	2012-07-21 13:10:51 +02:00
Lukas Reschke	93579d88dc	CSRF checks	2012-07-20 20:39:20 +02:00
Georg Ehrke	bf9b6e9ccc	don't show label 'add group' for subadmins and remove some debug code	2012-07-20 17:18:40 +02:00
Georg Ehrke	c3bd30cc6b	improve default qouta for subadmins	2012-07-20 15:20:48 +02:00
Georg Ehrke	7f08c84739	fix tooglegroup for subadmins	2012-07-20 15:13:51 +02:00
Georg Ehrke	e42f765697	simplify code of createuser.php	2012-07-20 15:04:50 +02:00
Georg Ehrke	9157888334	simplify code of changepassword.php	2012-07-19 19:32:59 +02:00
Georg Ehrke	6cf418f2fa	fix copy&paste fail and deny subadmins to set the default qouta	2012-07-19 18:00:33 +02:00
Georg Ehrke	2fc834230a	fix setqouta for subadmins	2012-07-19 16:37:41 +02:00
Georg Ehrke	ffc55f3510	simplify code of remoteuser.php	2012-07-19 16:35:14 +02:00
Georg Ehrke	fb6468936e	fix removeuser.php for subadmins	2012-07-18 17:23:40 +02:00
Georg Ehrke	f503aea099	remove unused code from togglesubadmins.php	2012-07-18 15:28:12 +02:00
Georg Ehrke	4490a88492	fix changepassword.php for subadmins	2012-07-18 15:27:31 +02:00
Georg Ehrke	4700222ea9	Merge branch 'master' into subadmin	2012-07-15 16:33:17 +02:00
Georg Ehrke	044134a289	add another file which was missing in the previous commit	2012-07-15 16:32:57 +02:00
Georg Ehrke	e707e94857	subadmins can now add users	2012-07-15 16:31:28 +02:00
Michael Gapczynski	b455149bae	Fix undo delete user	2012-07-14 16:57:16 -04:00
Michael Gapczynski	8890a41280	Fix setting custom quota size for users, bug fix for oc-1128	2012-07-11 18:25:08 -04:00
Georg Ehrke	0cb9f5e159	fix merge conflicts	2012-07-11 10:50:18 +02:00
Georg Ehrke	d0b625352c	some work on subadmins	2012-07-09 21:51:19 +02:00
Jörn Friedrich Dreyer	e59a1806cf	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
Lukas Reschke	777eb1d8b1	CSRF check in the settings	2012-07-07 15:27:04 +02:00
Sam Tuke	825d92d59c	Added undo functionality to delete user procedure on user settings page	2012-07-04 14:30:42 +01:00
Michael Gapczynski	ffadbfcef3	Prevent duplicate group showing in multiselect that added the group	2012-07-01 11:36:57 -04:00
Michael Gapczynski	949cab7ea1	Add new group to other user's group select forms	2012-07-01 11:36:31 -04:00
Michael Gapczynski	5121c262e2	Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)" ... This reverts commit 265d7e50f5.	2012-07-01 11:35:58 -04:00
Michael Gapczynski	7ceba61413	Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)" ... This reverts commit 265d7e50f5.	2012-07-01 11:29:02 -04:00
Michael Gapczynski	c992482e92	Prevent duplicate group showing in multiselect that added the group	2012-06-29 17:52:44 -04:00
Michael Gapczynski	05cb94801a	Add new group to other user's group select forms	2012-06-29 16:29:58 -04:00
Frank Karlitschek	6917d74193	move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways.	2012-06-29 11:07:41 +02:00
Michael Gapczynski	9c083d3519	Fix setting custom quota size for users, bug fix for oc-1128	2012-06-28 21:26:39 -04:00
Bjoern Schiessle	265d7e50f5	bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)	2012-06-26 12:54:09 +02:00
Bjoern Schiessle	72b365842f	bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)	2012-06-26 12:51:32 +02:00
Sam Tuke	f374dae233	Added text ACS warning to admin's user settings page, and corresponding CSS styles	2012-06-25 18:04:10 +01:00
Thomas Tanghus	5ac4830e75	XSS fix.	2012-06-25 05:03:30 +02:00
Thomas Tanghus	c3130919c2	Allow direct link to app.	2012-06-25 05:02:01 +02:00
Bjoern Schiessle	036530b2fd	log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)	2012-06-22 17:00:56 +02:00
Bjoern Schiessle	e943f6c0c8	log messages are looking nicer if they are not escaped. (xss prevention happens on another place)	2012-06-22 16:53:45 +02:00
Bjoern Schiessle	1338279ca0	Merge branch 'master' of gitorious.org:owncloud/owncloud	2012-06-21 16:42:16 +02:00
Frank Karlitschek	5212fa3fa7	check if the data directory is accessible via http. Show a big security warning if yes	2012-06-21 14:18:43 +02:00
Frank Karlitschek	e95055b2bd	check if the data directory is accessible via http. Show a big security warning if yes	2012-06-21 14:07:04 +02:00
Bjoern Schiessle	34739b7ec5	use new sanitizeHTML() function	2012-06-21 13:57:18 +02:00
Bjoern Schiessle	902c649dad	use new sanitize HTML function backported ... Conflicts: lib/template.php	2012-06-20 16:59:51 +02:00
Bjoern Schiessle	089ae980c4	use new sanitize HTML function	2012-06-19 17:24:55 +02:00
Brice Maron	b31962fdc2	Hide image with no source (avoid placeholder img)	2012-06-18 20:15:20 +00:00
Bjoern Schiessle	ca41f2e96a	don't add the "Shared"-directory size to users quota	2012-06-18 15:38:38 +02:00
Bjoern Schiessle	2fd7df57d9	don't add the "Shared"-directory size to users quota	2012-06-18 15:35:22 +02:00
Bjoern Schiessle	9d0cfacd67	escape log messages to avoid possible js execution	2012-06-18 09:43:56 +02:00
Bjoern Schiessle	91f69858e4	escape log messages to avoid possible js execution	2012-06-18 09:42:31 +02:00
Michael Gapczynski	b5889d6ffe	Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ... Conflicts: apps/files_external/templates/settings.php lib/template.php	2012-06-13 15:17:46 -04:00
Bjoern Schiessle	107c2de25d	applied patch provided by bug #966 to fix broken user specific quota settings	2012-06-12 11:22:25 +02:00
Bjoern Schiessle	1b6dd6628a	applied patch provided by bug #966 to fix broken user specific quota settings	2012-06-12 11:18:34 +02:00
Lukas Reschke	d2a34f4b35	Fixes a issue with the log	2012-06-11 19:33:16 +02:00
Lukas Reschke	2b22c538c8	Make some apps compatible	2012-06-11 19:07:51 +02:00
Lukas Reschke	c009bc4b87	Revert	2012-06-11 13:27:32 +02:00
Lukas Reschke	ec4c373eaa	Settings...	2012-06-11 12:48:47 +02:00
Frank Karlitschek	689c8f5f09	paging not yet implemented. increasing pagesize to 100 as a temporary quickfix	2012-06-09 22:02:29 +02:00
Frank Karlitschek	3947aa3ef7	apps paging is not yet implemented. increase pagesize to 100 as a quickfix	2012-06-09 22:00:28 +02:00
Bjoern Schiessle	4a15cf28a9	fixed broken lines in user table ... Conflicts: settings/css/settings.css	2012-06-08 11:44:04 +02:00
Bjoern Schiessle	f91ad08613	fixed broken lines in user table	2012-06-08 11:37:04 +02:00
Tom Needham	1f409ec524	Protect the help page	2012-06-07 17:43:26 +00:00
Robin Appelman	f1b10fcc93	update translations	2012-06-06 00:29:44 +02:00
Robin Appelman	f7d221f5f0	update translations	2012-06-06 00:29:28 +02:00
Thomas Tanghus	6c4231b3d3	Per user quota didn't show in FF (and possibly IE) http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324.	2012-06-05 14:17:38 +02:00
Bart Visscher	786325a4bb	Fix newline in code	2012-06-04 22:24:17 +02:00
Tom Needham	daa4d2cd84	Validate email on save	2012-06-04 18:44:55 +00:00
Tom Needham	cf85a1e264	Merge branch 'master' of gitorious.org:owncloud/owncloud	2012-06-04 18:43:22 +00:00
Tom Needham	55e88120cd	Validate email on save	2012-06-04 18:42:25 +00:00
Michael Gapczynski	adc200c1f3	Hide app page link for internal apps, fixes bug oc-913	2012-06-04 14:26:30 -04:00
Frank Karlitschek	f3c1d1eded	link to apps.owncloud.com ... thanks to guillaume for the patch	2012-06-03 23:48:59 +02:00
Frank Karlitschek	60b8e172d5	prevent a division by zero problem	2012-06-01 16:49:14 +02:00
Frank Karlitschek	e6b0eb3423	prevend a division by zero problem	2012-06-01 16:48:42 +02:00
Bart Visscher	a33f580db1	Remove OC_App::register function ... The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.	2012-05-31 13:01:30 +02:00
Frank Karlitschek	54c421f384	check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not	2012-05-26 20:40:12 +02:00
Frank Karlitschek	982cde0bb1	check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not	2012-05-26 20:37:10 +02:00
Frank Karlitschek	a945fa10a6	update copyright	2012-05-26 19:14:24 +02:00