Jörn Friedrich Dreyer
|
61a3e5f96b
|
unify permissions (1/3): add permission conastants to javascript OC
|
2012-08-31 01:11:10 +02:00 |
Bart Visscher
|
6324daecc0
|
Don't wait for document ready for setting requesttoken
|
2012-08-30 23:10:24 +02:00 |
Bart Visscher
|
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 |
Robin Appelman
|
8990855f88
|
add OC.get and OC.set to get/set variables by name in javascript
|
2012-08-30 03:02:29 +02:00 |
Michael Gapczynski
|
3828d86191
|
Remove old Javascript code
|
2012-08-29 14:37:36 -04:00 |
Bart Visscher
|
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 |
Michael Gapczynski
|
76bc4753e9
|
Fix displaying if a link is password protected
|
2012-08-29 14:06:55 -04:00 |
Michael Gapczynski
|
0788c6e968
|
Hide link password controls if link is removed
|
2012-08-29 14:06:55 -04:00 |
Michael Gapczynski
|
26501a0bc8
|
Delete old link if user sets a password
|
2012-08-29 14:06:55 -04:00 |
Michael Gapczynski
|
e5cbc532c3
|
Fix password authentication for links and fix template problems for links by creating a new base layout
|
2012-08-29 11:54:49 -04:00 |
Michael Gapczynski
|
9fcb916057
|
Fix toggling of password protection in sharing dropdown
|
2012-08-29 11:54:49 -04:00 |
Jenkins for ownCloud
|
9338d093f9
|
[tx-robot] updated from transifex
|
2012-08-29 02:06:48 +02:00 |
Robin Appelman
|
92c782c1b0
|
return the jQuery deferred object when using OC.loadScript
|
2012-08-29 01:57:59 +02:00 |
Michael Gapczynski
|
2aac6f02a0
|
Reimplement links support for sharing and add password protection option
|
2012-08-27 20:37:38 -04:00 |
Michael Gapczynski
|
0a9d1ed3a6
|
Initial previewer for public links
|
2012-08-27 20:37:38 -04:00 |
Jenkins for ownCloud
|
8374a49cc1
|
[tx-robot] updated from transifex
|
2012-08-28 02:03:56 +02:00 |
Jan-Christoph Borchardt
|
4910717c09
|
remove background fade from navigation, fix flickering icon issue and make it feel faster
|
2012-08-27 14:05:18 -07:00 |
Jenkins for ownCloud
|
c33a2ca01d
|
[tx-robot] updated from transifex
|
2012-08-27 02:02:37 +02:00 |
Michael Gapczynski
|
545812f589
|
Move additional jquery.inview files
|
2012-08-26 18:50:20 -04:00 |
Michael Gapczynski
|
d6bb04a74e
|
Move jquery.inview from contacts app to core
|
2012-08-26 17:55:51 -04:00 |
Jenkins for ownCloud
|
faf702b9e6
|
[tx-robot] updated from transifex
|
2012-08-26 19:47:33 +02:00 |
Jenkins for ownCloud
|
a1a3862274
|
[tx-robot] updated from transifex
|
2012-08-26 02:02:48 +02:00 |
Jenkins for ownCloud
|
bae07faa34
|
[tx-robot] updated from transifex
|
2012-08-26 01:20:16 +02: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 |
Lukas Reschke
|
76e0ca785b
|
Added XSRF check
|
2012-08-24 14:58:48 +02:00 |
Arthur Schiwon
|
a3b4cb205c
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-24 14:54:16 +02:00 |
Jenkins for ownCloud
|
07a889631e
|
[tx-robot] updated from transifex
|
2012-08-24 02:07:18 +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
|
3debb67458
|
Move share CSS to core, add script and style from inside Share API
|
2012-08-22 11:57:58 -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 |
Jenkins for ownCloud
|
e6d87b2c4b
|
[tx-robot] updated from transifex
|
2012-08-22 02:08:16 +02: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
|
49229da0e1
|
Remove setTarget from ajax
|
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 |
Michael Gapczynski
|
5eca531f99
|
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
|
2012-08-19 22:14:38 -04:00 |
Lukas Reschke
|
d54390b1a0
|
Optimized image size
|
2012-08-18 13:56:04 +02: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 |
Michael Gapczynski
|
64ef1e2181
|
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
|
2012-08-12 14:49:41 -04:00 |
Thomas Tanghus
|
eb516b79b6
|
Position appsettings fixed and load it in dynamically added element.
|
2012-08-12 18:42:54 +02:00 |
Bart Visscher
|
db4111f6d5
|
Routing: Add some core routes
|
2012-08-12 16:52:36 +02:00 |
Jenkins for ownCloud
|
355a1adb3a
|
[tx-robot] updated from transifex
|
2012-08-12 02:04:58 +02:00 |
Jakob Sack
|
81b997b56e
|
Merge branch 'backgroundjobs'
|
2012-08-10 13:00:51 +02:00 |
Bart Visscher
|
667cd318fe
|
Use OC_Util::displayLoginPage and cleanup the function
|
2012-08-10 11:43:04 +02:00 |
Lukas Reschke
|
334296b027
|
Removed unused file
|
2012-08-10 00:09:00 +02:00 |
Lukas Reschke
|
ab97c04894
|
Added XSRF check
|
2012-08-10 00:09:00 +02:00 |
Michael Gapczynski
|
78cd1153f0
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
|
2012-08-09 11:38:22 -04: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 |
Bart Visscher
|
d4882df8cb
|
Fix warnings and better styling
|
2012-08-07 23:29:56 +02:00 |
Bart Visscher
|
1b5c8ff471
|
Don't return error when just no sharing found
|
2012-08-07 23:29:01 +02:00 |
Michael Gapczynski
|
0ddfc94cf5
|
Try to fix last commit
|
2012-08-07 14:34:29 -04:00 |
Michael Gapczynski
|
5e2ef1e918
|
Check if itemShares share type is an array instead of set, javascript likes to set indexes to 'undefined'
|
2012-08-07 14:11:48 -04:00 |
Michael Gapczynski
|
b6b713eb76
|
Only show the user's groups in the share with autocomplete
|
2012-08-06 20:43:08 -04:00 |
Jenkins for ownCloud
|
a9f894ce11
|
[tx-robot] updated from transifex
|
2012-08-07 02:07:50 +02: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 |
Thomas Tanghus
|
cc445e4e47
|
Small changes to allow updating main menu dynamically.
|
2012-08-05 01:42:17 +02:00 |
Tom Needham
|
538e72fe61
|
Fix scrollbar issue. Fixes oc-1414
|
2012-08-04 23:30:28 +00:00 |
Michael Gapczynski
|
002ad4ba16
|
Tweak users delete notification
|
2012-08-04 16:44:26 -04:00 |
Arthur Schiwon
|
c5d5ca88a8
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-03 13:15:15 +02:00 |
Jenkins for ownCloud
|
91e828c6ce
|
[tx-robot] updated from transifex
|
2012-08-02 02:06:16 +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 |
Michael Gapczynski
|
2201074e1f
|
Basic setup for sharing with contacts
|
2012-08-01 17:17:28 -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
|
b6aa5d2875
|
Include contacts in share with search
|
2012-07-31 21:05:00 -04:00 |
Jenkins for ownCloud
|
274d1ef87f
|
[tx-robot] updated from transifex
|
2012-08-01 02:02:35 +02:00 |
Jenkins for ownCloud
|
36ccaf51ed
|
[tx-robot] updated from transifex
|
2012-07-31 22:57:24 +02:00 |
Michael Gapczynski
|
94ce8f2168
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
|
2012-07-31 15:00:04 -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
|
d66f071d3e
|
Use search and limit parameters for share with search in sharing dropdown
|
2012-07-30 20:21:48 -04:00 |
Michael Gapczynski
|
ed71343df8
|
Autocomplete for share with search in sharing dropdown
|
2012-07-30 15:30:21 -04:00 |
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
Michael Gapczynski
|
e18639551d
|
Tweak appearance of undo delete notification
|
2012-07-29 18:02:08 -04:00 |
Michael Gapczynski
|
db72ce398b
|
Add support for configuring which permissions are possible for items
|
2012-07-27 10:13:23 -04:00 |
Bjoern Schiessle
|
680eed6bac
|
fix for bug #1295, don't escape password reset link
|
2012-07-27 15:35:36 +02:00 |
Michael Gapczynski
|
cb21406e18
|
Implement CRUDS in share dropdown, and some clean-up
|
2012-07-26 21:56:22 -04:00 |
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Lukas Reschke
|
12dfe5868a
|
Updated style
|
2012-07-26 01:38:46 +02:00 |
Lukas Reschke
|
d24326ecce
|
Updated style
|
2012-07-26 01:38:20 +02:00 |
Lukas Reschke
|
d425740dc2
|
Remove unused files
|
2012-07-26 01:19:46 +02:00 |
Lukas Reschke
|
1554d7a2c0
|
Check for admin user
|
2012-07-26 01:16:32 +02:00 |
Lukas Reschke
|
9605e1926c
|
Check for admin user
|
2012-07-26 00:06:51 +02:00 |
Lukas Reschke
|
85a410d7a3
|
Remove unused files
|
2012-07-26 00:04:12 +02: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 |
Georg Ehrke
|
f9d3388854
|
Merge branch 'master' into calendar_import
|
2012-07-21 17:37:10 +02:00 |
Bjoern Schiessle
|
20a174e71b
|
remove second "autocomplete" statement
|
2012-07-18 12:27:15 +02:00 |
Bjoern Schiessle
|
3895e3a5ae
|
remember username and provide autocomplete feature
|
2012-07-18 12:26:10 +02:00 |
Bjoern Schiessle
|
0ea29398c7
|
remember username and provide autocomplete feature
|
2012-07-18 12:22:30 +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
|
88f4845ca3
|
Sanitization isn't required here
|
2012-07-11 20:04:18 -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 |
Georg Ehrke
|
5575493900
|
Merge branch 'master' into calendar_import
|
2012-07-11 10:47:30 +02:00 |
Michael Gapczynski
|
b148256233
|
Get rid of sneaky error_log() that got left behind
|
2012-07-10 21:30:52 -04:00 |
Michael Gapczynski
|
c0e1b8e7e7
|
Sanitize POST and GET in ajax/share
|
2012-07-10 19:54:03 -04:00 |
Michael Gapczynski
|
7c908a0016
|
Sharing files working using share API
|
2012-07-10 18:56:22 -04: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 |
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 |
Georg Ehrke
|
657eef354a
|
Merge branch 'master' into calendar_import
|
2012-07-04 13:03:30 +02: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
|
dd56416a39
|
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
|
2012-07-02 14:23:13 -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 |
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02: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
|
578b8a9da1
|
$_POST variables should be $_GET for fetch
|
2012-06-27 01:05:36 +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 |
Georg Ehrke
|
4e53db3d9c
|
Merge branch 'master' into oc_error
|
2012-06-26 14:17:32 +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 |
Sam Tuke
|
f374dae233
|
Added text ACS warning to admin's user settings page, and corresponding CSS styles
|
2012-06-25 18:04:10 +01:00 |
Georg Ehrke
|
a113ee9e9f
|
add x-webkit-speech to searchbox
|
2012-06-24 00:42:16 +02:00 |
Georg Ehrke
|
243f910ae4
|
Merge branch 'master' into oc_error
|
2012-06-22 21:37:03 +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
|
e5c56b2433
|
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
|
2012-06-21 17:15:35 +00:00 |
Bjoern Schiessle
|
34739b7ec5
|
use new sanitizeHTML() function
|
2012-06-21 13:57:18 +02:00 |
Georg Ehrke
|
ccacb6f918
|
Merge branch 'master' into oc_error
|
2012-06-19 11:30:18 +02:00 |
Florian Hülsmann
|
c3cd3f3571
|
CSS class headerAction -> header-action
|
2012-06-18 23:22:52 +02:00 |
Florian Hülsmann
|
0132b80282
|
added CSS class .headerAction
|
2012-06-18 23:18:32 +02:00 |
Georg Ehrke
|
6bd0a158f7
|
Merge branch 'master' into oc_error
|
2012-06-18 15:59:39 +02:00 |
Bart Visscher
|
2f00384b51
|
Use TemplateLayout functions for finding js and css files in minimizer
|
2012-06-18 15:40:48 +02:00 |
Georg Ehrke
|
e31c9a7b6f
|
Merge branch 'master' into oc_error
|
2012-06-18 14:34:49 +02:00 |
Florian Hülsmann
|
4a50c15a8e
|
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
|
2012-06-18 13:36:49 +02:00 |
Bart Visscher
|
617de811f7
|
Cache the minimized output also on the server
|
2012-06-18 11:11:46 +02:00 |
Georg Ehrke
|
06c610c2ee
|
Merge branch 'master' into oc_error
|
2012-06-17 08:36:33 +02:00 |
Bart Visscher
|
99a68abbd5
|
Add session_write_close to the minimizer
|
2012-06-16 20:52:10 +02:00 |
Georg Ehrke
|
2c8a61ae9c
|
Merge branch 'master' into oc_error
|
2012-06-15 20:48:37 +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 |
Thomas Tanghus
|
f0b87bc421
|
Make requesttoken global.
|
2012-06-14 18:13:01 +02:00 |
Thomas Tanghus
|
5b1a14f9ea
|
Contacts: Implement CSRF prevention.
|
2012-06-14 18:00:13 +02:00 |
Thomas Tanghus
|
625cd822c3
|
Backport CSRF prevention.
|
2012-06-14 13:52:22 +02:00 |
Michael Gapczynski
|
b5889d6ffe
|
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
|
2012-06-13 15:17:46 -04:00 |
Thomas Tanghus
|
89464721c7
|
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
|
2012-06-13 17:33:19 +02:00 |
Bjoern Schiessle
|
48ee265170
|
urlencode link fort password reset (bug #970)
|
2012-06-13 17:26:30 +02:00 |
Bjoern Schiessle
|
b9d5f510c3
|
urlencode link fort password reset (bug #970)
|
2012-06-13 17:22:28 +02:00 |
Lukas Reschke
|
6defbc7f4d
|
Removed some unessecary sanitizations
|
2012-06-11 19:20:48 +02:00 |
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
Georg Ehrke
|
82abbed883
|
Merge branch 'master' into oc_error
|
2012-06-10 18:38:38 +02: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 |
Georg Ehrke
|
f43fd1765e
|
fix merge conflicts
|
2012-06-08 11:23:58 +02:00 |
Bart Visscher
|
4260dce826
|
Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
|
2012-06-07 21:35:40 +02:00 |
Brice Maron
|
cf02f3c107
|
Merge branch 'master' into multi_app_dir
|
2012-06-07 19:11:55 +00:00 |
Michael Gapczynski
|
d28e0f4d5b
|
Remove old internal mail call for password reset, fixes bug oc-934
Conflicts:
core/lostpassword/index.php
|
2012-06-07 09:36:23 -04:00 |
Michael Gapczynski
|
3c3a2b9b27
|
Remove old internal mail call for password reset, fixes bug oc-934
|
2012-06-07 09:25:50 -04:00 |
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
Brice Maron
|
cc494259d3
|
Unit path and webpath, correct some more
|
2012-06-06 20:24:15 +00:00 |
Georg Ehrke
|
fa0c45b005
|
Merge branch 'master' into oc_error
|
2012-06-06 10:12:54 +02:00 |
Robin Appelman
|
f1b10fcc93
|
update translations
|
2012-06-06 00:29:44 +02:00 |
Robin Appelman
|
f7d221f5f0
|
update translations
|
2012-06-06 00:29:28 +02:00 |
Bart Visscher
|
eed0450351
|
Fix remap dir for CSS minimizer
|
2012-06-05 18:09:32 +02:00 |
Bart Visscher
|
7e017253f5
|
Load apps before minimizing the core css and js
|
2012-06-04 23:17:50 +02:00 |
Bart Visscher
|
4a5973662c
|
Merge branch 'unstable'
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
|
2012-06-04 23:02:05 +02:00 |
Georg Ehrke
|
b8275691e7
|
Merge branch 'master' into oc_error
|
2012-06-04 10:35:50 +02:00 |
Frank Karlitschek
|
d4ea853fcf
|
use our own serverHost call so that ownCloud works with reverse proxy servers
|
2012-05-31 20:26:09 +02:00 |
Frank Karlitschek
|
5d425a9f79
|
use our own serverHost call so that ownCloud works with reverse proxy servers
|
2012-05-31 20:16:44 +02:00 |
Georg Ehrke
|
94c633b6b7
|
Merge branch 'master' into oc_error
|
2012-05-26 22:54:49 +02:00 |
Frank Karlitschek
|
a945fa10a6
|
update copyright
|
2012-05-26 19:14:24 +02:00 |
Georg Ehrke
|
79bf933319
|
Merge branch 'master' into oc_error
|
2012-05-25 10:30:44 +02:00 |
Thomas Mueller
|
ede89ee405
|
oc-657: icons for M$ office file types
|
2012-05-21 09:35:31 +02:00 |
Michiel de Jong
|
fc536c3491
|
add htmlentities() call into login form
|
2012-05-18 16:12:49 +02:00 |
Georg Ehrke
|
3d713e711b
|
Merge branch 'master' into oc_error
|
2012-05-17 22:17:31 +02:00 |
Michael Gapczynski
|
cbfbbe672c
|
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
|
2012-05-17 15:38:28 -04: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
|
ac8bfc218e
|
update translations
|
2012-05-17 00:36:21 +02:00 |
Bart Visscher
|
ce1e4425c2
|
Combine and minimize core and default app js files
|
2012-05-16 18:53:46 +02:00 |
Bart Visscher
|
f71fec8cdc
|
Combine and minimize core and default app css files
|
2012-05-16 18:53:46 +02:00 |
Michiel de Jong
|
4c6d11e223
|
move auth.css and remoteStorage-big.png to assets folders From where they can be included
|
2012-05-14 17:05:35 +02:00 |
Michael Gapczynski
|
198b73ddd1
|
Sanitize search queries, thanks to Lukas Reschke
|
2012-05-13 15:57:46 -04:00 |
Robin Appelman
|
ee0294bbb1
|
update translations
|
2012-05-13 20:00:34 +02:00 |
Georg Ehrke
|
a5f0ac811f
|
Merge branch 'master' into oc_error
|
2012-05-13 19:13:31 +02:00 |
Robin Appelman
|
9eb91a111d
|
update to jquery 1.7.2
|
2012-05-12 00:37:19 +02:00 |
Bart Visscher
|
20499e336b
|
Remove duplicate line
|
2012-05-11 22:13:05 +02:00 |
Jan-Christoph Borchardt
|
00e1d174a9
|
fixed settings text not being clickable
|
2012-05-11 12:24:49 +00: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 |
Jan-Christoph Borchardt
|
d1e5a56bc6
|
fixing upload icon color
|
2012-05-10 21:40:22 +02:00 |
Tom Needham
|
bf93b9e98a
|
Make select_all checkbox more central
|
2012-05-10 18:08:46 +00:00 |
Jan-Christoph Borchardt
|
20f8137ca0
|
upload button goes MJ
|
2012-05-10 20:05:30 +02:00 |
Vitaly Kuznetsov
|
6f981738bb
|
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
|
2012-05-10 09:10:53 +00:00 |
Robin Appelman
|
588b51d88a
|
update translations
|
2012-05-09 12:41:01 +02: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 |
Bart Visscher
|
2facf509cc
|
Merge branch 'tasks' for Tasks app
|
2012-05-05 18:26:13 +02:00 |
Florian Hülsmann
|
4a7591d0ab
|
Custom icons for contacts app
|
2012-05-05 16:31:58 +02:00 |
Thomas Tanghus
|
2580d8540d
|
Dialogs: Clean indentation. Add some missing brackets.
|
2012-05-05 13:49:47 +02:00 |
Bart Visscher
|
a004759230
|
Tasks: Really correct icon
|
2012-05-04 20:44:11 +02:00 |
Thomas Tanghus
|
d9592ddcb0
|
Tried to make settings/apps more keyboard/screenreader friendly.
|
2012-05-04 17:56:00 +02:00 |
Bart Visscher
|
1e47156226
|
Merge branch 'master' into tasks
|
2012-05-04 17:04:11 +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 |
Bartek Przybylski
|
8feb7dd9d9
|
fix filepicker in webkit
|
2012-05-03 12:09:59 +02:00 |
Bart Visscher
|
71f9b1968e
|
Tasks: Make it possible to close the details area
|
2012-05-02 17:28:19 +02:00 |
Georg Ehrke
|
c536e930f4
|
add appswebroot to the guest template
|
2012-05-02 16:41:23 +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 |
Frank Karlitschek
|
051cb7d96b
|
show the username in the title. good idea.
|
2012-04-30 13:08:32 +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
|
993d655aad
|
Merge branch 'master' into movable_apps_2
|
2012-04-27 10:30:50 +02:00 |
Frank Karlitschek
|
74b5e22a68
|
some more csrf fixes
|
2012-04-26 23:17:46 +02:00 |
Georg Ehrke
|
6930af4c0f
|
Merge branch 'master' into movable_apps_2
|
2012-04-26 21:27:22 +02:00 |
Frank Karlitschek
|
6bdefef31e
|
csrf protection
|
2012-04-26 19:35:33 +02:00 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +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
|
ebcaa46482
|
fix loading of css files that are core related
|
2012-04-26 15:19:27 +02:00 |
Georg Ehrke
|
3f64eb25ab
|
some fixes fore movable apps
|
2012-04-26 14:52:55 +02:00 |
Sam Tuke
|
02a65f30ec
|
added history buttons
|
2012-04-25 14:01:03 +01:00 |
Georg Ehrke
|
d6346b5b0b
|
fix OC.filePath in main js
|
2012-04-24 21:54:09 +02:00 |
Georg Ehrke
|
a85d49833b
|
fix position of Semicolon
|
2012-04-24 21:52:44 +02:00 |
Georg Ehrke
|
684007bbae
|
fix pathes in contacts
|
2012-04-24 21:33:34 +02:00 |
Georg Ehrke
|
42a570788b
|
Merge branch 'master' into movable_apps
|
2012-04-23 19:56:07 +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 |
Jan-Christoph Borchardt
|
1b29fc3fb2
|
fixing multiselect overflow, issue 341
|
2012-04-23 14:29:11 +02:00 |
Jan-Christoph Borchardt
|
3ba9a9e6a8
|
adding proper copyright and license notice to the style files
|
2012-04-23 14:19:03 +02:00 |
Georg Ehrke
|
6b9072de58
|
fix merge conflicts
|
2012-04-22 13:20:25 +02:00 |
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
Thomas Tanghus
|
f08cfcecec
|
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
|
2012-04-22 03:59:28 +02:00 |
Georg Ehrke
|
e29ae46609
|
fix merge conflicts
|
2012-04-21 22:12:31 +02:00 |
Georg Ehrke
|
711aa229b8
|
Merge branch 'master' into movable_apps
|
2012-04-20 22:41:39 +02:00 |
Georg Ehrke
|
12ef2f5054
|
modify OC.filepath for movable apps
|
2012-04-20 22:35:12 +02:00 |
Frank Karlitschek
|
2fbc92bd4b
|
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
|
2012-04-20 20:49:35 +02:00 |
Georg Ehrke
|
3fb91a7411
|
restore require once command for non app files
|
2012-04-18 17:49:50 +02:00 |
Georg Ehrke
|
eb29c577c2
|
Merge branch 'master' into movable_apps
|
2012-04-18 12:20:09 +02:00 |
Georg Ehrke
|
cf492a9649
|
Merge branch 'master' into calendar_sharing
|
2012-04-18 11:51:59 +02:00 |
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
Robin Appelman
|
cfd0140e2f
|
fix 2 potential xss problems
|
2012-04-16 12:59:38 +02:00 |
Jan-Christoph Borchardt
|
3c182bdb35
|
adding sticker logo jpg
|
2012-04-16 12:57:17 +02:00 |
Jan-Christoph Borchardt
|
961c239ee4
|
improving leftcontent display, increasing item height
|
2012-04-16 12:52:48 +02:00 |
Jan-Christoph Borchardt
|
70d0103a67
|
updated logos and icons
|
2012-04-16 11:34:16 +02:00 |
Georg Ehrke
|
c8cb870a27
|
Merge branch 'master' into oc_error
|
2012-04-15 22:27:47 +02:00 |
Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +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
|
1f91224f9e
|
fixing opacity and fading, also for IE
|
2012-04-15 14:37:42 +02:00 |
Georg Ehrke
|
8ddea7e95c
|
Merge branch 'master' into calendar_sharing
|
2012-04-15 14:28:31 +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 |
Georg Ehrke
|
e292b1fcdb
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |
Jan-Christoph Borchardt
|
fbb314ef4b
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-04-14 18:56:55 +02:00 |
Bart Visscher
|
30498fd6f8
|
Use offset function to position block elements
|
2012-04-14 18:31:41 +02:00 |
Jan-Christoph Borchardt
|
a0a5668d1e
|
increase opacity of search field and logout icon
|
2012-04-14 17:20:50 +02:00 |
Robin Appelman
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
Georg Ehrke
|
e5e7d4a73a
|
fix merge conflicts
|
2012-04-13 16:44:31 -04:00 |
Georg Ehrke
|
afcb0aee40
|
fix merge conflicts
|
2012-04-13 16:40:10 -04: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
|
add9673ad6
|
merging tanghus category CSS
|
2012-04-13 17:23:56 +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 |
Frank Karlitschek
|
56bc2c4591
|
add a title attribute to the logout button
|
2012-04-12 20:34:56 +02:00 |
unknown
|
2f3c0a6d80
|
wrong defaultValue definition in OC.AppConfig.getValue
done
|
2012-04-12 19:14:25 +02:00 |
Georg Ehrke
|
ac2d14101c
|
Merge branch 'master' into calendar_sharing
|
2012-04-10 20:10:07 -04: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
|
fe3d3be399
|
filepicker loading style fixup
|
2012-04-05 22:25:58 +02:00 |
Bartek Przybylski
|
5b4a303672
|
loading screen for filepicker
|
2012-04-05 21:29:54 +02:00 |
Florian Hülsmann
|
8a2c5dda6d
|
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
|
2012-04-04 21:36:50 +02:00 |
Tom Needham
|
85f9869f69
|
Make the token really random
|
2012-04-04 13:18:02 +00:00 |
Tom Needham
|
95c2ac5d58
|
Dont typecast variables as integers
|
2012-04-03 21:14:55 +00: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 |
Robin Appelman
|
d01b78a4b4
|
prevent an possible xss exploit
|
2012-04-01 00:55:49 +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 |
Georg Ehrke
|
d15959d573
|
Merge branch 'master' into calendar_sharing
|
2012-03-29 23:19:31 +02:00 |
Georg Ehrke
|
e45e48ff3d
|
Merge branch 'master' into oc_error
|
2012-03-29 23:18:47 +02:00 |
Georg Ehrke
|
d049d9bd0c
|
initial commit for OC_Exception
|
2012-03-29 23:16:19 +02:00 |
Arthur Schiwon
|
e2fd0bbf02
|
IE 8: fix appeareance of checkboxes on login and files pages
|
2012-03-29 18:32:25 +02:00 |
Georg Ehrke
|
ede0a675bc
|
Merge branch 'master' into calendar_sharing
|
2012-03-27 20:53:40 +02:00 |
Thomas Tanghus
|
0a07e5fdaa
|
Added some documentation.
|
2012-03-27 12:30:20 +02:00 |
Georg Ehrke
|
96dd008f5e
|
Merge branch 'master' into calendar_sharing
|
2012-03-26 09:50:39 +02:00 |
Georg Ehrke
|
ec40f69c9e
|
add error 403 site
|
2012-03-25 14:16:39 +02:00 |
Georg Ehrke
|
19c101a660
|
fix merge conflicts
|
2012-03-25 14:02:02 +02:00 |
Bartek Przybylski
|
cbdcb68c2b
|
gallery sharing, experimental version
|
2012-03-24 18:35:42 +01:00 |
Nils Jansen
|
7ed8f39744
|
as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype.
|
2012-03-23 13:34:07 +01:00 |
Georg Ehrke
|
61166c1002
|
Merge branch 'master' into calendar_sharing
|
2012-03-21 09:43:29 +01:00 |
Georg Ehrke
|
03120959e9
|
add a proper email address for lostpassword service - bugfix for oc-178
|
2012-03-19 09:09:18 +01:00 |
Georg Ehrke
|
27218f85cb
|
Merge branch 'master' into calendar_sharing
|
2012-03-16 12:17:58 +01:00 |
Thomas Tanghus
|
03eb5197b6
|
Added category editor for apps using OC_VObjects.
|
2012-03-12 14:13:03 +01:00 |
Bart Visscher
|
ab760578f8
|
Allow overflow of rightcontent area
|
2012-03-07 21:46:42 +01:00 |
Georg Ehrke
|
c40668e3a9
|
Merge branch 'master' into calendar_sharing
|
2012-03-04 10:10:19 +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 |
Georg Ehrke
|
f2dcab50b5
|
fix merge conflicts
|
2012-03-03 15:06:51 +01:00 |
Bartek Przybylski
|
2754cac21f
|
dialogs library for apps
|
2012-02-28 23:02:30 +01:00 |
Alessandro Cosentino
|
630cee0ef2
|
bookmarklets should not look like buttons
|
2012-02-27 18:20:40 -05: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 |
Georg Ehrke
|
bfb67286c8
|
fix merge conflicts
|
2012-02-25 16:54:27 +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 |
Robin Appelman
|
11cb45bd43
|
slight change to select style
|
2012-02-24 23:54:38 +01:00 |
Marvin Thomas Rabe
|
b3f3b8c23f
|
UI problems solved. Bookmarks app updated.
|
2012-02-22 16:04:31 +01:00 |
Thomas Mueller
|
6540bda238
|
some icons for filetypes have been added.
for licensing information please have look at core/img/filetypes/readme-2.txt
|
2012-02-20 22:33:38 +01:00 |
Bart Visscher
|
f47444e1f7
|
Use separate function to make absolute urls
|
2012-02-17 22:07:14 +01:00 |
Georg Ehrke
|
01827e9340
|
Merge branch 'master' into calendar_sharing
|
2012-02-13 17:08:52 +01:00 |
Bart Visscher
|
a25bda8e41
|
Add application name to title
|
2012-02-12 21:56:01 +01:00 |
Georg Ehrke
|
a8b7ae515c
|
Merge branch 'master' into calendar_sharing
|
2012-02-10 19:36:00 +01:00 |
Thomas Tanghus
|
c95e8a1fc5
|
Added custom combobox widget.
|
2012-02-10 16:40:40 +01:00 |
Thomas Tanghus
|
90a830baba
|
Added files for new contact editor/viewer.
|
2012-02-08 07:59:39 +01:00 |
Georg Ehrke
|
f91702d7b5
|
Merge branch 'master' into calendar
|
2012-01-31 17:03:48 +01:00 |
Robin Appelman
|
fdf3df3de5
|
add option to send get data along with an eventsource request
|
2012-01-31 16:35:47 +01:00 |
Georg Ehrke
|
538618df62
|
Merge branch 'master' into calendar
|
2012-01-31 11:58:40 +01:00 |
Georg Ehrke
|
217151eb9c
|
add textfield style declaration
|
2012-01-31 11:50:45 +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
|
ad4e305c96
|
update translations
|
2012-01-27 00:59:24 +01:00 |
Robin Appelman
|
6fccf12299
|
update translations
|
2012-01-24 00:42:08 +01:00 |
Robin Appelman
|
7ea2923fa8
|
translation updates
|
2012-01-20 18:53:45 +01:00 |
Robin Appelman
|
965ea96439
|
update translations
|
2012-01-16 17:34:53 +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
|
7cd809b286
|
update translations
|
2012-01-15 15:12:58 +01:00 |
Georg Ehrke
|
9c04858631
|
added vcards to the mimetype fix list and renamed the icon for vcards
|
2012-01-15 11:02:08 +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
|
5cd6e0f4d9
|
remove some of the flickering in opera
|
2012-01-15 00:14:42 +01:00 |
Robin Appelman
|
56af6ee752
|
fix some of the styling issues on opera
|
2012-01-14 23:47:31 +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
|
ffd47ef4d7
|
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
|
2012-01-13 16:55:55 +00:00 |
Robin Appelman
|
f67e5d18e7
|
update translations
|
2012-01-11 01:06:59 +01:00 |
Tom Needham
|
3f67918522
|
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
|
2012-01-09 21:17:41 +00:00 |
Tom Needham
|
6c78cd2765
|
Moved .separator to core css
|
2012-01-09 18:39:09 +00: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
|
cbb2db8622
|
Fix merge conflicts
|
2012-01-01 01:18:02 +00: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 |
Bart Visscher
|
e1b9b65e41
|
Use correct appid for lostpassword email preference
|
2011-12-18 23:10:43 +01: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 |
Bart Visscher
|
9832a0817d
|
Merge branch 'master' into fullcalendar
Conflicts:
apps/calendar/index.php
|
2011-10-24 22:40:22 +02:00 |
Jan-Christoph Borchardt
|
abf33d32b9
|
use existing correct info icons
|
2011-10-23 21:53:00 +02:00 |
Jan-Christoph Borchardt
|
0c890a501c
|
upgraded the new new button. Didn't and doesn't work in Firefox though
|
2011-10-23 21:51:56 +02:00 |
Jan-Christoph Borchardt
|
4140a75a5e
|
corrected position of in-field labels a bit
|
2011-10-23 11:46:34 +02:00 |
Jan-Christoph Borchardt
|
c28504deca
|
textfield is now less obtrusive / opaque
|
2011-10-23 11:46:34 +02:00 |
Jan-Christoph Borchardt
|
93c18e9ae3
|
added all logo source SVGs
|
2011-10-23 11:46:34 +02: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 |
Georg Ehrke
|
9ce15667d5
|
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
|
2011-10-16 15:41:00 +02:00 |
Brice Maron
|
5d09a5e37e
|
Add some color in error messages + img for hints
|
2011-10-16 13:12:11 +02:00 |
Georg Ehrke
|
323a98adb7
|
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
|
2011-10-15 17:16:00 +02:00 |
Brice Maron
|
8d4039b678
|
Add loading message to image lightbox and tweak events
|
2011-10-14 23:51:51 +02:00 |
Brice Maron
|
169dd7da77
|
Prevent category in jquery-ui on cal. to overflow
|
2011-10-14 19:09:07 +02:00 |
Brice Maron
|
c0b011e714
|
Initialise hasOtherDB var when not true in installation
|
2011-10-14 18:04:50 +02:00 |
Georg Ehrke
|
a01d10e57d
|
Merge branch 'master' into calendar
|
2011-10-13 21:59:16 +02:00 |
Robin Appelman
|
d7fa2a0f77
|
mimetype icon improvements
|
2011-10-13 16:33:39 +02:00 |
Tom Needham
|
deaeab3d92
|
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
|
2011-10-08 15:47:03 +01:00 |
Marvin Thomas Rabe
|
bbd96fdd39
|
webkit searchfield bug fixed
|
2011-10-08 16:02:43 +02:00 |
Jan-Christoph Borchardt
|
71caa4a20c
|
added code and license links next to version number
|
2011-10-08 10:10:29 +02:00 |