Michael Gapczynski
|
d6bb04a74e
|
Move jquery.inview from contacts app to core
|
2012-08-26 17:55:51 -04:00 |
Jörn Friedrich Dreyer
|
fd5af9aff4
|
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
|
2012-08-25 00:06:20 +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 |
Michael Gapczynski
|
d84b1adf34
|
Dynamically update shared status icon
|
2012-08-24 15:32:06 -04:00 |
Michael Gapczynski
|
7168fa4b05
|
Add padding to the reshared text
|
2012-08-24 15:12:16 -04:00 |
Michael Gapczynski
|
fedb3641f9
|
Determine if reshare needs to be checked
|
2012-08-24 15:12:16 -04:00 |
Michael Gapczynski
|
36487246ed
|
Switch to using file cache ids instead of paths for file sharing
|
2012-08-24 10:05:37 -04:00 |
Michael Gapczynski
|
cfec290ad9
|
Prevent resharing in UI if share permission not granted
|
2012-08-24 10:05:37 -04:00 |
Arthur Schiwon
|
a3b4cb205c
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-24 14:54:16 +02:00 |
Thomas Tanghus
|
aefa52018d
|
Use right variable name.
|
2012-08-23 05:02:30 +02:00 |
Michael Gapczynski
|
885b8c481b
|
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
|
2012-08-22 12:32:07 -04:00 |
Michael Gapczynski
|
9699ff03bd
|
Revert using item name, no longer allowing the same item source exist for a user
|
2012-08-22 11:57:58 -04:00 |
Michael Gapczynski
|
09e851a9c4
|
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
|
2012-08-20 21:22:22 -04:00 |
Michael Gapczynski
|
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 |
Anders Nor Berle
|
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 |
Michael Gapczynski
|
df8a2e5361
|
File sharing cleanup, works perfectly I think :)
|
2012-08-16 12:20:14 -04:00 |
Bart Visscher
|
63af75586b
|
Merge branch 'master' into routing
|
2012-08-15 17:39:00 +02:00 |
Bart Visscher
|
4954e46bb2
|
Use core routes in js too
|
2012-08-15 17:38:55 +02:00 |
Michael Gapczynski
|
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 |
Thomas Tanghus
|
eb516b79b6
|
Position appsettings fixed and load it in dynamically added element.
|
2012-08-12 18:42:54 +02:00 |
Jakob Sack
|
7fa896971f
|
JavaScript file for activating web cron
|
2012-08-09 00:58:54 +02:00 |
Michael Gapczynski
|
d02b0e39b2
|
Fix issues with hiding and showing dropdown
|
2012-08-08 17:50:09 -04:00 |
Michael Gapczynski
|
a22f30fb78
|
Reset item shares variable, fixes autocomplete not showing people
|
2012-08-08 11:39:00 -04:00 |
Michael Gapczynski
|
b1a7e30819
|
Actually change background image of shared items
|
2012-08-07 21:23:55 -04:00 |
Michael Gapczynski
|
51ddc44b62
|
Somewhat fixes dropdown display issues in the contacts app
|
2012-08-06 15:43:20 -04:00 |
Michael Gapczynski
|
6f83540dd6
|
Remove person from array after unshare, so name appears in autocomplete again
|
2012-08-06 14:45:45 -04:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
4f10574065
|
Don't load item if it doesn't have it status set
|
2012-08-06 13:30:44 -04:00 |
Michael Gapczynski
|
3b2c853916
|
Lots of refactoring to share API
|
2012-08-06 11:27:13 -04:00 |
Arthur Schiwon
|
c5d5ca88a8
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-03 13:15:15 +02:00 |
Michael Gapczynski
|
26e406c3c0
|
Hide 'can edit' if not checked
|
2012-08-01 18:03:00 -04:00 |
Michael Gapczynski
|
4933128850
|
Throw exceptions in share API for UI to display
|
2012-08-01 17:52:29 -04:00 |
Thomas Tanghus
|
98f37b93f6
|
Propagate exceptions in OC.appSettings.
|
2012-08-01 16:24:02 +02:00 |
Michael Gapczynski
|
83b935a1c2
|
Prevent up and down arrow from changing the share with input value
|
2012-07-31 21:31:59 -04:00 |
Michael Gapczynski
|
269922543e
|
Give share with search focus when sharing dropdown appears
|
2012-07-31 14:48:19 -04:00 |
Jörn Friedrich Dreyer
|
795e78809f
|
add oracle to install & setup
|
2012-07-31 19:34:30 +02:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
8729119d4b
|
Add suggestion to share with search for sharing via email
|
2012-07-31 10:18:26 -04:00 |
Thomas Tanghus
|
6df95db8e8
|
Forgot to also use the options I added :-P
|
2012-07-31 16:05:58 +02:00 |
Thomas Tanghus
|
8837576ce7
|
Added some more options to OC.appSettings().
|
2012-07-31 16:03:08 +02:00 |
Thomas Tanghus
|
fb14cb87bd
|
Made the parameter for OC.appSettings() an object to be able to extend it.
|
2012-07-31 14:17:28 +02:00 |
Thomas Tanghus
|
084866cb1e
|
White space
|
2012-07-31 14:06:44 +02:00 |
Thomas Tanghus
|
553773f2e1
|
Popup for app specific settings.
|
2012-07-31 12:23:22 +02:00 |
Michael Gapczynski
|
ed71343df8
|
Autocomplete for share with search in sharing dropdown
|
2012-07-30 15:30:21 -04:00 |
Michael Gapczynski
|
db72ce398b
|
Add support for configuring which permissions are possible for items
|
2012-07-27 10:13:23 -04:00 |
Michael Gapczynski
|
cb21406e18
|
Implement CRUDS in share dropdown, and some clean-up
|
2012-07-26 21:56:22 -04:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Robin Appelman
|
b1010160b3
|
CSRF protection for eventsource
|
2012-07-22 16:37:49 +02:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
cbf851de69
|
Show private link in dropdown
|
2012-07-11 12:21:30 -04:00 |
Michael Gapczynski
|
ccb5e99395
|
Generate random token for private links (more entropy than past private links)
|
2012-07-11 12:18:59 -04:00 |
Michael Gapczynski
|
7c908a0016
|
Sharing files working using share API
|
2012-07-10 18:56:22 -04:00 |
Michael Gapczynski
|
0045e64041
|
Fix time formatting for minutes, prepend 0 if minutes is less than 10
|
2012-07-06 16:49:15 -04:00 |
Michael Gapczynski
|
90e4af312a
|
Fix time formatting for minutes, prepend 0 if minutes is less than 10
|
2012-07-06 16:38:54 -04:00 |
Brice Maron
|
799e34acd4
|
Add slash to app url if not set fix oc-1169
|
2012-07-03 21:58:36 +00:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
db33765e36
|
Add share with to list in dropdown after sharing
|
2012-07-03 16:52:53 -04:00 |
Michael Gapczynski
|
5e8ef33190
|
Clean up in the dropdown for unsharing
|
2012-07-03 14:00:09 -04:00 |
Michael Gapczynski
|
dd7d34a40e
|
Prevent adding a duplicate to a multiselect
|
2012-07-01 11:36:44 -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
|
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 |
Michael Gapczynski
|
8e4832bd12
|
Prevent adding a duplicate to a multiselect
|
2012-06-29 16:44:08 -04:00 |
Michael Gapczynski
|
05cb94801a
|
Add new group to other user's group select forms
|
2012-06-29 16:29:58 -04:00 |
Michael Gapczynski
|
cb19fdd55b
|
Show users and groups shared with in dropdown
|
2012-06-27 01:05:37 +02:00 |
Michael Gapczynski
|
b5961635ea
|
Fix ajax share file and replace 'User or Group' select form with a textbox
|
2012-06-27 01:05:36 +02:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
bc68f14c4b
|
Prepare drop down UI for share API
|
2012-06-27 01:05:36 +02:00 |
Michael Gapczynski
|
945565f420
|
Move ajax and js files to core
|
2012-06-27 01:05:36 +02:00 |
Bjoern Schiessle
|
595ff468f5
|
typo in js statement fixed
|
2012-06-26 10:36:33 +02:00 |
Bjoern Schiessle
|
18d5420744
|
typo in js statement fixed
|
2012-06-26 10:35:19 +02:00 |
Brice Maron
|
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 |
Brice Maron
|
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 |
Robin Appelman
|
8f616ecf76
|
fix potential xss in multiselect
|
2012-06-09 15:08:05 +02:00 |
Robin Appelman
|
cfe219fbb9
|
fix potential xss in multiselect
|
2012-06-09 15:07:16 +02:00 |
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
Robin Appelman
|
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 |
Robin Appelman
|
9eb91a111d
|
update to jquery 1.7.2
|
2012-05-12 00:37:19 +02:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
52d113b9e1
|
Prevent extra '/' from being added to url if app is not defined
|
2012-05-07 12:35:02 -04:00 |
Simon Birnbach
|
df6b15445d
|
Fix bug on browsers like rekonq which stopped execution of javascript
|
2012-05-07 17:35:23 +02:00 |
Georg Ehrke
|
936c8ba1cc
|
improve remote.php and create public.php
|
2012-05-07 15:39:17 +02:00 |
Thomas Tanghus
|
2580d8540d
|
Dialogs: Clean indentation. Add some missing brackets.
|
2012-05-05 13:49:47 +02:00 |
Thomas Tanghus
|
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 |
Thomas Tanghus
|
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 |
Thomas Tanghus
|
a4a3d62a55
|
Check for callback in OC.dialogs.alert.
|
2012-05-04 00:13:35 +02:00 |
Bartek Przybylski
|
5611e6c9d3
|
fix incorrect dialog computing in ff
|
2012-05-03 12:32:37 +02:00 |
unknown
|
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 |
Thomas Mueller
|
07f2e316e4
|
removing executable bit from various files
|
2012-04-30 12:05:57 +02:00 |
Thomas Tanghus
|
9c520c70a8
|
Various file path fixes.
|
2012-04-30 01:48:01 +02:00 |
Georg Ehrke
|
40f95ffdf3
|
fix security check for the path of the requested file
|
2012-04-26 17:55:00 +02:00 |
Georg Ehrke
|
0249a72cab
|
fix downloading of files in files app
|
2012-04-26 17:35:12 +02:00 |
Georg Ehrke
|
3f64eb25ab
|
some fixes fore movable apps
|
2012-04-26 14:52:55 +02:00 |
Georg Ehrke
|
d6346b5b0b
|
fix OC.filePath in main js
|
2012-04-24 21:54:09 +02:00 |
Georg Ehrke
|
684007bbae
|
fix pathes in contacts
|
2012-04-24 21:33:34 +02:00 |
Georg Ehrke
|
6d92ebca45
|
use native functions of php to parse the string into the Var
|
2012-04-23 17:09:28 +02:00 |
Georg Ehrke
|
9226cb7a6a
|
rename var file to getfile to prevent fails in files app
|
2012-04-23 16:36:24 +02:00 |
Georg Ehrke
|
12ef2f5054
|
modify OC.filepath for movable apps
|
2012-04-20 22:35:12 +02:00 |
Jan-Christoph Borchardt
|
e5cda3abcd
|
tooltip for delete shows up to the left
|
2012-04-15 17:49:54 +02:00 |
Jan-Christoph Borchardt
|
7ddd043427
|
renamed extention to extension, also now only showing lowercase
|
2012-04-15 13:34:30 +02:00 |
Jan-Christoph Borchardt
|
5868199e85
|
fixed settings hover, now whole row sensitive and fading not jerky
|
2012-04-15 13:34:30 +02:00 |
Bart Visscher
|
30498fd6f8
|
Use offset function to position block elements
|
2012-04-14 18:31:41 +02:00 |
Bart Visscher
|
b8466d362e
|
Fix rescan "File not Found" error handling in oc-vcategories.js
|
2012-04-13 21:13:58 +02:00 |
Jan-Christoph Borchardt
|
eea0d2e096
|
fixing delete tooltip
|
2012-04-13 18:28:17 +02:00 |
Jan-Christoph Borchardt
|
31df4c00ec
|
adding tipsy tooltips for file actions
|
2012-04-13 17:22:23 +02:00 |
Bart Visscher
|
bc81179163
|
Fix categories delete fallback when there is no app specific ajax categories delete function
|
2012-04-12 23:10:49 +02:00 |
unknown
|
2f3c0a6d80
|
wrong defaultValue definition in OC.AppConfig.getValue
done
|
2012-04-12 19:14:25 +02:00 |
Bart Visscher
|
9f547a1b39
|
VCategories: fix function names to coding standard
|
2012-04-10 21:53:51 +02:00 |
Thomas Tanghus
|
d1ae6512cc
|
Contacts: Misc. cleanup tweaks.
|
2012-04-07 16:03:43 +02:00 |
Bartek Przybylski
|
96c99125da
|
mimetype filter for filepicker
|
2012-04-05 23:18:44 +02:00 |
Bartek Przybylski
|
5b4a303672
|
loading screen for filepicker
|
2012-04-05 21:29:54 +02:00 |
Bartek Przybylski
|
cd05dfb943
|
adding icons to filepicker
|
2012-04-03 22:18:03 +02:00 |
Bartek Przybylski
|
ff5dbc52b8
|
multiselect handle for filepicker
|
2012-04-02 21:32:35 +02:00 |
Bartek Przybylski
|
f21d6d4f9f
|
dialogs filepicker first draft
|
2012-04-02 19:39:24 +02:00 |
Bartek Przybylski
|
4e327295c6
|
adding callback when ok click on alert dialog
|
2012-04-01 00:30:52 +02:00 |
Robin Appelman
|
2f68b08491
|
fix eventsource for ie
|
2012-03-31 16:40:42 +02:00 |
Robin Appelman
|
ad495a9218
|
fix potential problem when using multiply eventsource's
|
2012-03-31 16:10:29 +02:00 |
Bartek Przybylski
|
6b704a780d
|
select field added to oc.dialogs.form, gallery ported to use it
|
2012-03-30 22:50:57 +02:00 |
Thomas Tanghus
|
0a07e5fdaa
|
Added some documentation.
|
2012-03-27 12:30:20 +02:00 |
Bartek Przybylski
|
cbdcb68c2b
|
gallery sharing, experimental version
|
2012-03-24 18:35:42 +01:00 |
Thomas Tanghus
|
03eb5197b6
|
Added category editor for apps using OC_VObjects.
|
2012-03-12 14:13:03 +01:00 |
Bartek Przybylski
|
c411826fe5
|
moving gallery op to one file, migrate gallery dialogs to oc dialogs
|
2012-03-04 00:35:37 +01:00 |
Bartek Przybylski
|
2754cac21f
|
dialogs library for apps
|
2012-02-28 23:02:30 +01:00 |
Roland van Laar
|
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 |
Robin Appelman
|
3d0d47957e
|
improved humanFileSize for js
|
2012-02-26 14:12:50 +01:00 |
Robin Appelman
|
a5e892505e
|
more robust png fallback
|
2012-02-26 03:10:29 +01:00 |
Robin Appelman
|
797e921b9a
|
improve log browsing
|
2012-02-26 03:10:29 +01:00 |
Robin Appelman
|
8b93a9a237
|
add javascript bindings for OC_AppConfig
|
2012-02-25 16:35:40 +01:00 |
Robin Appelman
|
862f824d64
|
some multiselect improvements
|
2012-02-25 16:35:40 +01:00 |
Marvin Thomas Rabe
|
b3f3b8c23f
|
UI problems solved. Bookmarks app updated.
|
2012-02-22 16:04:31 +01:00 |
Robin Appelman
|
fdf3df3de5
|
add option to send get data along with an eventsource request
|
2012-01-31 16:35:47 +01:00 |
Robin Appelman
|
6a1121ab2e
|
provide server side close option for EventStream
|
2012-01-30 23:19:58 +01:00 |
Robin Appelman
|
45038af948
|
provide small wrapper around server side events and provide a fallback for IE
|
2012-01-30 20:21:16 +01:00 |
Robin Appelman
|
039bbfde2d
|
automatically show advanced options when no sqlite is available
|
2012-01-29 18:00:55 +01:00 |
Robin Appelman
|
b366b0eb52
|
quick fix for javascript translations
|
2012-01-16 00:09:43 +01:00 |
Robin Appelman
|
a883fcca3c
|
add user and instance awere localstorage to prevent collisions when using localstorage
|
2012-01-15 19:22:32 +01:00 |
Robin Appelman
|
872d301af3
|
fix inconsitent behaviour when trying to remove yourself from the admin group
|
2012-01-15 00:50:01 +01:00 |
Robin Appelman
|
0ac9e56da9
|
small fix for server svg mimetype detection
|
2012-01-14 23:41:48 +01:00 |
Robin Appelman
|
5eb6071b04
|
make the minimum width of the multiselect configurable
|
2012-01-14 23:10:14 +01:00 |
Tom Needham
|
6dcabdc61c
|
Fixed merge conflict in /files/ajax/move.php
|
2012-01-04 16:31:06 +00:00 |
Georg Ehrke
|
a1af757ef6
|
Fix whitespace username in the installation form
|
2012-01-02 14:21:46 +01:00 |
Robin Appelman
|
1415cb8d19
|
add infieldlabel source
|
2012-01-01 23:48:38 +01:00 |
Tom Needham
|
5ebf8a87f2
|
Removed old jquery-ui css and js
|
2011-12-30 23:08:44 +00:00 |
Tom Needham
|
39e67707d7
|
Updated jquery ui js and css. Improved color scheme.
|
2011-12-30 22:47:39 +00:00 |
Georg Ehrke
|
e5a3ab8aad
|
Merge branch 'master' into fullcalendar
|
2011-11-12 15:09:37 +01:00 |
Robin Appelman
|
2c68aab198
|
Merge branch 'master' into newbutton
|
2011-11-04 03:00:03 +01:00 |
Brice Maron
|
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 |
Robin Appelman
|
d46288b0ab
|
'New' button, needs some css work
|
2011-10-23 11:40:40 +02:00 |
Bart Visscher
|
92fa6f0a48
|
Fix size calculation with css styling of tipsy popup
|
2011-10-21 22:08:55 +02:00 |
Marvin Thomas Rabe
|
de21378291
|
fixed scrollbar issues
|
2011-10-04 18:54:07 +02:00 |