Bart Visscher
|
6081bfa2bc
|
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
|
2012-10-17 16:38:11 +02:00 |
Lukas Reschke
|
f4142bd2a8
|
Move isUserVerified to OC_Util
|
2012-10-16 00:47:38 +02:00 |
Lukas Reschke
|
c404148f9a
|
Password check for admins
|
2012-10-16 00:47:38 +02:00 |
Lukas Reschke
|
c83a2a5517
|
Correct check for admin
|
2012-10-16 00:47:38 +02:00 |
Lukas Reschke
|
e6c9f5d9f4
|
Verify passwords for admins
|
2012-10-16 00:01:48 +02:00 |
Lukas Reschke
|
e3054b6201
|
Revert "Verify user login before changing the password reset mail"
This reverts commit 9aa9110fd9 .
|
2012-10-15 23:50:12 +02:00 |
Lukas Reschke
|
f475ed5cc1
|
Revert "Remove old password check from changepassword and use verifyUser instead"
This reverts commit e6b8153865 .
|
2012-10-15 23:49:49 +02:00 |
Lukas Reschke
|
9aa9110fd9
|
Verify user login before changing the password reset mail
|
2012-10-15 17:44:44 +02:00 |
Lukas Reschke
|
e6b8153865
|
Remove old password check from changepassword and use verifyUser instead
|
2012-10-15 17:44:44 +02:00 |
Lukas Reschke
|
6b39b80648
|
Change auth checks
|
2012-10-15 17:44:44 +02:00 |
Lukas Reschke
|
0b42d70259
|
Unneeded double check
|
2012-10-15 16:08:39 +03:00 |
Lukas Reschke
|
2f4b1b0e4c
|
Disallow users to delete their own accounts
|
2012-10-10 18:05:34 +02:00 |
Bart Visscher
|
bb136b9adf
|
Make the settings ajax calls use the router
|
2012-10-02 18:00:23 +02:00 |
Sam Tuke
|
dc0dc56d48
|
Merge branch 'master' of https://github.com/owncloud/core
|
2012-09-18 14:36:08 +01:00 |
Sam Tuke
|
b765e883f3
|
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App
Added minor documentation
|
2012-09-18 14:35:27 +01:00 |
Thomas Müller
|
f85b709fae
|
Use correct translation file
every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
|
2012-09-17 15:00:22 +03:00 |
Thomas Müller
|
1fd3c5fbc0
|
$l was undefined
|
2012-09-17 14:50:17 +03:00 |
Jörn Friedrich Dreyer
|
62d8202d59
|
return a message when app could not be enabled
|
2012-09-12 12:02:39 +02:00 |
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
Thomas Mueller
|
ebb28412ca
|
no more require_once()
|
2012-09-05 23:28:59 +02:00 |
Thomas Mueller
|
ae8d2d029f
|
Adding missing translation
|
2012-09-04 20:48:10 +02:00 |
Thomas Müller
|
b698fab109
|
Update settings/ajax/userlist.php
respect coding style
|
2012-09-04 13:00:56 +03:00 |
Thomas Müller
|
4b3fc27a22
|
Update settings/ajax/togglegroups.php
respect coding style
|
2012-09-04 12:58:07 +03:00 |
Thomas Müller
|
9a8a101756
|
Update settings/ajax/setloglevel.php
respect coding style
|
2012-09-04 12:55:20 +03:00 |
Thomas Müller
|
dafe28e079
|
Update settings/ajax/setlanguage.php
respect coding style
|
2012-09-04 12:54:36 +03:00 |
Thomas Müller
|
93496a32cc
|
Update settings/ajax/removeuser.php
$l->t added for error message
|
2012-09-04 12:54:04 +03:00 |
Thomas Müller
|
de987b475d
|
Update settings/ajax/removeuser.php
respect coding style
|
2012-09-04 12:51:04 +03:00 |
Thomas Müller
|
04aea1eb2e
|
Update settings/ajax/removegroup.php
$l->t added for error message
|
2012-09-04 12:50:16 +03:00 |
Thomas Müller
|
b49e8cd04d
|
Update settings/ajax/removegroup.php
respect coding style
|
2012-09-04 12:49:50 +03:00 |
Thomas Müller
|
16b3ffb588
|
Update settings/ajax/openid.php
respect coding style
|
2012-09-04 12:49:21 +03:00 |
Thomas Müller
|
83575a4436
|
Update settings/ajax/creategroup.php
$l->t added to error messages
|
2012-09-04 12:48:42 +03:00 |
Thomas Müller
|
04033585b0
|
Update settings/ajax/lostpassword.php
respect coding style
|
2012-09-04 12:47:35 +03:00 |
Thomas Müller
|
6308f80329
|
Update settings/ajax/getlog.php
respect coding style
|
2012-09-04 12:46:56 +03:00 |
Thomas Müller
|
caaaf7a7bf
|
Update settings/ajax/creategroup.php
respect coding style
|
2012-09-04 12:45:54 +03:00 |
Thomas Müller
|
a570cc7b60
|
Update settings/ajax/setquota.php
respect coding style
|
2012-09-04 12:36:21 +03:00 |
Thomas Müller
|
e10f46d978
|
Update settings/ajax/createuser.php
respect coding style
|
2012-09-04 12:34:52 +03:00 |
Thomas Müller
|
69240afd7a
|
Update settings/ajax/changepassword.php
respect coding style
|
2012-09-04 12:32:27 +03:00 |
Thomas Müller
|
8bea9f34e6
|
Update settings/ajax/apps/ocs.php
respect coding style
|
2012-09-04 12:31:28 +03:00 |
Frank Karlitschek
|
72e80bf6bd
|
send the current owncloud version to the ocs server so that we can filter for compatible apps
|
2012-08-31 20:22:03 +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 |
Robin Appelman
|
eb42148210
|
fix error in check if app is installed
|
2012-08-18 23:15:38 +02:00 |
Jakob Sack
|
2bc8d3e5d6
|
Backgroundjobs: interface improvements
|
2012-08-12 00:37:14 +02:00 |
Michael Gapczynski
|
651245effa
|
Use limit and offset for subadmin users
|
2012-08-11 16:25:28 -04:00 |
Michael Gapczynski
|
9d2ae5fa1f
|
Add infinite scrolling to Settings -> Users, still a little buggy
|
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 |
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 |
Thomas Tanghus
|
c6b337c3dd
|
Return possibly changed appid.
|
2012-08-05 01:42:17 +02: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 |
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 |
Lukas Reschke
|
93579d88dc
|
CSRF checks
|
2012-07-20 20:39:20 +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
|
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 |
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 |
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 |
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
|
55e88120cd
|
Validate email on save
|
2012-06-04 18:42:25 +00:00 |
Michael Gapczynski
|
63cc1ccacd
|
Sanitize group in togglegroups
|
2012-05-09 09:23:19 -04:00 |
Michael Gapczynski
|
e0db22cc07
|
Provide feedback when user creation fails
|
2012-05-06 18:04:48 -04:00 |
Robin Appelman
|
b3bd4bc384
|
sanity check on language selection
|
2012-04-15 15:35:20 +02:00 |
Robin Appelman
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
Robin Appelman
|
d8864d4f4b
|
show error when installing an app has failed
|
2012-04-14 12:57:10 +02:00 |
Bart Visscher
|
3a4521a012
|
Add support for logging to syslog
|
2012-03-30 23:41:53 +02:00 |
Robin Appelman
|
797e921b9a
|
improve log browsing
|
2012-02-26 03:10:29 +01:00 |
Robin Appelman
|
0d3181b6d1
|
add configure option for default quota
|
2012-02-24 23:54:38 +01:00 |
Robin Appelman
|
4230e217af
|
new config widget for user quota
|
2012-02-24 23:54:38 +01:00 |
Robin Appelman
|
9f5bce81b0
|
add a default user quota
|
2012-02-24 23:54:38 +01:00 |
Robin Appelman
|
835d6a9b6e
|
save quota in human readable format (42 MB), should prevent some of the overflow related problems
|
2011-12-14 01:16:14 +01:00 |
Robin Appelman
|
b41ca8bacb
|
after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
|
2011-12-11 23:23:59 +01:00 |
Robin Appelman
|
d9372ac766
|
make log level configurable
|
2011-10-16 21:11:03 +02:00 |
Bart Visscher
|
21a88613a1
|
Merge branch 'lostpassword'
Conflicts:
core/templates/login.php
index.php
lib/util.php
|
2011-09-30 23:48:20 +02:00 |
Bart Visscher
|
9a5d517ec2
|
Add more checks for admin user
|
2011-09-30 23:17:30 +02:00 |
Bart Visscher
|
f4782a7690
|
Check if the application is actually enabled
|
2011-09-30 23:17:18 +02:00 |
Bart Visscher
|
f149303895
|
Add email field to personal preferences
|
2011-09-26 21:17:26 +02:00 |
Bart Visscher
|
17e631bc5e
|
Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
|
2011-09-25 22:19:28 +02:00 |
Robin Appelman
|
c16a9a83ba
|
actually check the correct password when changing the password
|
2011-09-25 01:06:00 +02:00 |
Robin Appelman
|
09092dd2d2
|
check for old password when changing passwords
|
2011-09-25 01:02:22 +02:00 |
Robin Appelman
|
9411d8bb08
|
fixed users not being able to change their password
|
2011-08-30 22:03:17 +02:00 |
Michael Gapczynski
|
98ca6c4a16
|
Fix changing password in personal page (not complete)
|
2011-08-27 17:40:41 -04:00 |
Robin Appelman
|
523b0966d2
|
add option to set user quota
|
2011-08-15 21:09:13 +02:00 |
Jan-Christoph Borchardt
|
4a5ee765cf
|
merged admin, help and settings to settings
|
2011-08-13 05:13:34 +02:00 |
Robin Appelman
|
d47cdc3c18
|
fix changing passwords
|
2011-08-12 14:12:01 +02:00 |
Frank Karlitschek
|
aa582ec43a
|
more work on encryption
|
2011-08-11 17:49:36 +02:00 |
Robin Appelman
|
f039320a0b
|
move openid settings to Personal
|
2011-08-06 10:08:26 +02:00 |
Jakob Sack
|
bafd684eb6
|
Renaming classes :-)
|
2011-07-29 21:36:03 +02:00 |