a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
d5211f9615
some characters in comments avoid finding some strings to translate
2012-09-21 12:05:01 +02:00
0f15bc881f
fix translating dialog buttons, they are translated in core not dialogs app
2012-09-21 11:48:57 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
b1c60841e8
float right element needs to be the first element, otherwise firefox will move it to a new line
2012-09-20 10:31:23 +02:00
518ca0ac58
Fix changing of share status icons, bug fix for oc-1631
2012-09-19 01:44:15 -04:00
1e1e8ae3b5
Don't show the expiration option until a share occurs, bug fix for oc-1724
2012-09-19 01:02:57 -04:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
54d4e556fe
Add lock and clock icon for sharing
2012-09-12 01:02:08 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
0b2633a787
add breadcrumb controll to js
2012-09-09 03:00:01 +02:00
9beb958845
forgot a ,
2012-09-09 00:35:02 +02:00
b14265b5c3
add js versions of basename and dirname
2012-09-08 23:59:02 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
e0db35fac0
Fix name for OCCategories
2012-09-05 22:26:09 +02:00
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
5a9a795cd5
Fix check in Javascript for password protected link
2012-09-01 13:52:12 -04:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
61a3e5f96b
unify permissions (1/3): add permission conastants to javascript OC
2012-08-31 01:11:10 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
8990855f88
add OC.get and OC.set to get/set variables by name in javascript
2012-08-30 03:02:29 +02:00
3828d86191
Remove old Javascript code
2012-08-29 14:37:36 -04:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
76bc4753e9
Fix displaying if a link is password protected
2012-08-29 14:06:55 -04:00
0788c6e968
Hide link password controls if link is removed
2012-08-29 14:06:55 -04:00
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
9fcb916057
Fix toggling of password protection in sharing dropdown
2012-08-29 11:54:49 -04:00
92c782c1b0
return the jQuery deferred object when using OC.loadScript
2012-08-29 01:57:59 +02:00
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
545812f589
Move additional jquery.inview files
2012-08-26 18:50:20 -04:00
d6bb04a74e
Move jquery.inview from contacts app to core
2012-08-26 17:55:51 -04:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
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
d84b1adf34
Dynamically update shared status icon
2012-08-24 15:32:06 -04:00
7168fa4b05
Add padding to the reshared text
2012-08-24 15:12:16 -04:00
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -04:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
a3b4cb205c
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-24 14:54:16 +02:00
aefa52018d
Use right variable name.
2012-08-23 05:02:30 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
b6a3bf154d
Comment out javascript that hides login button
...
It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
2012-08-16 20:55:10 +00:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
4954e46bb2
Use core routes in js too
2012-08-15 17:38:55 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
eb516b79b6
Position appsettings fixed and load it in dynamically added element.
2012-08-12 18:42:54 +02:00
7fa896971f
JavaScript file for activating web cron
2012-08-09 00:58:54 +02:00
d02b0e39b2
Fix issues with hiding and showing dropdown
2012-08-08 17:50:09 -04:00
a22f30fb78
Reset item shares variable, fixes autocomplete not showing people
2012-08-08 11:39:00 -04:00
b1a7e30819
Actually change background image of shared items
2012-08-07 21:23:55 -04:00
51ddc44b62
Somewhat fixes dropdown display issues in the contacts app
2012-08-06 15:43:20 -04:00
6f83540dd6
Remove person from array after unshare, so name appears in autocomplete again
2012-08-06 14:45:45 -04:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
4f10574065
Don't load item if it doesn't have it status set
2012-08-06 13:30:44 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
c5d5ca88a8
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-03 13:15:15 +02:00
26e406c3c0
Hide 'can edit' if not checked
2012-08-01 18:03:00 -04:00
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
98f37b93f6
Propagate exceptions in OC.appSettings.
2012-08-01 16:24:02 +02:00
83b935a1c2
Prevent up and down arrow from changing the share with input value
2012-07-31 21:31:59 -04:00
269922543e
Give share with search focus when sharing dropdown appears
2012-07-31 14:48:19 -04:00
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
8d01e1a355
Don't show self or already shared with users and groups in the share with search
2012-07-31 13:06:32 -04:00
8729119d4b
Add suggestion to share with search for sharing via email
2012-07-31 10:18:26 -04:00
6df95db8e8
Forgot to also use the options I added :-P
2012-07-31 16:05:58 +02:00
8837576ce7
Added some more options to OC.appSettings().
2012-07-31 16:03:08 +02:00
fb14cb87bd
Made the parameter for OC.appSettings() an object to be able to extend it.
2012-07-31 14:17:28 +02:00
084866cb1e
White space
2012-07-31 14:06:44 +02:00
553773f2e1
Popup for app specific settings.
2012-07-31 12:23:22 +02:00
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
db72ce398b
Add support for configuring which permissions are possible for items
2012-07-27 10:13:23 -04:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
cbf851de69
Show private link in dropdown
2012-07-11 12:21:30 -04:00
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
0045e64041
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:49:15 -04:00
90e4af312a
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:38:54 -04:00
799e34acd4
Add slash to app url if not set fix oc-1169
2012-07-03 21:58:36 +00:00
1ad5e3e39f
Add parameter to showDropDown to not show private link UI, only files can be shared as private links
2012-07-03 17:00:23 -04:00
db33765e36
Add share with to list in dropdown after sharing
2012-07-03 16:52:53 -04:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
dd7d34a40e
Prevent adding a duplicate to a multiselect
2012-07-01 11:36:44 -04:00
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
f456cee9d8
Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app
2012-06-30 21:06:04 -04:00
8e4832bd12
Prevent adding a duplicate to a multiselect
2012-06-29 16:44:08 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
b5961635ea
Fix ajax share file and replace 'User or Group' select form with a textbox
2012-06-27 01:05:36 +02:00
f21fdf14f9
Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
595ff468f5
typo in js statement fixed
2012-06-26 10:36:33 +02:00
18d5420744
typo in js statement fixed
2012-06-26 10:35:19 +02:00
df60d6d5d2
Fixes for multi app dir :
...
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
8f616ecf76
fix potential xss in multiselect
2012-06-09 15:08:05 +02:00
cfe219fbb9
fix potential xss in multiselect
2012-06-09 15:07:16 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
58adeaa80a
only check our own input fields when determining to show the login button
...
fixes a problem with browser plugins adding hidden inputs
2012-05-17 01:17:44 +02:00
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
59a2616105
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
2012-05-10 23:04:27 -04:00
52d113b9e1
Prevent extra '/' from being added to url if app is not defined
2012-05-07 12:35:02 -04:00
df6b15445d
Fix bug on browsers like rekonq which stopped execution of javascript
2012-05-07 17:35:23 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
2580d8540d
Dialogs: Clean indentation. Add some missing brackets.
2012-05-05 13:49:47 +02:00
27da29525a
Made the global settings icon accessable via keyboard.
...
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
8d1754041e
VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls.
2012-05-04 01:33:47 +02:00
a4a3d62a55
Check for callback in OC.dialogs.alert.
2012-05-04 00:13:35 +02:00
5611e6c9d3
fix incorrect dialog computing in ff
2012-05-03 12:32:37 +02:00
98e0db15a2
correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :
...
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details)
solved
Signed-off-by: bourgeoa
2012-05-01 23:46:51 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
d6346b5b0b
fix OC.filePath in main js
2012-04-24 21:54:09 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
12ef2f5054
modify OC.filepath for movable apps
2012-04-20 22:35:12 +02:00
e5cda3abcd
tooltip for delete shows up to the left
2012-04-15 17:49:54 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
30498fd6f8
Use offset function to position block elements
2012-04-14 18:31:41 +02:00
b8466d362e
Fix rescan "File not Found" error handling in oc-vcategories.js
2012-04-13 21:13:58 +02:00
eea0d2e096
fixing delete tooltip
2012-04-13 18:28:17 +02:00
31df4c00ec
adding tipsy tooltips for file actions
2012-04-13 17:22:23 +02:00
bc81179163
Fix categories delete fallback when there is no app specific ajax categories delete function
2012-04-12 23:10:49 +02:00
2f3c0a6d80
wrong defaultValue definition in OC.AppConfig.getValue
...
done
2012-04-12 19:14:25 +02:00
9f547a1b39
VCategories: fix function names to coding standard
2012-04-10 21:53:51 +02:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
96c99125da
mimetype filter for filepicker
2012-04-05 23:18:44 +02:00
5b4a303672
loading screen for filepicker
2012-04-05 21:29:54 +02:00
cd05dfb943
adding icons to filepicker
2012-04-03 22:18:03 +02:00
ff5dbc52b8
multiselect handle for filepicker
2012-04-02 21:32:35 +02:00
f21d6d4f9f
dialogs filepicker first draft
2012-04-02 19:39:24 +02:00
4e327295c6
adding callback when ok click on alert dialog
2012-04-01 00:30:52 +02:00
2f68b08491
fix eventsource for ie
2012-03-31 16:40:42 +02:00
ad495a9218
fix potential problem when using multiply eventsource's
2012-03-31 16:10:29 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
0a07e5fdaa
Added some documentation.
2012-03-27 12:30:20 +02:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
2a351f4456
Fixed off by one bug. List length is 1 larger than the index of the last
...
element.
2012-02-26 22:09:21 +01:00
3d0d47957e
improved humanFileSize for js
2012-02-26 14:12:50 +01:00
a5e892505e
more robust png fallback
2012-02-26 03:10:29 +01:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
8b93a9a237
add javascript bindings for OC_AppConfig
2012-02-25 16:35:40 +01:00
862f824d64
some multiselect improvements
2012-02-25 16:35:40 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
fdf3df3de5
add option to send get data along with an eventsource request
2012-01-31 16:35:47 +01:00
6a1121ab2e
provide server side close option for EventStream
2012-01-30 23:19:58 +01:00
45038af948
provide small wrapper around server side events and provide a fallback for IE
2012-01-30 20:21:16 +01:00
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
b366b0eb52
quick fix for javascript translations
2012-01-16 00:09:43 +01:00
a883fcca3c
add user and instance awere localstorage to prevent collisions when using localstorage
2012-01-15 19:22:32 +01:00
872d301af3
fix inconsitent behaviour when trying to remove yourself from the admin group
2012-01-15 00:50:01 +01:00
0ac9e56da9
small fix for server svg mimetype detection
2012-01-14 23:41:48 +01:00
5eb6071b04
make the minimum width of the multiselect configurable
2012-01-14 23:10:14 +01:00
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
a1af757ef6
Fix whitespace username in the installation form
2012-01-02 14:21:46 +01:00
1415cb8d19
add infieldlabel source
2012-01-01 23:48:38 +01:00
5ebf8a87f2
Removed old jquery-ui css and js
2011-12-30 23:08:44 +00:00
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
2c68aab198
Merge branch 'master' into newbutton
2011-11-04 03:00:03 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
d46288b0ab
'New' button, needs some css work
2011-10-23 11:40:40 +02:00
92fa6f0a48
Fix size calculation with css styling of tipsy popup
2011-10-21 22:08:55 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
41dfce150d
problem with previous selected groups fixed
2011-10-02 15:38:07 +02:00
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
3fcc7b5949
Use correct name for function state for addScript/addStyle in js
2011-09-26 21:18:56 +02:00
c09b125131
relabeled Finish setup button with 'Finishing ...'
2011-09-24 21:56:40 +02:00
63907a7508
dont submit the setup form to a new tab
2011-09-24 19:07:24 +02:00
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
b73f72f62c
After clicking Finish button:
...
- change value to "Please wait...."
- disable all the inputs & buttons
- submit new form, because disabled inputs are not submitted to the server
2011-09-23 19:40:06 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
2fed316efa
hid localhost field for SQLite
2011-09-04 15:03:25 +02:00
bcfdc12852
fixed tipsy gravity for multiselect file actions
2011-08-28 08:46:38 +02:00
fef7e9d5f4
Style changes for multiselect and add tipsy for file size
2011-08-27 22:16:39 -04:00
0b17a542cb
Fix searchbox enter action
2011-08-27 16:36:15 -04:00
d5ba4ec825
some improvements in automatic svg replacement
2011-08-22 15:20:24 +02:00
13b7cb59eb
also replace svg images with png when the server doesn't send the correct mimetype for svg images
...
(which breaks svg images for most browsers)
2011-08-22 14:53:52 +02:00
c078966511
trying SVG check that Modernizr uses, to fix Firefox 3.6 problems
2011-08-16 12:46:25 +02:00
e954d2d013
seriously gone a bit overboard with tipsy
2011-08-15 23:45:25 +02:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
6e30ade0b3
updated tipsy, tooltips finally work everywhere, thanks icewind
2011-08-14 14:55:43 +02:00
f2a21398d7
more info in personal, WebDAV, OpenID
2011-08-14 11:09:51 +02:00
ccf410c7b0
first styling for leftcontent
2011-08-13 07:02:25 +02:00
3b5f16b23c
NEEDS MORE FADING
2011-08-13 06:05:00 +02:00
d5b4056514
fixed tipsy tooltips for actions
2011-08-13 05:40:03 +02:00
686be824b5
hide settings menu when clicking outside it
2011-08-13 00:23:15 +02:00
f62b315159
file hovering now very fancy, CSS fade for row and extension
2011-08-12 11:51:48 +02:00
6c4d075bd6
added jquery-tipsy for nice title tooltips
2011-08-12 11:26:13 +02:00
dfb923f34e
automatically set background images to png when needed
2011-08-11 20:36:31 +02:00
ef5e253bf5
changed radiobuttons to jQuery UI buttons (restyled) on installation page
2011-08-11 18:18:50 +02:00
26ac7f0f1d
get rid of some js errors on the login screen
2011-08-11 16:53:00 +02:00
f03874ac49
work on user management
2011-08-10 22:38:28 +02:00
fbf86c6683
made sliding settings more awesome
2011-08-10 17:31:01 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
88e2b3a857
initial work on new user management
2011-08-09 15:29:13 +02:00
97462b018d
Merge MySQL and PostgreSQL input fields
2011-08-09 11:32:22 +02:00
16bb34cd94
settings are now AWESOME
2011-08-08 23:32:09 +02:00
e153fb79bb
fix mysql config not showing for installation
2011-08-08 20:24:06 +02:00
c572de6276
hide log in button etc when form fields not filled
2011-08-08 11:46:39 +02:00
70a4cfd112
removed paragraphs in forms, added show password function
2011-08-08 11:07:44 +02:00
3e8ae8636c
Add postgresql support
...
REVIEW: 102101
2011-08-07 21:06:53 +02:00
6d5402247c
some documentation for the common javascript
2011-08-06 23:19:07 +02:00
5ef407d1c9
keyboard shortcuts for search results
2011-07-31 04:03:48 +02:00
e6821e9d7c
Show play and add-to-playlist buttons in instant search results
...
for now this only works from inside the media app
2011-07-31 00:50:04 +02:00
aa08196c32
some interface work on instant search
2011-07-30 21:18:54 +02:00
d2d77b2a48
initial work on instant search
2011-07-30 18:05:20 +02:00
2781fdeed8
automatically replace svg images with png for browsers that dont support svg
2011-07-29 17:51:38 +02:00
74249c65da
give OC.imagePath the ability to detect whether to use svg or png images
2011-07-28 04:28:04 +02:00
556bf2ef4d
fix broken merge
2011-07-27 16:57:49 +02:00
0dad1f8ccb
merge master into interface
2011-07-27 16:42:58 +02:00
606dec8da0
some minor changes in the javascript translation function
...
also provide Array.prototype.indexOf for browser that don't support it nativale (IE)
2011-07-27 16:40:26 +02:00
b0f166fc83
some javascript changes
2011-07-26 16:43:12 +02:00
6a9a62b7d2
remove some dummy code
2011-07-25 23:21:07 +02:00
98cd83fabd
bumb jquery and jquery-ui versions
2011-07-25 23:16:05 +02:00
ac0c33209d
add js versions of linkTo, imagePath,addScript and addStyle
2011-07-25 22:30:55 +02:00
bcfd1ff304
Adapt javascript-i18n to latest changes
2011-06-20 22:57:28 +02:00
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
Robin Appelman
scambra
Björn Schießle
Michael Gapczynski
Bart Visscher
Jörn Friedrich Dreyer
Arthur Schiwon
Thomas Tanghus
Anders Nor Berle
Jakob Sack
Brice Maron
Michael Gapczynski
Simon Birnbach
Georg Ehrke
Bartek Przybylski
unknown
Thomas Mueller
Jan-Christoph Borchardt
Roland van Laar
Marvin Thomas Rabe
Tom Needham
Georg Ehrke
Robin Appelman
Jan-Christoph Borchardt
Florian Pritz
Bart Visscher
Dawid Opis
Serge Martin
Jakob Sack