94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 -08:00
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
1641ed8ac7
Merge branch 'master' into files_encryption
2013-01-14 16:54:25 +00:00
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +01:00
90d0d08826
Improved the help text
2013-01-13 00:37:58 +01:00
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
09c54722a8
add LDAP User and Group proxies to suppoer multiple servers
2013-01-11 18:13:22 +01:00
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +01:00
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
36cac7f924
Return NOT_FOUND in shared cache
2013-01-10 22:29:47 -05:00
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
fab5817f67
documentation for the Connection constructor
2013-01-10 23:34:24 +01:00
0784bcb8d7
introduce configPrefix to allow settings for multiple LDAP servers
2013-01-10 23:30:26 +01:00
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00
2e30641caa
Removed misleading crypto gen comment
2013-01-10 18:19:37 +00:00
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
61104d1441
Re-added 'checkAdminUser'
...
Improved code formatting
2013-01-10 18:04:52 +00:00
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
464dafd7d2
Make Google Drive storage id unique, before it was anonymousanonymous
2013-01-09 22:17:39 -05:00
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
78043d73e8
Set status to waiting for Dropbox and Google Drive while authenticating
2013-01-09 21:47:24 -05:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
fda1ada4f0
Merge pull request #1131 from owncloud/more_translations
...
translate move and rename error messages
2013-01-09 12:07:39 -08:00
ca027f3749
Merge pull request #1124 from schiesbn/sabredav2
...
OC_Connector_Sabre_Client no longer needed
2013-01-09 12:06:25 -08:00
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
4a8c25eef5
dechex not necessary, do not waste time with it
2013-01-08 19:25:19 +01:00
19fa78d1ee
Code style
2013-01-08 19:00:49 +01:00
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
8f8a5bbfb7
Maked Shared_Permissions extend Permissions class
2013-01-07 18:17:14 -05:00
a7d4d04223
Fix mimetypes in shared cache
2013-01-07 15:27:22 -05:00
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
861f32a22b
Update apps/user_webdavauth/user_webdavauth.php
...
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
2013-01-07 16:45:03 +01:00
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
a0d6f0e127
fixing undefined $eventSource
2013-01-06 23:36:31 +01:00
4a345fd911
removing undefined $response
2013-01-06 23:28:58 +01:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
015787fbb3
All in-use unit tests now passing after merge
2013-01-06 18:38:35 +00:00
2d98afa1ea
Removed debugging line
2013-01-06 14:06:22 +00:00
b024db9f98
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
2013-01-06 13:56:45 +00:00
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
7fe9245636
Development snapshot
...
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
ec1caa7d35
support LDAP search using multiple base DNs also with paged results, implements #395
2013-01-04 23:57:55 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
81489ad860
support multiple base DNs
2013-01-03 21:38:53 +01:00
3b82be5e64
Base DNs will be used as array, now, to support usage of multiple DNs
2013-01-03 21:18:21 +01:00
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
f144be8857
Don't mount shared storage unless there are shared files
2013-01-03 11:37:19 -05:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
b673748151
Merge pull request #1063 from owncloud/translate_not_enough_space_available
...
add translation call for 'Not enough space available' upload error
2013-01-03 06:46:36 -08:00
72d67ec036
Switch to textarea to enable configuration of multiple DNs
2013-01-03 14:07:01 +01:00
fc64e8ec58
fix error when wrong dir was specified
2013-01-03 13:34:56 +01:00
959996c3b4
LDAP: fix spelling
2013-01-03 12:32:42 +01:00
f19787f84c
move $l to top
2013-01-03 12:00:07 +01:00
ea732e5b29
also translate 'No file was uploaded. Unknown error'
2013-01-03 11:57:17 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
e0e7c98100
Merge pull request #1041 from owncloud/fixing-856-master
...
Fixing #856 master
2013-01-02 14:58:54 -08:00
3ea9432d43
fixing undefined variable $l
2013-01-02 22:15:43 +01:00
0405edc798
add translation call for 'Not enough space available' upload error
2013-01-02 21:00:50 +01:00
665261dc9a
Development snapshot, mocking out Session{} for crypt unit tests
2013-01-02 19:29:22 +00:00
7f218c4dc0
Remove accidentally included file
2013-01-02 13:20:44 -05:00
bf69677933
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js
apps/files/js/keyboardshortcuts.js
apps/files/l10n/da.php
apps/files/l10n/el.php
apps/files/l10n/eu.php
apps/files/l10n/hu_HU.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/gl.php
apps/files_external/l10n/uk.php
apps/files_external/personal.php
apps/files_external/settings.php
apps/files_external/templates/settings.php
apps/files_sharing/public.php
apps/user_ldap/l10n/gl.php
apps/user_ldap/l10n/uk.php
apps/user_ldap/lib/access.php
apps/user_webdavauth/l10n/eo.php
apps/user_webdavauth/l10n/eu.php
apps/user_webdavauth/l10n/fr.php
apps/user_webdavauth/l10n/gl.php
apps/user_webdavauth/l10n/sl.php
apps/user_webdavauth/l10n/tr.php
apps/user_webdavauth/l10n/uk.php
apps/user_webdavauth/l10n/zh_CN.php
core/ajax/share.php
core/css/styles.css
core/l10n/ca.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/eu.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/is.php
core/l10n/it.php
core/l10n/nl.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ru.php
core/l10n/sl.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/zh_CN.php
core/templates/installation.php
core/templates/login.php
l10n/ar/files_external.po
l10n/ar/settings.po
l10n/bg_BG/files_external.po
l10n/bg_BG/settings.po
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/settings.po
l10n/da/files.po
l10n/da/files_external.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files_external.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files_external.po
l10n/de_DE/settings.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/el/settings.po
l10n/eo/core.po
l10n/eo/files_external.po
l10n/eo/settings.po
l10n/eo/user_webdavauth.po
l10n/es/core.po
l10n/es/files_external.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files_external.po
l10n/es_AR/settings.po
l10n/et_EE/files_external.po
l10n/et_EE/settings.po
l10n/et_EE/user_webdavauth.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/eu/settings.po
l10n/eu/user_webdavauth.po
l10n/fa/files_external.po
l10n/fa/settings.po
l10n/fi_FI/files_external.po
l10n/fi_FI/settings.po
l10n/fr/core.po
l10n/fr/files_external.po
l10n/fr/settings.po
l10n/fr/user_webdavauth.po
l10n/gl/core.po
l10n/gl/files_external.po
l10n/gl/settings.po
l10n/gl/user_ldap.po
l10n/gl/user_webdavauth.po
l10n/he/core.po
l10n/he/files_external.po
l10n/he/settings.po
l10n/hi/files_external.po
l10n/hi/settings.po
l10n/hr/files_external.po
l10n/hr/settings.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/ia/files_external.po
l10n/ia/settings.po
l10n/id/files_external.po
l10n/id/settings.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_encryption.po
l10n/is/files_external.po
l10n/is/files_sharing.po
l10n/is/files_versions.po
l10n/is/lib.po
l10n/is/settings.po
l10n/is/user_ldap.po
l10n/is/user_webdavauth.po
l10n/it/core.po
l10n/it/files_external.po
l10n/it/settings.po
l10n/ja_JP/core.po
l10n/ja_JP/files_external.po
l10n/ja_JP/settings.po
l10n/ka_GE/files_external.po
l10n/ka_GE/settings.po
l10n/ko/core.po
l10n/ko/files_external.po
l10n/ko/settings.po
l10n/ko/user_ldap.po
l10n/ko/user_webdavauth.po
l10n/ku_IQ/files_external.po
l10n/ku_IQ/settings.po
l10n/lb/files_external.po
l10n/lb/settings.po
l10n/lt_LT/files_external.po
l10n/lt_LT/settings.po
l10n/lv/files_external.po
l10n/lv/settings.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/mk/settings.po
l10n/ms_MY/files_external.po
l10n/ms_MY/settings.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/nb_NO/settings.po
l10n/nl/core.po
l10n/nl/files_external.po
l10n/nl/settings.po
l10n/nn_NO/files_external.po
l10n/nn_NO/settings.po
l10n/oc/files_external.po
l10n/oc/settings.po
l10n/pl/core.po
l10n/pl/files_external.po
l10n/pl/settings.po
l10n/pl_PL/files_external.po
l10n/pl_PL/settings.po
l10n/pt_BR/core.po
l10n/pt_BR/files_external.po
l10n/pt_BR/settings.po
l10n/pt_PT/core.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ro/settings.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/settings.po
l10n/ru_RU/files.po
l10n/ru_RU/files_external.po
l10n/ru_RU/settings.po
l10n/si_LK/files_external.po
l10n/si_LK/settings.po
l10n/sk_SK/core.po
l10n/sk_SK/files_external.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_webdavauth.po
l10n/sl/core.po
l10n/sl/files_external.po
l10n/sl/settings.po
l10n/sl/user_webdavauth.po
l10n/sq/core.po
l10n/sq/files_external.po
l10n/sq/settings.po
l10n/sq/user_ldap.po
l10n/sq/user_webdavauth.po
l10n/sr/core.po
l10n/sr/files_external.po
l10n/sr/settings.po
l10n/sr@latin/files_external.po
l10n/sr@latin/settings.po
l10n/sv/files_external.po
l10n/sv/settings.po
l10n/ta_LK/files_external.po
l10n/ta_LK/settings.po
l10n/ta_LK/user_ldap.po
l10n/ta_LK/user_webdavauth.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/th_TH/settings.po
l10n/th_TH/user_webdavauth.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/settings.po
l10n/tr/user_webdavauth.po
l10n/uk/core.po
l10n/uk/files_external.po
l10n/uk/settings.po
l10n/uk/user_ldap.po
l10n/uk/user_webdavauth.po
l10n/vi/core.po
l10n/vi/files_external.po
l10n/vi/settings.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/core.po
l10n/zh_CN/files_external.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_webdavauth.po
l10n/zh_HK/core.po
l10n/zh_HK/files_external.po
l10n/zh_HK/settings.po
l10n/zh_HK/user_ldap.po
l10n/zh_HK/user_webdavauth.po
l10n/zh_TW/core.po
l10n/zh_TW/files_external.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
l10n/zh_TW/user_webdavauth.po
l10n/zu_ZA/files_external.po
l10n/zu_ZA/settings.po
lib/base.php
lib/filecache.php
lib/files.php
lib/helper.php
lib/l10n.php
lib/request.php
lib/util.php
settings/ajax/togglegroups.php
settings/js/users.js
settings/l10n/ar.php
settings/l10n/de_DE.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es_AR.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hi.php
settings/l10n/ko.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/ta_LK.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/templates/help.php
2013-01-02 17:14:23 +00:00
db90f2c296
Listen to checkbox changes as well
2013-01-02 12:13:59 -05:00
d65cb7ae09
Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added
2013-01-02 11:59:17 -05:00
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
a6733ff012
abort rename on ESC keyup
2013-01-02 16:17:30 +01:00
740b6623aa
show notification when renaming a file to ''
2013-01-02 16:17:30 +01:00
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +01:00
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +01:00
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +01:00
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
516464ba94
[tx-robot] updated from transifex
2013-01-02 00:05:14 +01:00
a69de3a8f1
Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons
2013-01-01 16:19:40 -05:00
a1f7c28e28
Use the source Scanner for shared storage when the path is specified
2013-01-01 14:47:25 -05:00
fe90130618
Initialize storageId variable in shared cache
2013-01-01 14:24:18 -05:00
268c7acfc4
Actually add Shared_Watcher
2013-01-01 13:16:42 -05:00
3b67613afc
Remove Shared_Scanner and add Shared_Watcher instead
2013-01-01 12:43:38 -05:00
0ac78a6411
Share: fix cache put function
2013-01-01 18:10:38 +01:00
4b65dd608a
Share: small phpdoc fixes
2013-01-01 18:07:10 +01:00
f2ca7023e1
Fix Shared root problems with Watcher and Quota proxy
2013-01-01 11:19:33 -05:00
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
3d23e98390
Remove the WIP external sharing api
2012-12-31 16:31:22 +00:00
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
f70f9f3bc4
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
...
Replace %2F with / in breadcrumbs
2012-12-30 08:56:32 -08:00
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
e6de09c0a9
check if admin
2012-12-29 19:30:31 +00:00
0229b070c9
[tx-robot] updated from transifex
2012-12-29 19:30:31 +00:00
f94c26e573
Change post_write hook to write to prevent creating a duplicate of the original file on upload
2012-12-29 19:30:31 +00:00
314dd4bacc
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
2012-12-29 19:30:31 +00:00
d275725e23
No longer need to create folders locally for external storage mount points
2012-12-29 13:43:44 -05:00
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
fb053f8e73
Fix retrieving of shared source paths
2012-12-29 11:09:57 -05:00
b5b48428ab
Replace %2F with / in breadcrumbs
2012-12-28 19:41:37 -05:00
9aefbea074
[tx-robot] updated from transifex
2012-12-29 00:08:28 +01:00
442a045ef6
Fix problems with chosen multiselect
2012-12-28 17:38:24 -05:00
ab4d52e980
Update apps/files_external/lib/sftp.php
...
Created test() function as per @pull/1031
2012-12-28 22:22:04 +01:00
a3206b4e97
only show the max possible upload of 2GB on a 32 bit system.
...
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
2012-12-28 22:17:38 +01:00
7b72424a39
Revert "fixed max possible upload size for files app in admin screen"
...
This reverts commit 7f2208b9a1
2012-12-28 22:14:32 +01:00
595e72ade8
Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ownCloud / WebDAV
2012-12-28 15:56:48 -05:00
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
ab31c3ef4e
Update apps/files_external/lib/sftp.php
...
Updated to using local 3rdparty + added a few missed braces.
2012-12-27 21:00:20 +01:00
8598d18529
Added phpseclib to files_external as 3rdparty
2012-12-27 20:23:56 +01:00
be197d52b1
Update apps/files_external/lib/sftp.php
...
Added copyright notice
2012-12-27 19:47:46 +01:00
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
00bfcd94ec
Update apps/files_external/lib/sftp.php
...
Added a little better exception handling, hopefully making it a little more robust
2012-12-26 23:49:53 +01:00
3375253e1d
Update apps/files_external/lib/sftp.php
...
Added checks for host keys and added exceptions thrown if constructor fails.
2012-12-26 23:38:17 +01:00
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
d9ff3b6860
Fix last commit's variable
2012-12-26 14:18:51 -05:00
48a3966ea9
Listen to paste events for dropbox configuration
2012-12-26 14:04:02 -05:00
5d68e04e5a
Change callback url for dropbox as well
2012-12-26 13:45:22 -05:00
30a07e9573
Save configuration after paste events and 2 seconds after typing
2012-12-26 13:35:22 -05:00
6aded84f10
Update apps/files_external/lib/config.php
...
Adding support for SFTP mounts
2012-12-26 18:03:16 +01:00
180ab42c06
Update apps/files_external/appinfo/app.php
...
Adding support for SFTP
2012-12-26 18:00:04 +01:00
08156cc57f
Create sftp.php
...
Adapter for SFTP using the pure php SSH library phpseclib
2012-12-26 08:59:08 -08:00
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
5d59ac0739
[tx-robot] updated from transifex
2012-12-25 00:11:11 +01:00
a0e47a2c67
Prevent javascript error if no value is set for the multiselect
2012-12-24 13:55:37 -05:00
3c08d2ba23
Change callback url to path only in case oauth parameters are still in url
2012-12-24 13:48:18 -05:00
0dbf1d0260
Show status icons for mount points in external storage UI
2012-12-24 13:45:52 -05:00
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
3e39c39d6a
[tx-robot] updated from transifex
2012-12-21 00:11:31 +01:00
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
86d510ba28
fix switched values from previous commit
2012-12-20 13:30:57 +01:00
373b69d835
Merge pull request #974 from owncloud/fixing-120-master
...
setting the timezone is now part of the login process
2012-12-20 04:02:22 -08:00
8e44404ae0
Merge pull request #925 from owncloud/fix_issue_918
...
Trigger the last action before continuing with a file upload
2012-12-20 03:30:50 -08:00
babc0e4ac6
fix Firefox issues with file actions position and multiselect bar width
2012-12-20 12:02:19 +01:00
aa5f726f14
use slightly darker color for file actions background, fix fugly look for selected rows
2012-12-20 11:24:25 +01:00
c05ea8cfc3
fix file actions messing with file row height on narrower screens
2012-12-20 11:14:27 +01:00
a1bf6b54e6
remove timezone.js
2012-12-20 11:14:21 +01:00
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
5107ccbeda
move CSS from JS to CSS
2012-12-20 10:53:50 +01:00
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
ec3c5f36cb
debug output removed
2012-12-18 13:26:10 +01:00
b0532c6343
Merge pull request #905 from owncloud/fix_mountpointescaping
...
proper escape the mountpoints.
2012-12-18 04:01:07 -08:00
21cdf93616
remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable
2012-12-18 12:57:28 +01:00
e6e9d332cb
add missing bracket
2012-12-18 12:37:24 +01:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
b8f749420b
Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download
...
fix utf8 filenames in ie download response header according to rfc5987, ...
2012-12-17 14:53:15 -08:00
0e0d54dc58
get timestamp from file instead from time(); typo fixed
2012-12-17 18:00:11 +01:00
2a42344781
don't check for min interval, no longer needed
2012-12-17 17:14:24 +01:00
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
d085fdf8ea
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
...
prevent keyboardshortcuts from catching events outside the main doc - e....
2012-12-17 07:38:53 -08:00
75a871ecd7
expire all operation no longer needed; delete oldest versions if limit of empty space is reached
2012-12-17 16:32:09 +01:00
c4ecbad009
check if admin
2012-12-17 14:46:57 +01:00
a7bb4b128f
personal settings removed, there is no need to expire versions manually
2012-12-17 13:34:17 +01:00
acc902a0b6
remove blacklist
2012-12-17 13:30:18 +01:00
0a49fcf9d1
update files history according the given intervals
2012-12-17 13:28:40 +01:00
ee1ce6714b
add size to versions array
2012-12-17 11:39:57 +01:00
24d4f701bf
calculate free space for versions
2012-12-17 11:39:57 +01:00
dd5e39ca71
[tx-robot] updated from transifex
2012-12-17 00:10:49 +01:00
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
915126cae8
Trigger last action before continuing with creating a new file/folder/from link
2012-12-16 16:25:08 -05:00
2607c565b0
Trigger the last action before continuing with a file upload, fixes issue #918
2012-12-16 16:19:51 -05:00
63a2271c78
Change post_write hook to write to prevent creating a duplicate of the original file on upload
2012-12-16 15:08:18 -05:00
bf05ff351f
Initial support for file sharing with filesystem branch
2012-12-15 19:44:59 -05:00
0c87f666ad
[tx-robot] updated from transifex
2012-12-16 00:12:10 +01:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
6ff38624a7
Merge pull request #875 from owncloud/multiplefiles_json
...
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
2ef2dc4dda
Fix "There must be a single space between the closing parenthesis and the opening brace"
2012-12-15 00:43:46 +01:00
85bd28c508
Fix some of "Closing brace must be on a line by itself"
2012-12-15 00:43:46 +01:00
f39454ed12
Fix "Line indented incorrectly"
2012-12-15 00:43:46 +01:00
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
262fecbe39
proper escape the mountpoints. Fixes
...
https://github.com/owncloud/core/issues/557
2012-12-14 23:31:50 +01:00
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
f0893fb8fe
Give also hint about possible conflicts in the user_webdavauth description
2012-12-14 12:03:46 +01:00
414b7e8e03
Also show a more prominent warning when php_ldap is not installed
2012-12-14 12:03:29 +01:00
b54390f432
Show conflict warning when user_ldap and user_webdavauth are enabled
2012-12-14 12:03:21 +01:00
5cbe8d637b
Show conflict warning when user_ldap and user_webdavauth are enabled
2012-12-14 12:03:15 +01:00
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
1443d6c3ef
fix mimetype icons for new files
2012-12-13 22:31:43 +01:00
fda7d932ef
remove unneeded line
2012-12-13 22:12:27 +01:00
e0ada2c24f
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
2012-12-13 19:44:55 +01:00
316a29f7ac
fix new button popup looking blurry
2012-12-13 19:04:27 +01:00
6a2b41e5e8
use json encoding when deleting multiply files instead of using ; as delimiter
2012-12-13 18:11:00 +01:00
77c16b2933
Merge pull request #855 from owncloud/ungreenify
...
ungreenify new & upload buttons
2012-12-13 04:19:38 -08:00
680ff3a51b
Merge pull request #584 from wardragon/ldap_access_userExists_fix
...
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
8686a448c7
[tx-robot] updated from transifex
2012-12-13 00:18:20 +01:00
e7c4a2c8e1
ungreenify new & upload buttons
2012-12-13 00:12:21 +01:00
063f225a26
Merge branch 'master' into files_encryption
...
Encryption unit tests still failing, needs work
Conflicts:
3rdparty/Archive/Tar.php
3rdparty/MDB2/Driver/Datatype/Common.php
3rdparty/MDB2/Driver/mysql.php
3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
3rdparty/Sabre/CalDAV/Plugin.php
3rdparty/Sabre/CalDAV/Version.php
3rdparty/Sabre/CardDAV/AddressBook.php
3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/Sabre/CardDAV/Version.php
3rdparty/Sabre/DAV/Client.php
3rdparty/Sabre/DAV/Locks/Plugin.php
3rdparty/Sabre/DAV/Server.php
3rdparty/Sabre/DAV/Tree/Filesystem.php
3rdparty/Sabre/DAV/Version.php
3rdparty/Sabre/HTTP/BasicAuth.php
3rdparty/Sabre/HTTP/Version.php
3rdparty/Sabre/VObject/Component/VEvent.php
3rdparty/Sabre/VObject/DateTimeParser.php
3rdparty/Sabre/VObject/RecurrenceIterator.php
3rdparty/Sabre/VObject/Version.php
3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
3rdparty/css/chosen-sprite.png
3rdparty/css/chosen.css
3rdparty/css/chosen/chosen.css
3rdparty/fullcalendar/css/fullcalendar.css
3rdparty/fullcalendar/css/fullcalendar.print.css
3rdparty/fullcalendar/js/fullcalendar.js
3rdparty/fullcalendar/js/fullcalendar.min.js
3rdparty/fullcalendar/js/gcal.js
3rdparty/js/chosen/VERSION
3rdparty/js/chosen/chosen.jquery.js
3rdparty/js/chosen/chosen.jquery.min.js
3rdparty/openid/class.openid.v3.php
3rdparty/openid/phpmyid.php
3rdparty/php-cloudfiles/cloudfiles.php
3rdparty/smb4php/smb.php
3rdparty/timepicker/css/jquery.ui.timepicker.css
3rdparty/timepicker/js/i18n/i18n.html
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
3rdparty/timepicker/js/jquery.ui.timepicker.js
3rdparty/timepicker/releases.txt
README
apps/files/admin.php
apps/files/ajax/autocomplete.php
apps/files/ajax/move.php
apps/files/ajax/newfile.php
apps/files/ajax/scan.php
apps/files/ajax/timezone.php
apps/files/ajax/upload.php
apps/files/appinfo/filesync.php
apps/files/appinfo/update.php
apps/files/css/files.css
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/es_AR.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/lv.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/oc.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/ru_RU.php
apps/files/l10n/si_LK.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/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files/templates/part.list.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/info.xml
apps/files_encryption/js/settings.js
apps/files_encryption/l10n/fa.php
apps/files_encryption/l10n/sl.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/encryption.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/cs_CZ.php
apps/files_external/l10n/et_EE.php
apps/files_external/l10n/lt_LT.php
apps/files_external/l10n/nl.php
apps/files_external/l10n/ru.php
apps/files_external/l10n/sk_SK.php
apps/files_external/l10n/sl.php
apps/files_external/l10n/vi.php
apps/files_external/lib/config.php
apps/files_external/lib/ftp.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
apps/files_external/tests/ftp.php
apps/files_sharing/appinfo/update.php
apps/files_sharing/css/public.css
apps/files_sharing/js/share.js
apps/files_sharing/l10n/de.php
apps/files_sharing/l10n/et_EE.php
apps/files_sharing/l10n/ja_JP.php
apps/files_sharing/l10n/nb_NO.php
apps/files_sharing/l10n/ru.php
apps/files_sharing/l10n/sl.php
apps/files_sharing/l10n/vi.php
apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php
apps/files_sharing/public.php
apps/files_sharing/templates/public.php
apps/files_versions/l10n/et_EE.php
apps/files_versions/l10n/lt_LT.php
apps/files_versions/l10n/nb_NO.php
apps/files_versions/l10n/nl.php
apps/files_versions/l10n/ru.php
apps/files_versions/l10n/sl.php
apps/files_versions/l10n/vi.php
apps/files_versions/lib/hooks.php
apps/files_versions/lib/versions.php
apps/user_ldap/appinfo/database.xml
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/l10n/da.php
apps/user_ldap/l10n/et_EE.php
apps/user_ldap/l10n/pt_PT.php
apps/user_ldap/l10n/sl.php
apps/user_ldap/l10n/vi.php
apps/user_ldap/l10n/zh_CN.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/tests/group_ldap.php
apps/user_ldap/user_ldap.php
apps/user_webdavauth/appinfo/app.php
apps/user_webdavauth/appinfo/info.xml
apps/user_webdavauth/settings.php
apps/user_webdavauth/templates/settings.php
apps/user_webdavauth/user_webdavauth.php
autotest.sh
core/ajax/appconfig.php
core/ajax/share.php
core/ajax/translations.php
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
core/ajax/vcategories/edit.php
core/css/share.css
core/js/eventsource.js
core/js/js.js
core/js/oc-vcategories.js
core/js/share.js
core/l10n/ar.php
core/l10n/bg_BG.php
core/l10n/ca.php
core/l10n/cs_CZ.php
core/l10n/da.php
core/l10n/de.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/es_AR.php
core/l10n/et_EE.php
core/l10n/eu.php
core/l10n/fa.php
core/l10n/fi_FI.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hi.php
core/l10n/hr.php
core/l10n/hu_HU.php
core/l10n/ia.php
core/l10n/id.php
core/l10n/it.php
core/l10n/ja_JP.php
core/l10n/ko.php
core/l10n/ku_IQ.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/lv.php
core/l10n/mk.php
core/l10n/ms_MY.php
core/l10n/nb_NO.php
core/l10n/nl.php
core/l10n/nn_NO.php
core/l10n/oc.php
core/l10n/pl.php
core/l10n/pt_BR.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/ru_RU.php
core/l10n/si_LK.php
core/l10n/sk_SK.php
core/l10n/sl.php
core/l10n/sr.php
core/l10n/sr@latin.php
core/l10n/sv.php
core/l10n/th_TH.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/vi.php
core/l10n/zh_CN.GB2312.php
core/l10n/zh_CN.php
core/l10n/zh_TW.php
core/lostpassword/index.php
core/lostpassword/resetpassword.php
core/templates/layout.base.php
core/templates/layout.guest.php
core/templates/layout.user.php
cron.php
db_structure.xml
files/webdav.php
index.php
l10n/.tx/config
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_encryption.po
l10n/ar/lib.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/ar_SA/core.po
l10n/ar_SA/files.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/lib.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/lib.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/files_external.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/lib.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/lib.po
l10n/da/settings.po
l10n/da/user_ldap.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_sharing.po
l10n/de/gallery.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_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/lib.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/lib.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/lib.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/lib.po
l10n/es_AR/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/files_external.po
l10n/et_EE/files_sharing.po
l10n/et_EE/files_versions.po
l10n/et_EE/lib.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/lib.po
l10n/eu/settings.po
l10n/eu_ES/core.po
l10n/eu_ES/files.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_encryption.po
l10n/fa/lib.po
l10n/fa/settings.po
l10n/fi/core.po
l10n/fi/files.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/lib.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/lib.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/lib.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/lib.po
l10n/he/settings.po
l10n/hi/core.po
l10n/hi/files.po
l10n/hi/lib.po
l10n/hi/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/lib.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/lib.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/lib.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_encryption.po
l10n/id/files_external.po
l10n/id/files_sharing.po
l10n/id/files_versions.po
l10n/id/lib.po
l10n/id/settings.po
l10n/id/user_ldap.po
l10n/id_ID/core.po
l10n/id_ID/files.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/lib.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/files_sharing.po
l10n/ja_JP/lib.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/lib.po
l10n/ko/settings.po
l10n/ku_IQ/core.po
l10n/ku_IQ/files.po
l10n/ku_IQ/lib.po
l10n/ku_IQ/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/lib.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/files_external.po
l10n/lt_LT/files_versions.po
l10n/lt_LT/lib.po
l10n/lt_LT/settings.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/lib.po
l10n/lv/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/lib.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/lib.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/files_sharing.po
l10n/nb_NO/files_versions.po
l10n/nb_NO/gallery.po
l10n/nb_NO/lib.po
l10n/nb_NO/settings.po
l10n/nb_NO/user_ldap.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nl/files_versions.po
l10n/nl/gallery.po
l10n/nl/lib.po
l10n/nl/settings.po
l10n/nl/user_ldap.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/lib.po
l10n/nn_NO/settings.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/lib.po
l10n/oc/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/lib.po
l10n/pl/settings.po
l10n/pl_PL/core.po
l10n/pl_PL/files.po
l10n/pl_PL/lib.po
l10n/pl_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/lib.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/lib.po
l10n/pt_PT/settings.po
l10n/pt_PT/user_ldap.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/lib.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/files_sharing.po
l10n/ru/files_versions.po
l10n/ru/gallery.po
l10n/ru/lib.po
l10n/ru/settings.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/ru_RU/lib.po
l10n/ru_RU/settings.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_encryption.po
l10n/si_LK/files_external.po
l10n/si_LK/files_sharing.po
l10n/si_LK/files_versions.po
l10n/si_LK/lib.po
l10n/si_LK/settings.po
l10n/si_LK/user_ldap.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sk_SK/lib.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_ldap.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_encryption.po
l10n/sl/files_external.po
l10n/sl/files_sharing.po
l10n/sl/files_versions.po
l10n/sl/gallery.po
l10n/sl/lib.po
l10n/sl/settings.po
l10n/sl/user_ldap.po
l10n/so/core.po
l10n/so/files.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/lib.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/lib.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/lib.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/lib.po
l10n/ta_LK/settings.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.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/lib.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/lib.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_encryption.po
l10n/uk/files_versions.po
l10n/uk/lib.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/vi/files_sharing.po
l10n/vi/files_versions.po
l10n/vi/lib.po
l10n/vi/settings.po
l10n/vi/user_ldap.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/lib.po
l10n/zh_CN.GB2312/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/files_external.po
l10n/zh_CN/gallery.po
l10n/zh_CN/lib.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_ldap.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/lib.po
l10n/zh_TW/settings.po
lib/MDB2/Driver/sqlite3.php
lib/app.php
lib/appconfig.php
lib/archive.php
lib/archive/tar.php
lib/archive/zip.php
lib/base.php
lib/connector/sabre/auth.php
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/eventsource.php
lib/filecache.php
lib/filecache/cached.php
lib/filecache/update.php
lib/filechunking.php
lib/fileproxy.php
lib/fileproxy/fileoperations.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/commontest.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
lib/group.php
lib/group/dummy.php
lib/group/example.php
lib/helper.php
lib/image.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/l10n/ca.php
lib/l10n/cs_CZ.php
lib/l10n/da.php
lib/l10n/de.php
lib/l10n/el.php
lib/l10n/eo.php
lib/l10n/es.php
lib/l10n/es_AR.php
lib/l10n/et_EE.php
lib/l10n/eu.php
lib/l10n/fa.php
lib/l10n/fi_FI.php
lib/l10n/fr.php
lib/l10n/gl.php
lib/l10n/he.php
lib/l10n/hu_HU.php
lib/l10n/it.php
lib/l10n/ja_JP.php
lib/l10n/lt_LT.php
lib/l10n/nb_NO.php
lib/l10n/nl.php
lib/l10n/oc.php
lib/l10n/pl.php
lib/l10n/pt_BR.php
lib/l10n/pt_PT.php
lib/l10n/ro.php
lib/l10n/ru.php
lib/l10n/ru_RU.php
lib/l10n/sk_SK.php
lib/l10n/sl.php
lib/l10n/sv.php
lib/l10n/th_TH.php
lib/l10n/uk.php
lib/l10n/vi.php
lib/l10n/zh_CN.GB2312.php
lib/l10n/zh_CN.php
lib/l10n/zh_TW.php
lib/log.php
lib/log/owncloud.php
lib/mail.php
lib/migrate.php
lib/migration/content.php
lib/minimizer.php
lib/ocs.php
lib/ocsclient.php
lib/preferences.php
lib/public/backgroundjob.php
lib/public/db.php
lib/public/share.php
lib/public/util.php
lib/request.php
lib/search.php
lib/search/provider/file.php
lib/search/result.php
lib/setup.php
lib/streamwrappers.php
lib/template.php
lib/templatelayout.php
lib/updater.php
lib/user.php
lib/user/database.php
lib/user/http.php
lib/util.php
lib/vcategories.php
lib/vobject.php
public.php
remote.php
search/ajax/search.php
settings/admin.php
settings/ajax/apps/ocs.php
settings/ajax/changepassword.php
settings/ajax/creategroup.php
settings/ajax/createuser.php
settings/ajax/disableapp.php
settings/ajax/enableapp.php
settings/ajax/getlog.php
settings/ajax/lostpassword.php
settings/ajax/openid.php
settings/ajax/removegroup.php
settings/ajax/removeuser.php
settings/ajax/setlanguage.php
settings/ajax/setloglevel.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/ajax/togglesubadmins.php
settings/ajax/userlist.php
settings/apps.php
settings/css/settings.css
settings/help.php
settings/js/apps.js
settings/js/users.js
settings/l10n/ar.php
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/es_AR.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/hr.php
settings/l10n/hu_HU.php
settings/l10n/id.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lb.php
settings/l10n/lt_LT.php
settings/l10n/lv.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/oc.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ro.php
settings/l10n/ru.php
settings/l10n/ru_RU.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/sr@latin.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.GB2312.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/personal.php
settings/settings.php
settings/templates/admin.php
settings/templates/apps.php
settings/templates/help.php
settings/templates/personal.php
settings/templates/users.php
settings/trans.png
settings/users.php
tests/bootstrap.php
tests/data/db_structure.xml
tests/lib/archive.php
tests/lib/cache.php
tests/lib/cache/apc.php
tests/lib/cache/xcache.php
tests/lib/db.php
tests/lib/filesystem.php
tests/lib/geo.php
tests/lib/share/share.php
tests/lib/streamwrappers.php
tests/lib/util.php
tests/phpunit.xml
2012-12-12 17:39:43 +00:00
8b4aad73c7
Merge pull request #810 from owncloud/send-share-link-by-email
...
restoring feature to send sharing link via email
2012-12-12 04:54:51 -08:00
e8897c2b7e
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
2012-12-12 12:55:29 +01:00
bac4e011dc
[tx-robot] updated from transifex
2012-12-12 00:14:08 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
398b52e4f0
Improved formatting of getPublicKeys()
2012-12-11 17:24:25 +00:00
453fd66c70
Changing user login pwd now correctly changes encryption key passphrase
...
All crypt unit tests are now passing
2012-12-11 17:12:46 +00:00
2afc5abe19
Merge pull request #813 from owncloud/check_external_dependencies
...
Check external dependencies
2012-12-11 08:53:34 -08:00
1fc5b1d02d
Replaced phpseclib calls with symmetric re-encryption of user private key
2012-12-11 15:15:30 +00:00
a00dd2d5d6
Revert "Revert "Development snapshot""
...
This reverts commit b66d38ecae
2012-12-11 15:10:56 +00:00
b66d38ecae
Revert "Development snapshot"
...
This reverts commit c56fb905d1
2012-12-11 15:10:39 +00:00
aabef796a0
Added library phpseclib
...
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00:00
e427197dce
ctor of OC_L10N requires the app name
2012-12-11 14:07:01 +01:00
e55a3637ce
don't call shell_exec if safe_mode is on.
2012-12-11 13:20:20 +01:00
f7f462f273
[tx-robot] updated from transifex
2012-12-11 00:04:40 +01:00
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
ca7882a7c6
disable not available external filesystems. Restructure the configuration a bit and improve naming
2012-12-10 21:44:43 +01:00
f3bd6d14ee
add some output why some of the external filesystems might not work
2012-12-10 21:10:28 +01:00
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
9a3a83e16a
Merge pull request #282 from butonic/fix_new_and_upload_button_html_css
...
fix_new_and_upload_button_html_css
2012-12-09 01:25:50 -08:00
e3e4dcf77b
[tx-robot] updated from transifex
2012-12-09 00:12:41 +01:00
2ca72d0da7
[tx-robot] updated from transifex
2012-12-08 00:10:53 +01:00
787e8b86d9
cleanup CSS whitespace and remove extra input[type='checkbok']
2012-12-07 17:41:52 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
2ec96c7a63
fix new li icons jumping when replacing p with input
2012-12-07 17:21:26 +01:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
de34f771c2
Exclude LDAP backend from global user searches
...
triggered by itself.
2012-12-07 17:19:30 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
6864b28e47
rmeove vendor prefix for box-shadow
2012-12-07 15:32:24 +01:00
76395057d4
fix_new_and_upload_button_html_css
2012-12-07 15:32:24 +01:00
380db4a29e
Merge pull request #640 from esthepiking/master
...
Keyboard Shortcuts
2012-12-06 13:42:14 -08:00
98f42d314c
merge master into filesystem
2012-12-06 17:47:28 +01:00
bf0f39f5b4
make sure that all expected array keys are available
2012-12-06 15:57:53 +01:00
c56fb905d1
Development snapshot
...
Read/write interoperability working through web UI and WebDAV
New class Session for handling session data
A few new unit tests
Some additional unit tests are now failing, esp. legacy enc related ones
2012-12-05 18:57:44 +00:00
f0213735fc
Code clean up
2012-12-05 08:23:28 -07:00
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
bc3550b37b
Development Snapshot
...
Opening short files via webdav, that were saved via webdav, now works
2012-12-04 19:53:13 +00:00
93208d0fe9
Remove rename
2012-12-04 09:40:17 -07:00
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
4cb760a924
LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn ( #631 )
2012-12-03 12:55:42 +01:00
171e669dda
Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_master
...
fix regression in file versioning for shared files
2012-12-03 02:45:39 -08:00
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
f66ebea5ca
fix typo in variable name
2012-12-02 12:50:07 +01:00
bafb78ac94
fix regression in file versioning for shared files
2012-12-02 12:46:07 +01:00
475fe281a4
Merge pull request #654 from butonic/checkstyle_fixes
...
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
2012-12-02 03:14:30 -08:00
18663100d9
fixing syntax error + reformat the code
2012-12-02 12:12:20 +01:00
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
47fa3a8fe0
event.ctrlKey
2012-11-30 10:11:25 -07:00
5d13b0533d
event.ctrlKey
2012-11-30 10:10:00 -07:00
2160663309
ctrl issue fix
2012-11-30 08:43:24 -07:00
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
df21ebeaf7
fix checkstyle for files_encryption app, add whitespace for readability
2012-11-30 16:26:04 +01:00
8aba5874db
Merge pull request #644 from butonic/checkstyle_fixes
...
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
3b83fe1530
fix checkstyle for files app
2012-11-29 18:33:15 +01:00
b6e3460871
documentation
2012-11-29 10:21:20 -07:00
fd4aecf525
cleanup
2012-11-29 10:18:34 -07:00
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
dafe028c11
Rename
2012-11-28 21:00:11 -07:00
a73a263543
Enter
2012-11-28 19:58:42 -07:00
8802dac02a
Arrow key navigation
2012-11-28 17:32:05 -07:00
6c3f43b061
[tx-robot] updated from transifex
2012-11-29 00:04:57 +01:00
bfd47cd2df
Development snapshot
...
Moved legacy crypto methods from Util into Crypt
Added preliminary support for reading legacy encrypted files
Added some unit tests
2012-11-28 18:39:19 +00:00
8722d3751c
Keys array
2012-11-28 10:36:54 -07:00
b78dc3f48a
keycode naming
2012-11-28 10:22:20 -07:00
9717cdb42e
Merge pull request #601 from butonic/add_drag_shadow_in_firefox
...
show drag shadow in firefox by using helper:'clone'
2012-11-28 09:00:12 -08:00
0c6b53c25e
no message
2012-11-28 09:55:38 -07:00
fa858d7149
initial setup
2012-11-28 09:50:54 -07:00
ccb9bb4be0
initial setup
2012-11-28 09:50:49 -07:00
5f03c306da
initial setup
2012-11-28 09:50:40 -07:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
9a441d3e3a
show drag shadow in firefox by using helper:'clone'
2012-11-27 17:38:21 +01:00
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
74cf3b5dfb
use normalizePath to have a proper target path
2012-11-26 14:35:13 +01:00
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
fdc7a8b204
make sure path starts with /
2012-11-26 14:34:09 +01:00
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
eaf8399aaf
make sure the output buffer is closed when handeling webdav
2012-11-25 14:45:13 +01:00
1857d5f914
[tx-robot] updated from transifex
2012-11-25 00:03:37 +01:00
c47bf9bbce
Add checks for storage object
2012-11-24 16:42:54 -05:00
dde3342398
[tx-robot] updated from transifex
2012-11-24 00:03:00 +01:00
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
db2be74b4d
Merge pull request #479 from owncloud/fix_438
...
Do the url encoding once, only in breadcrumbs template
2012-11-23 03:07:02 -08:00
b5b7a67f8a
Merge pull request #480 from owncloud/fix_435_and_437
...
Also reject names with \ in the name
2012-11-23 03:05:52 -08:00
97ed467224
Merge pull request #418 from libasys/Fix-IE8-fileactions-binding
...
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
2012-11-23 02:16:21 -08:00
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
8fb4dfd2ea
use background scanner
2012-11-23 00:20:46 +01:00
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
a465b3cb63
Development snapshot
2012-11-22 20:19:03 +00:00
5f78f9d642
Development snapshot
2012-11-22 19:36:48 +00:00
13d93fb416
Development snapshot
2012-11-22 14:08:19 +00:00
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +01:00
c773d071ee
Merge pull request #506 from owncloud/fix_505
...
refs #505 - defining publicListView based on template parameter
2012-11-22 02:53:10 -08:00
cd495bf9ba
some more invalid characters have been added
2012-11-22 11:52:05 +01:00
1793e85a52
Also reject names with \ in the name
...
fixes issues #435 and #437
2012-11-22 11:52:05 +01:00
d4ec77e08b
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
...
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
495a8da354
port 95cee0e from stable45
2012-11-21 19:29:56 +01:00
aebd4fd32d
port dd694b5 from stable45
2012-11-21 19:28:29 +01:00
42f235123e
LDAP: Make update script escape all known DNs. Requires version bump.
2012-11-21 19:25:36 +01:00
24e13419a3
LDAP: escape values in the DN, fixes #419
2012-11-21 19:25:10 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
5328aae8a8
Added unit tests for legacy encryption methods
...
Improvements to documentation
2012-11-20 19:10:10 +00:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
9b7cbb1145
interpret http 403 and http 401 as not authorized
2012-11-20 13:44:49 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
2af7ac78d2
refs #505 - defining publicListView based on template parameter
2012-11-18 12:28:04 +01:00
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
637891b771
Development snapshot, lots of fixes
...
Web UI based encryption working
Crypt and Util unit tests passing
2012-11-16 18:31:37 +00:00
6df35eeddc
Added unit tests for setupServerSide(), key paths, and ready()
...
Started using Mockery library for mimicking objects
2012-11-16 18:30:00 +00:00
20c24f234f
Do the url encoding once, only in breadcrumbs template
...
fixes issue #438
2012-11-16 16:12:28 +01:00
02bc440900
Show error message to prevent adding a shared folder in the root dir fix #468
2012-11-16 14:59:14 +00:00
3358bface5
fix incorectly merged versions.php
2012-11-16 12:24:28 +01:00
54240140b1
fix incorectly merged smb.php
2012-11-16 12:14:29 +01:00
4a3b5125cf
adding comments on the form array indexes
2012-11-16 11:58:33 +01:00
2b192a75c4
normalize the path once in upload.php is enough - THX Robin for this hint
2012-11-16 11:50:57 +01:00
7af4cf48c9
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 10:23:40 +01:00
f94d62380f
Merge branch 'master' into filesystem
2012-11-15 21:27:24 +01:00
8a93cc14f6
port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.'
2012-11-15 17:16:18 +01:00
b5c0e4042e
Fixing use of splitIv
...
Fixed unit tests for splitIv
2012-11-15 13:01:05 +00:00
138a255f73
Switched require() for require_once()
2012-11-15 13:01:04 +00:00
cb81b82a11
Fixed IV generation test
...
Changed use of namespace
2012-11-15 11:54:16 +00:00
886fb188cd
Improved documentation
...
Implemented exceptions
Added method for splitting catfiles
2012-11-15 11:54:16 +00:00
459a7622dc
Added check if sharing app is enabled, commented out sharing code due to issue
2012-11-15 11:54:16 +00:00
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
fdf0f6ce61
Added namespace
2012-11-14 16:39:35 +00:00
eda9ce4cf8
Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered.
2012-11-14 16:05:24 +01:00
dd987a8bd1
Added minor documentation
2012-11-14 13:58:57 +00:00
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
66dfe270c6
Merge pull request #319 from owncloud/fileactions_newfile
...
Add fileactions to new files and folders
2012-11-12 14:57:06 -08:00
d79e9a2da7
LDAP: cherrypick objectGUID handling from stable45, was part of PR 344
2012-11-12 17:00:23 +01:00
bbef5b377e
add i18n for cancel button
2012-11-12 10:52:28 +01:00
09d6d843f7
[tx-robot] updated from transifex
2012-11-12 00:02:24 +01:00
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
6e6df6e410
Fixed new checkstyle issues in ftp.php from build #1341 .
2012-11-10 00:46:50 +01:00
3cc6df489f
Fixed new checkstyle issues in swift.php from build #1341 .
2012-11-10 00:45:49 +01:00
051635412d
Fixed new checkstyle issues from build #1341 .
2012-11-10 00:40:32 +01:00
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
127a5a3ecd
l10n support for user_webdavauth
2012-11-09 09:59:27 +01:00
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
41a61bc637
fix undefined index when loading files app
2012-11-08 21:36:13 +01:00
d4858527c2
fix rename parameter order
2012-11-08 21:35:30 +01:00
84084b9430
Merge pull request #261 from owncloud/fix_opera_file_delete
...
fix file delete in opera - fixes #188
2012-11-08 08:55:19 -08:00
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
37fe9800b6
add actions to newly created files and folders
...
closes #231
2012-11-07 22:13:52 +01:00
42935c5564
reuse jquery object when adding files to the file list
2012-11-07 22:06:05 +01:00
e14054610f
Revert "fix blocking drag & drop upload of folders"
...
Fixes #150
This reverts commit 5b2f3c7f72
2012-11-07 21:59:18 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
1910bff75c
Merge pull request #303 from owncloud/fix_issue_95
...
urlencode file/dir to allow special characters in filename/path (issue #95 )
2012-11-07 05:48:28 -08:00
7b51a4e5f9
Merge pull request #306 from owncloud/crumb_drop_fix
...
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
168a2c7b6b
get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name.
2012-11-07 14:10:10 +01:00
d42d88d391
Merge pull request #289 from zimba12/master
...
Move function that relativizes dates from Files app to core
2012-11-07 03:43:59 -08:00
12983cf0b0
urlencode file/dir to allow special characters in filename/path (issue #95 )
2012-11-07 10:47:19 +01:00
3e01fe1dbb
[tx-robot] updated from transifex
2012-11-07 00:02:51 +01:00
6339e71bdc
LDAP: fix typo in config value handling.
2012-11-06 20:16:37 +01:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
64ac208fb2
Merge pull request #258 from wardragon/ldap_existence_check_no_refactor
...
LDAP: improved object existence check
2012-11-06 07:24:15 -08:00
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
b7e9d8d00e
Merge pull request #267 from owncloud/improve_files_update
...
Improve performance of files update (on larger setups)
2012-11-05 14:06:07 -08:00
8b3ae4309b
Fix mkdir and opendir warnings when path does not exist
2012-11-05 21:37:59 +01:00
85d6a08ae9
prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups
2012-11-05 20:47:26 +01:00
bb0164c9fc
fix file delete in opera - fixes #188
2012-11-05 18:42:44 +01:00
ca24f4767b
Return an empty array on succesful existence check
2012-11-05 17:35:09 +01:00
972243d564
support string values ('true' and 'false') for configuring the secure parameter on external storage backends
...
fixes #78
2012-11-05 16:39:03 +01:00
510191db68
Return true or false from readAttribute if $attr is empty
...
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
5c72d28ffd
Merge pull request #245 from owncloud/fileactions
...
some more reuse for fileactions
2012-11-05 05:52:52 -08:00
59381b90a0
Merge pull request #252 from owncloud/fix_user_webdavauth
...
Fix user webdavauth
2012-11-05 05:38:06 -08:00
6fba4ba87d
fix the webdavauth app
2012-11-05 14:22:16 +01:00
34fee8afaa
remove debug statements
2012-11-05 13:52:02 +01:00
01b0e9b133
fix the webdav user backend. still not completel working but a frist step
2012-11-05 10:46:28 +01:00
135680e50b
Merge pull request #242 from fmms/checkstyle05
...
Checkstyle fixes
2012-11-05 01:34:11 -08:00
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
4f32f49fb1
this line shouldn't be here
2012-11-04 21:00:36 +01:00
f187aa6c93
some more code reuse for fileactions
...
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
00bb246a0d
merge from master
2012-11-04 19:58:48 +01:00
9795bc19bf
Checkstyle: Fix the last two InvalidEOLChar
2012-11-04 18:42:18 +01:00
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
1205749f8c
Checkstyle: Fix the last two SpaceBeforeOpenBrace
2012-11-04 18:18:03 +01:00
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
80b9854710
Remove uneeded debug output
2012-11-04 14:26:45 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
2f0fd84477
[tx-robot] updated from transifex
2012-11-03 00:02:24 +01:00
4a5a36577e
merge master into filesystem
2012-11-02 21:42:29 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
df8c67721d
code style
2012-11-02 09:42:10 +01:00
d9e9761099
Fix a typo
2012-11-02 00:16:40 +01:00
0f02b7dea6
Add CSRF token
2012-11-02 00:09:28 +01:00
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
e66482430e
Files: change wording 'From url' to 'From link'
2012-11-01 18:09:16 +01:00
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
5252fc52ed
LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194
2012-11-01 16:48:17 +01:00
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
a9ce43de41
adapted comments to the code changes
2012-11-01 00:20:50 +01:00
3878950af4
load logging apps for webdav connections
...
Backport of de1b95c
2012-11-01 00:20:43 +01:00
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
b76306c144
Merge pull request #155 from owncloud/token-expired-IE
...
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
43917e187b
External Share API: Move url down one level in response
2012-10-31 11:31:19 +00:00
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
116fa64294
Change IE8 to "older IE versions"
...
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
ee1e4a7602
Send the requesttoken as form value
...
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.
Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
629d33967c
Merge pull request #142 from denis-b/patch-2
...
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
2aa5a185d4
Update apps/files/ajax/move.php
...
fix moving dirs containing "+"
2012-10-29 16:46:22 +01:00
b563935498
Update apps/files/index.php
...
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
ccbf4e993c
Use files remote webdav in compatibility files/webdav.php
2012-10-29 15:04:56 +01:00
ab4ade0d24
Remove fixme, problem is solved already
2012-10-29 15:04:55 +01:00
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
0fbb99690b
properly replace fileaction icons with pngs when needed
2012-10-28 16:03:52 +01:00
6675a46679
Fix url generated for public shared files
2012-10-28 15:03:21 +00:00
4fd0514f0a
don't move file into subdirectory if a file with the same name already exists ( fixes #92 )
2012-10-28 15:23:40 +01:00
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
d9ef6da2e4
code style
2012-10-28 12:47:42 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
58828d205f
LDAP: usersInGroup now also does LDAP serverside search.
2012-10-27 19:43:07 +02:00
3f85432df9
LDAP: make filter in readAttribute configurable
2012-10-27 19:43:07 +02:00
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
72aebe3aa3
fix broken paths in versions app
2012-10-27 18:08:00 +02:00
7891add286
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 18:06:14 +02:00
1b2279c935
LDAP: getGroups to use paged searches
2012-10-27 17:46:01 +02:00
5b3c9518dc
LDAP: improve slicing
2012-10-27 17:46:01 +02:00
33aa630af3
LDAP: add error handling for failed searches
2012-10-27 17:46:01 +02:00
a053da58ce
LDAP: be careful which limit is send to possible paged LDAP search
2012-10-27 17:46:01 +02:00
977c4d1844
LDAP: use the correct attribute in filter
2012-10-27 17:46:01 +02:00
246221a677
LDAP: fix again proper check if groups are enabled
2012-10-27 17:46:01 +02:00
b942c1253e
remove TODO comment, it's done
2012-10-27 17:46:01 +02:00
d6953fa5ed
Remove wrongly committed files
2012-10-27 17:45:15 +02:00
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
f151376ad5
remove remaining line from merge conflict
2012-10-27 17:06:13 +02:00
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
a93660d37a
fix broken paths in versions app
2012-10-27 15:52:48 +02:00
c1a0e809bf
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 15:50:17 +02:00
8973124574
Merge branch 'master' into filesystem
2012-10-27 15:31:27 +02:00
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
0fb707d2c9
some more porting of the sharing
2012-10-27 14:25:15 +02:00
86be7e8872
remove last uses of depricated OC_Filesystem
2012-10-27 12:23:13 +02:00
605281da9b
LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.
2012-10-27 12:19:08 +02:00
67cd268df9
LDAP: debug messaged
2012-10-27 12:19:08 +02:00
ee6fc22d4b
LDAP: sourced out paged search init into initPagedSearch method, making search slicker again
2012-10-27 12:19:08 +02:00
dea0d20a9a
fix delete and sort files
2012-10-27 12:18:01 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
1313cad1b9
LDAP: let getUsers make use of paged search
2012-10-26 21:54:35 +02:00
84130b885f
LDAP: add support for paged searches.
2012-10-26 21:54:34 +02:00
fc446d0af4
LDAP: know, wether server supports paged search
2012-10-26 21:54:34 +02:00
3f78a8190f
LDAP: check for resource before unbinding
2012-10-26 21:54:34 +02:00
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
f477fda785
separate buttons for new file and upload
2012-10-26 18:16:42 +02:00
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
43ac43d7af
dir in newfile has to start with /
2012-10-25 08:37:13 +02:00
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
7454186806
Forget to urlencode the path
2012-10-24 18:00:19 +02:00
ff6d2f16c4
urlencode
2012-10-24 17:58:52 +02:00
694b1d397d
Revert e1a4fe9890
2012-10-24 17:58:52 +02:00
5a3d6805a2
cleanup OC_Files a bit
2012-10-24 15:52:30 +02:00
07e08d5928
urldecode target directory
2012-10-24 15:37:51 +02:00
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
41898a473e
Apply coding style guide
2012-10-24 14:43:34 +03:00
a9a27306de
fix copy&paste bug from previous commit
2012-10-24 13:11:29 +02:00
1d200c554f
Shared files are not stored in the file cache. Therefore we need to
...
use the share table from the db to find the item source if the public
link re-shares a already shared file.
2012-10-24 13:11:29 +02:00
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
4c234bd666
Apply coding style guide
...
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
070fe02448
calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem.
2012-10-24 10:06:00 +02:00
a7eb56c799
Merge pull request #76 from fmms/master
...
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
c443993fc2
LDAP: properly check if Groups-feature is enabled
2012-10-24 00:23:31 +02:00
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
dfecdb9700
Remove uneeded vendor prefixes
2012-10-24 00:00:33 +02:00
f363bde121
Format the CSS in a readable way
2012-10-23 23:57:55 +02:00
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
e1a4fe9890
Fix urlencoding in the breadcrumb
2012-10-23 17:50:36 +02:00
73f85c3b81
Merge pull request #62 from fmms/master
...
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
ab944094e2
Merge pull request #12 from scambra/fixes
...
check free space using folder's owner
2012-10-23 07:02:21 -07:00
fbe059afd3
Merge pull request #59 from fmms/master
...
Starting point to take care of Checkstyle warnings
2012-10-23 06:58:15 -07:00
6a2a915559
Files: urldecode urlencoded dir names, fixes oc-2111
2012-10-23 13:50:24 +02:00
36d0d75901
Codestyle: FunctionCallArgumentSpacing
2012-10-23 08:35:54 +02:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
6a00a6b9ed
Make Jenkins more happy.
...
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
78a1b987bb
LDAP: fix db update for Postgres
2012-10-23 00:18:43 +02:00
b879cd709e
LDAP: fix cache save and check, fixes oc-2118
2012-10-22 22:46:28 +02:00
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
33cabcf590
postpone the cost of setting up some of the external storage backends untill we actually need it
2012-10-21 22:04:45 +02:00
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
6f1fbf97f7
some namespaces fixed for the shared backend
2012-10-21 00:27:55 +02:00
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
81cf726b18
unset UserID after Update
2012-10-18 18:45:03 +02:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
e307bf31c8
fix oc-605
2012-10-18 14:19:34 +02:00
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
9f01cd05fb
Merge pull request #37 from scambra/js-interpolation-l10n
...
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
265f3654af
all unit files_encryption crypt unit tests now passing after merge
2012-10-17 16:35:19 +01:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
b2b84f3a6f
Update Sabre to version 1.7.1
2012-10-17 16:17:36 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
5ecce8bfb7
Translate modification date when file is created/uploaded, use same strings as lib/template.php
2012-10-16 20:25:11 +02:00
8b01286a5d
Merged branch 'master'
2012-10-16 16:57:07 +01:00
06ea9c18f8
Development snapshot
...
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
b08a1696f5
normalize path to avoid problems with trailing slashes, double-slashes, etc.
2012-10-16 12:48:56 +02:00
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
24ad6b5a62
LDAP: fix retrieval of Quota and Email
2012-10-15 18:47:28 +02:00
5708488b3e
make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs
2012-10-15 18:16:27 +02:00
800fd5fd79
LDAP: check if index is set, fix Notices
2012-10-15 17:17:37 +02:00
cf7df2db7a
[tx-robot] updated from transifex
2012-10-15 02:09:11 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
5b2f3c7f72
fix blocking drag & drop upload of folders
2012-10-12 15:30:16 +02:00
c099545b6d
don't throw errors if certificate folder doesn't exist
2012-10-12 14:52:22 +02:00
e5f2d46c6f
Sanitize user input
2012-10-12 14:10:05 +02:00
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
141ff806c6
fix namespace problems for external storage backends
2012-10-11 23:17:59 +02:00
542869114a
implement getId for the external storage providers
2012-10-11 23:06:57 +02:00
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
92ddefe5a6
fix filetype for smb storage backend
2012-10-11 22:18:34 +02:00
5698c8519a
fix webdav storage backend when trying to open a non existing file for reading
2012-10-11 22:18:34 +02:00
5256301a53
skip the files_external test cases the correct way
2012-10-11 22:18:34 +02:00
8336b3287e
Various bug fixes for swift
2012-10-11 08:52:21 -05:00
77d91d5a03
generate correct link for shared files and shared directories
2012-10-11 13:45:16 +02:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
4da67b0a08
Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests
2012-10-10 18:40:59 +01:00
5c6e9518ed
drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath
2012-10-10 17:46:29 +02:00
41640b4b91
don't show the share action in the file view for publically shared files.
2012-10-10 17:44:21 +02:00
4a712bdd48
only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down
2012-10-10 13:46:51 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
33dcb3b1f4
fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively)
2012-10-10 11:49:16 +02:00
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
29fa9dfb79
Merge pull request #25 from visit1985/uploadfilesize
...
fixed max possible upload size for files app in admin screen
2012-10-10 00:41:19 -07:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
4e6f720f14
Fix closing the sharing dropdown by clicking on the share button
2012-10-09 19:23:44 +02:00
293484d1ee
add directory while creating mount point
2012-10-09 15:18:21 +02:00
f29f1cad1d
Prevent Versions click handler from closing sharing dropdown
2012-10-09 13:00:33 +03:00
f1fc73ea5b
[tx-robot] updated from transifex
2012-10-09 02:07:41 +02:00
32e2d7ef8f
check if ID was assigned
2012-10-08 17:47:02 +02:00
277dd2b0a9
remove debug output
2012-10-08 17:32:04 +02:00
2923d24921
add data-id directly after upload/creation to the file list (bugfix for #1917 )
2012-10-08 17:30:35 +02:00
c815fd5a5c
fix files_external test cases
2012-10-08 14:31:13 +02:00
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
4dba91838f
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
2012-10-08 10:28:29 +02:00
b934668b9e
[tx-robot] updated from transifex
2012-10-08 02:07:01 +02:00
995b8bf12a
Remove old Shared folders from the file cache, fixes bug oc-1911
2012-10-07 17:34:21 -04:00
4b446f3edd
Revert part of 5beca59b, fixes file upload bug oc-1926
2012-10-07 17:17:37 -04:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
7f2208b9a1
fixed max possible upload size for files app in admin screen
...
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
2012-10-07 00:31:07 +02:00
a203a4a1c7
add support to mount a specific folder from dropbox
2012-10-06 13:44:53 +02:00
54695b11eb
test case for dropbox storage
2012-10-06 13:43:34 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
68bb3809c7
LDAP: we're good for 0.3 now. No code change
2012-10-06 00:38:10 +02:00
4f7c7c615e
prevent xss attacks
2012-10-05 17:05:23 +02:00
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
c99f62891a
breadcrumbs fixed for public share view
2012-10-05 15:06:59 +02:00
0d081ac5ac
register download action for directories
2012-10-05 14:28:23 +02:00
ef8a4a1629
register download action for files
2012-10-05 14:28:23 +02:00
99f4d949c1
fix download link for single files in publicly shared directory
2012-10-05 14:28:23 +02:00
72a48ca35e
fix download of single publically shared files.
2012-10-05 12:01:18 +02:00
dcad7aec82
fixed download of complete publically shared folder
2012-10-05 11:38:00 +02:00
f4136854b6
stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename"
2012-10-05 11:15:32 +02:00
a611ce4f33
baseDir has to be the whole path to work with shared directories below the root directory.
2012-10-05 10:32:38 +02:00
b88a61c633
no content area, it overlaps the file list
2012-10-05 10:32:38 +02:00
5beca59b9c
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
2012-10-05 10:32:38 +02:00
4fd53eca06
[tx-robot] updated from transifex
2012-10-05 02:06:09 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
51321526e2
Prevent displaying errors if public link url parameters are incorrect
2012-10-03 16:14:54 -04:00
6fada7a4c0
[tx-robot] updated from transifex
2012-10-03 02:05:14 +02:00
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
7abe1360b2
l18n support added to files_external/js
2012-10-02 23:09:28 +02:00
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +02:00
39735721ec
escape identifiers in queries
2012-10-02 14:11:25 +02:00
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
550813ce41
don't use the complete path but the basename if the file/foder has no extension. Otherwise
...
we can end up with different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
538c2662a9
Merge pull request #23 from lipemat/patch-1
...
Fix the File Upload Button in Chrome
Arrow was showing under the button in Chrome. With this commit it should be shown correctly.
2012-10-01 10:28:51 -07:00
33e9399ba3
LDAP: fix sharing doesn't work with ldap groups, oc-1819
2012-10-01 18:27:58 +02:00
b23ad579dc
Sharing: backward compatibility to links from OC 4.0.
2012-10-01 14:39:53 +02:00
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
d1010e58d8
Update apps/files/css/files.css
...
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
2330dd5f21
Update apps/files/css/files.css
...
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
2012-09-30 20:02:52 -05:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
4e2f575938
Correctly fix oc-1016 and fix downloading of files
2012-09-28 21:18:20 +02:00
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
232936b99a
This .gitkeep is unneeded
2012-09-27 22:24:56 +02:00
3fa4b34a69
LDAP: comparison, not assignment. Thanks to Manuel Delgado
2012-09-27 19:52:52 +02:00
aa9ffd119a
check if file really exist before add/remove it
2012-09-27 12:37:23 +02:00
a56f2ec183
only upload valid ssl root certificates
2012-09-27 11:21:29 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
21c6cc45e6
take '\' on windows systems into account to prevent file deletion above upload direectory
2012-09-26 23:08:40 +02:00
9ab887fed5
fix security issue, don't allow to go back in the path
2012-09-26 21:35:14 +02:00
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
0192d920f0
Sharing: write update errors to logfile; do not die on errors
2012-09-26 12:27:43 +02:00
fcd70246db
Merge branch 'master' of github.com:owncloud/core
2012-09-26 10:50:06 +02:00
c3c6e52104
- take webdav namespace for properties into account
...
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
7b8c7aaf0d
Add missing Sharing permission
2012-09-25 18:01:56 +02:00
80fde2d8d1
Sharing update: take over reshares and thus don't fail
2012-09-25 12:14:20 +02:00
25499644e3
Merge branch 'master' of github.com:owncloud/core
2012-09-25 12:02:02 +02:00
90a1bd5721
seperate the form to set up the mount points and the form to upload ssl certificates
2012-09-25 12:01:09 +02:00
15e02726d7
Fix files_sharing update script, by making filesystem and users available
2012-09-25 11:47:53 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
7aca730f71
Small css fix for button new in files. fix oc-1638
2012-09-24 18:40:59 +00:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
4d2669f6b3
Merge branch 'master' into filesystem
2012-09-23 14:56:58 +02:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
eed1ccd164
Merge branch 'master' into filesystem
2012-09-23 02:41:31 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
f360d7c736
add getId to shared storage backend
2012-09-23 01:51:00 +02:00
96b798a59f
move storage backend test cases to their own namespace
2012-09-22 14:51:15 +02:00
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
b4de89e6b4
Sanitize download URL
...
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
d5055639b2
Merge pull request #15 from scambra/delete-fixes
...
use post to delete files, get has a limit and fails with many files
2012-09-21 16:11:11 -07:00
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
8cfa618df5
Catch exceptions in upgrading files_sharing, skip the errors for now
2012-09-21 23:31:44 +02:00
11bdc8baa8
Fix the mimetype filter in OC_Share_Backend_File
2012-09-21 23:17:12 +02:00
ee77ef86d3
Check mimetype filter in file share backend
2012-09-21 21:32:09 +02:00
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
bcd3d1116c
Change background colour of upload button to be consistant with new button
2012-09-21 12:45:11 +00:00
2a7a928ae9
LDAP: replace expensive recursiveArraySearch with direct SQL search, leading to a performance boost. Imorives UX especially on directories with tons of users, solves complains on ML and probably fixes oc.1080
2012-09-21 13:03:28 +02:00
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
57c02d16ca
LDAP: add forgotten class, fixes oc-1803
2012-09-20 16:59:28 +02:00
6c644a0c83
change the new button color on mouse over so that the user understands that the button is actually two buttons.
2012-09-20 14:59:28 +02:00
4ea128ee43
Merge pull request #13 from scambra/safari-fixes
...
fix js success callback on safari when uploading files
2012-09-20 02:24:27 -07:00
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +02:00
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
1c643ce4bc
made upload button the same height in chrome and firefox
...
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
f9127192da
Fix styling of public shared files download button
2012-09-19 19:51:52 +00:00
d7b878b303
Dynamicly resize public shared images
2012-09-19 19:46:49 +00:00
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
5f997021d1
Fix syntax bug
2012-09-19 21:29:16 +02:00
ee32d1aad5
Fix versioning of shared files
2012-09-19 21:29:16 +02:00
01ce2babd1
Fix sharing of single files, target name was not correct
2012-09-19 21:29:16 +02:00
f66c441f77
LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625
2012-09-19 15:37:05 +02:00
73ed13fe75
Increase click area of breadcrumb, fix oc-703
2012-09-19 12:31:02 +00:00
223bf3e47c
fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15)
2012-09-19 14:05:09 +02:00
c199c4ad67
Merge branch 'master' of github.com:owncloud/core
2012-09-19 12:03:58 +02:00
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +02:00
1e880feab1
execute lastAction() before add new one
2012-09-19 11:56:31 +02:00
39e587b52c
Remove the content and table to prevent covering the download link
2012-09-19 00:27:53 -04:00
749b5b52ca
Show preview for public folder links
2012-09-18 23:56:14 -04:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
8a74a39c42
Fix oc-1769, renaming folders with extensions
2012-09-18 22:08:34 +00:00
842cd57fa7
use more oc file operations instead of plain PHP functions
2012-09-18 17:04:22 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
6444c27e6a
LDAP: fix MySQL-query with DUAL table by removing wrong backticks. Got broke when they were added to SQL queries.
2012-09-17 22:50:08 +02:00
b04c7175dc
Check if the versioned file exists before trying to do the versioning
...
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
597fed4fde
Fix oc-1726, cannot delete multiple files one by one without refresh
2012-09-17 15:29:15 +00:00
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +03:00
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +03:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
89fb5d47a4
Add chosen script and style, bug fix for oc-1745
2012-09-16 13:27:27 -04:00
f17555285e
Merge branch 'master' of https://github.com/owncloud/core
2012-09-16 17:14:04 +02:00
9d533fcd72
add a legend tag. it´s consistent and looks nicer
2012-09-16 17:13:16 +02:00
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +02:00
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
f8d907df71
Set configured to true after configuring Dropbox storage
2012-09-12 21:30:04 -04:00
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
10b74f9d05
Don't hide errors doing the versioning copy
2012-09-13 00:09:00 +02:00
87b7a23648
Don't get metadata directly from the 'cached' file cache after upload
2012-09-12 17:00:46 -04:00
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
ed980674a6
Development snapshot
2012-09-11 13:40:45 +01:00
ff6141b1e9
Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again
2012-09-10 21:57:13 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
deb1fbf9a1
Provide update script for files sharing
2012-09-09 18:29:47 -04:00
5c5955b31f
Disable link sharing for folders temporarily - next release
2012-09-09 14:52:03 -04:00
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
785aa751bb
Whitespace fixes
2012-09-07 14:10:43 +02:00
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
17dadd5c8a
Don't show the delete all action if delete permission is not granted
2012-09-07 00:02:22 -04:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 -04:00
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
a5211e31bc
Add permissions to new files/folders, bug fix for oc-1649
2012-09-05 21:47:09 -04:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
aa8cee1afa
I don't think this file was meant to be commited
2012-09-05 19:42:26 +02:00
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 -04:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
02f9de55a3
add translation string
2012-09-04 23:42:49 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
745f279fbc
make use of OC_User::getHome in files_external app
2012-09-04 15:56:00 +02:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
c6858fb5ca
Add additional html tags to public links template for previewers
2012-09-03 13:14:23 -04:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
29d1e8087d
Implement generateTarget for file sharing backend
2012-09-01 13:46:57 -04:00
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
73d0a2b8f7
use OC.PERMISSION_X to filter selected drag'n'drop elements
2012-08-31 01:11:10 +02:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
077e988136
oc-1548: prevent user from leaving the page while a file upload is in progress
2012-08-31 00:45:03 +02:00
26ef012418
use permissions to quickfix drag selections
2012-08-31 00:13:02 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
7027742bd6
LDAP settings, add missing p tags
2012-08-30 15:06:33 +02:00
1a6f34865c
LDAP: on upgrade update user cols in database only when necessary
2012-08-30 15:03:02 +02:00
2440e500b8
LDAP: on upgrade set homeDirs of users where it is not set. Avoids new folders (empty), depending on the configuration
2012-08-30 14:55:07 +02:00
f2534e7428
Show notification that no preview is available if no previewer is found for a public link to a file
2012-08-29 21:12:23 -04:00
756b514fee
Check if file source exists before searching for link
2012-08-29 21:12:23 -04:00
898ca364a2
[tx-robot] updated from transifex
2012-08-30 02:06:45 +02:00
c958d5ba80
Fix filesystem setup for shared public link with logged in user
2012-08-29 21:35:55 +02:00
8d490b9880
Fix shared storage working with user backend defined data directories
2012-08-29 14:39:13 -04:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
224e55e590
LDAP: fix debug message with undefined variable
2012-08-29 19:37:18 +02:00
741a21292e
LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method.
2012-08-29 19:37:18 +02:00
8be8f6fff2
LDAP: Remove unnecessary debug output, fixes a Notice
2012-08-29 19:37:18 +02:00
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
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
b64229a89e
apply coding style
2012-08-29 01:39:42 +02:00
4c4aa92eef
LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master.
2012-08-29 01:23:51 +02:00
fe49cbafc7
apply coding style
2012-08-29 00:50:12 +02:00
f301bfd8c9
apply coding style
2012-08-29 00:36:27 +02:00
da44e5405a
Fix typo
2012-08-28 11:12:18 -04:00
c53310e49b
Remove unnecessary ajax file from files_sharing
2012-08-28 09:57:09 -04:00
1e2ba8398d
Remove old database xml file for files_sharing, bump version number
2012-08-28 09:55:24 -04:00
0a1f24142a
Change public file from get.php to public.php
2012-08-28 09:53:31 -04:00
42a9969304
LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use
2012-08-28 14:24:50 +02:00
549f69cbc1
marked as shipped app
2012-08-28 07:35:31 +02:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
6b5f1ffdb4
upload button improvement, better separation, fix wrap issue
2012-08-27 14:05:18 -07:00
c2290a542e
add deprecated warning
2012-08-27 22:58:50 +02:00
5985d00c6f
LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected.
2012-08-27 21:32:56 +02:00
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
184438224c
restore the webdavauth app
2012-08-26 17:51:01 +02:00
72e9a2ce57
moved to apps repository
2012-08-26 17:30:07 +02:00
32bad688bd
Wrong function
...
https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
2012-08-26 17:22:41 +02:00
2028c81161
OC_Util is better thank OCP\JSON because it'll redirect the user to the index.php instead of displaying an error
2012-08-26 16:08:58 +02:00
4885a52ba4
Check if app is enabled
2012-08-26 16:05:40 +02:00
bcd86bfd02
Remove some empty lines
2012-08-26 15:43:34 +02:00
726be04e5f
Use sanitizeHTML instead of strip_tags
2012-08-26 15:41:41 +02:00
922982f070
[tx-robot] updated from transifex
2012-08-26 02:22:02 +02:00
ad66d6d5e9
translation support for pdfviewer
2012-08-26 02:17:28 +02:00
8e090d8f67
added translation for odfviewer
2012-08-26 02:17:28 +02:00
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
814cb6bbfa
translation support for text editor and impress added
2012-08-26 00:39:23 +02:00
c82518cb0e
[tx-robot] updated from transifex
2012-08-26 00:12:05 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
e8ffd5c042
use limit parameter instead of LIMIT SQL for vcard
2012-08-25 02:27:43 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
ee04b626b4
Correct variable name.
2012-08-24 17:23:01 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
3148edbdef
Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders.
2012-08-24 10:01:46 -04:00
63d6884e23
Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de)
2012-08-24 15:00:53 +02:00
eadb894eff
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
2012-08-24 15:00:53 +02:00
9188d2a844
Add a missing exit();
2012-08-24 15:00:53 +02:00
4e5291c77a
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-24 15:00:53 +02:00
1d530192b9
Disable user enumeration
2012-08-24 15:00:53 +02:00
9917c611d3
Disable listing of all users
2012-08-24 15:00:52 +02:00
78e8cbd52c
Check if webfinger is enabled
2012-08-24 14:58:48 +02:00
ffb55d5a17
Don't return file handle if the mode supports writing and the file is not writable
...
Conflicts:
apps/files_sharing/sharedstorage.php
2012-08-24 14:58:48 +02:00
3644517b01
Missed an "echo"
2012-08-24 14:58:47 +02:00
4f7e4c20d2
Sanitize user input
2012-08-24 14:58:47 +02:00
2832311640
fix label for versioning in admin settings
2012-08-24 14:54:17 +02:00
5e9f92e5dd
Calendar: remove double html encoding
2012-08-24 14:54:17 +02:00
646bc1fc24
Contacts: Fix no active Addressbooks
2012-08-24 14:54:16 +02:00
2af7473651
LDAP: sanitize base, user and group trees. fixes oc-1302
2012-08-24 14:54:16 +02:00
46d6fd15e4
Implemented sharing api for CalDAV.
2012-08-24 14:26:06 +02:00
d1421ca5ab
White-space.
2012-08-24 13:49:56 +02:00
b716296203
Forgot to reenable the export plugin.
2012-08-24 05:04:45 +02:00
953f9d95f8
Implemented sharing api for CardDAV. Next step CalDAV.
2012-08-24 04:56:21 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
2cffcfbc03
Permission checking for shared addressbooks/contacts.
2012-08-23 22:03:36 +02:00
f568ba9c8c
Removed redundant __CLASS__ in logging.
2012-08-23 22:03:36 +02:00
fdb4c820d3
Fix for deleting queued contacts.
2012-08-23 22:03:35 +02:00
394617e0b6
Missing IM variable assignments.
2012-08-23 22:03:35 +02:00
069d16fdd4
Use correct js class in first-run template.
2012-08-23 22:03:35 +02:00
a3af9f4773
Used non-existing variable.
2012-08-23 22:03:35 +02:00
d5127b14be
Return newly created addressbook.
2012-08-23 22:03:35 +02:00
e3ac15bad3
development snapshot
2012-08-23 19:19:39 +01:00
d5c111a984
LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens).
2012-08-23 18:29:43 +02:00
32ee3de918
Extensive work on crypto stream wrapper implementation
2012-08-23 16:43:10 +01:00
2d97164f80
Limit styles so they don't interfere with sharing dropdown.
2012-08-23 05:02:30 +02:00
6941266e7b
Remove obsolete closure.
2012-08-23 05:02:30 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
99d17c5190
Don't add empty property parameters.
2012-08-23 01:18:59 +02:00
1df596e758
CSS fix for Windows.
2012-08-23 00:40:10 +02:00
0944b4455b
Moves the lastAction=null outside the if so it can include the undo requests from replace
2012-08-22 17:08:10 -04:00
24a207a8fa
Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
...
Essentially, just set FileLists.lastAction = null when one clicks undo.
2012-08-22 16:56:00 -04:00
61c7700ce6
Add support for IMPP properties.
2012-08-22 18:51:17 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
25d474579a
Removing most of files_sharing, the Share API implemented the majority of it
2012-08-22 11:57:58 -04:00
536fbb9189
LDAP: fix potentially unavailable LDAP resource, which can prevent successful login
2012-08-22 15:22:52 +02:00
63c454c7b2
LDAP: make refreshInterval for background jobs configurable in the DB
2012-08-22 12:44:46 +02:00
056d9adb23
LDAP: bg jobs: sane default refresh interval
2012-08-22 12:44:46 +02:00
c48732987e
LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs.
2012-08-22 12:44:46 +02:00
2b8a2e16ed
LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item.
2012-08-22 12:44:46 +02:00
ac9fd79329
Email type list wasn't initialized.
2012-08-22 12:40:35 +02:00
78b7e28ce0
Removed unused variable.
2012-08-22 12:40:35 +02:00
5c1dd82998
Minor layout change.
2012-08-22 12:40:35 +02:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
53350b2f19
Remove unnecessary file
2012-08-21 10:33:20 -04:00
1cfa831239
A first basic presentation app based on the amazing impress.js.
...
You have to put a presentation file that contains the presentation defined in html into your ownCloud with the file extension .impress
Then you can use this app to play it. It also contains a demo presentation that you can use to learn.
Help is welcome to improve this app. :-)
2012-08-21 14:44:23 +02:00
25dd0e940f
Preliminary support for Apple X-ABLabel. Also for oc-1508.
2012-08-21 03:57:48 +02:00
8d38dc04a0
Remove class contactsection
2012-08-21 03:57:48 +02:00
68f5dc2a44
Remove unnecessary files
2012-08-20 21:22:23 -04:00
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
1e42cd162e
Added types to emails. Support for custom types. Partial fix for oc-1508.
2012-08-21 00:20:18 +02:00
719ae155db
Try to align and float contact parts better.
2012-08-21 00:20:18 +02:00
ef3eebfd3e
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
2012-08-20 17:24:10 +02:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
f893d21660
[tx-robot] updated from transifex
2012-08-20 02:03:51 +02:00
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
2d3ec5cb4b
Removed stray img element.
2012-08-19 17:05:45 +02:00
4946e23bdc
Strip slashes from commas and semi-colons.
2012-08-19 16:32:32 +02:00
a4e840f4f1
improve hasUpdated for archive storage backend
2012-08-19 06:29:57 +02:00
758ebe0446
don't report ctime in the archive storage backend since it isn't reliable
2012-08-19 06:18:40 +02:00
7f6a037b8c
small fix for normalizing paths in archives
2012-08-19 06:15:33 +02:00
808d6c58fe
ensure proper result format when using opendir on the archive storage backend
2012-08-19 05:45:55 +02:00
2ea46ee1ca
better file_get_contents, file_put_contents and toTmpFile for archive storage backend
2012-08-19 05:05:55 +02:00
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
6ef5edf5ea
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-18 09:30:01 +02:00
f1cabdd8e0
[tx-robot] updated from transifex
2012-08-18 02:04:07 +02:00
41639f0517
fix fail in sql query of isDuplicate method of OC_Calendar_Import
2012-08-17 21:29:26 +02:00
44272b9889
increase margin top of calendar import's color picker
2012-08-17 20:48:47 +02:00
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
293a0f4d32
Started rewrite of cryptstream class (renamed to stream)
...
Added unit tests
Fixed decryption of user private key at login
Added functionality to keymanager
2012-08-16 19:18:18 +01:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
4c638f101e
Merge addressbooks.
2012-08-16 00:25:32 +02:00
3b9fac8f81
Fix gallery image view
2012-08-15 19:55:26 +02:00
f11f524dfa
working on streaming decrypted content
...
applied some dependency injection to keymanager.php
2012-08-15 18:49:53 +01:00
ddfb9de147
Fix linkTo calls for new routing
2012-08-15 18:16:06 +02:00
b883bb6b42
Converted test to PHPUnit format
2012-08-15 14:52:03 +01:00
d725d07219
added two (currently passing) unit tests
2012-08-15 14:13:03 +01:00
ea236e83d7
added first version of keymanager PHPUnit test files
2012-08-15 14:01:43 +01:00
dd3208fe6f
Fix webfinger documentation
2012-08-15 14:50:25 +02:00
d039f11905
provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together
2012-08-15 13:18:11 +02:00
92ec88c7bc
move chane password code from keymanager.php to crypt.php
2012-08-15 09:54:21 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
6ce315fe58
added wrapper method in crypt class for encrypting asymmetric and symmetric simultaneously
...
fixed bugs with keymanager integration
added unit tests
2012-08-14 19:06:56 +01:00
a75870489c
Use correct class.
2012-08-14 20:06:45 +02:00
db5b995a6b
Disable user enumeration
2012-08-14 17:23:26 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
62e4f55f72
LDAP: adjust usersInGroup to updated interface
2012-08-14 14:30:03 +02:00
3c1380b093
LDAP: adjust getGroups to updated interface
2012-08-14 14:22:05 +02:00
452f55e163
adjust LDAP to updated interface
2012-08-14 14:14:20 +02:00
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
d3bdab286b
Suggest mount point name, don't reload custom javascript file
2012-08-13 17:10:58 -04:00
98c7d40fcd
Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
2012-08-13 17:10:58 -04:00
7f12a65c24
Show access granted label immediately after granting access
2012-08-13 17:10:58 -04:00
0e6d22e25f
Prevent editing Dropbox configuration input after access granted
2012-08-13 17:10:58 -04:00
b6b2f8826b
Show access granted label next to Google Drive and Dropbox storage in configuration
2012-08-13 17:10:58 -04:00
be32625fcc
Fix remove button display for external storage
2012-08-13 17:10:58 -04:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
d303763d1f
Automatically check radio when new addressbook fields get focus.
2012-08-13 15:07:15 +02:00
b1f6bb36b0
write error to OC_Log
2012-08-13 13:29:22 +02:00
34f93ac765
check if user has write access to a given file before updating the filekey
2012-08-13 11:31:15 +02:00
758f476fe3
Calendar: remove not used style rules
2012-08-12 22:40:36 +02:00
73b1b68fff
Rewrite remoteStorage settings, remove block echo
2012-08-12 22:30:13 +02:00
ab8e7f1da3
Remove unused gallery template
2012-08-12 22:30:13 +02:00
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
329bc28d06
Commented out unused(?) class that interfered with appsettings.
2012-08-12 18:44:18 +02:00
7113e80184
Readded refresh param. 304 and ETag is still sent so shouldn't matter.
2012-08-12 17:30:09 +02:00
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
5b16c7a25d
This is unnessecary because we already run htmlentities() over the template engine
2012-08-11 20:53:56 +02:00
39b9052c2f
[tx-robot] updated from transifex
2012-08-11 02:05:58 +02:00
d3427be5e4
Following the code guidelines makes Michael happy :-)
2012-08-10 22:20:32 +02:00
85f2e737a4
Disable listening, instead checking the ACL to prevent DoS
2012-08-10 22:18:08 +02:00
11895a86b0
Activate ACLs
2012-08-10 22:02:04 +02:00
fb493c45dd
Calendar: update share backend using contacts backend as template
2012-08-10 14:40:48 +02:00
6a95e4288e
Contacts: Check format parameter
2012-08-10 14:40:43 +02:00
6d971d3b1d
Contacts: Better parameter names in addressbook share backend
2012-08-10 14:32:54 +02:00
3ec6dc56c9
ToDo item removed
2012-08-10 12:37:04 +02:00
e4450d1035
execute file hooks only if server side encryption is enabled
2012-08-10 12:27:09 +02:00
12628be38b
only call proxies for server side encryption
2012-08-10 11:44:38 +02:00
e73292339f
Check if webfinger is enabled
2012-08-10 10:01:56 +02:00
2c5ab91c7d
Used wrong class.
2012-08-10 01:39:05 +02:00
2dfc485149
XSRF checks
2012-08-10 00:44:35 +02:00
26a9d7ea71
Fixed 3 - THREE - errors in one method call :-P
2012-08-09 23:16:07 +02:00
5f51366435
Sanitzing user input
2012-08-09 22:14:09 +02:00
7780e37f38
LDAP: don't give Test Connection button red background on fail, it is becoming unreadable
2012-08-09 21:42:35 +02:00
3b13051f7a
Additional permission checks for editing and deleting contacts
2012-08-09 13:54:59 -04:00
7e3f5492cc
typo fixed
2012-08-09 17:56:43 +02:00
7955120aed
remove debug code from calendar - thanks michael for pointing that out :)
2012-08-09 17:39:16 +02:00
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
368ade6b2f
code cleanup
2012-08-09 17:25:57 +02:00
f9cec1426f
Change parameter name and update docs.
2012-08-09 17:04:14 +02:00
39814edf81
Another take at profile photo/thumbnail caching. oc-839.
2012-08-09 16:32:05 +02:00
bd7d566733
change private key passphrase; disable file proxy for keymanager operations
2012-08-09 15:45:34 +02:00
a969c23e59
disable admin choice of encryption mode once a decision was taken
2012-08-09 14:25:09 +02:00
800942ece7
change key password when user switches from client to server side encryption.
...
make use of the keymanager class in changekeypasscode()
2012-08-09 13:47:27 +02:00
00d7ae8319
move calendar settings from personal settings to in app settings
2012-08-09 12:37:26 +02:00
5a261b5b8f
ask user for passwords when switching from client to server side encryption
2012-08-09 12:19:51 +02:00
d24582503a
Fix require statements. Fix for oc-1460.
2012-08-09 11:35:14 +02:00
b830b3e24b
Start adding permission checks for addressbooks
2012-08-08 21:43:02 -04:00
f4285a25ef
Don't include shared addressbook if source not found
2012-08-08 19:12:59 -04:00
10cfcd4ff0
Remove useless setting of RUNTIME_NOAPPS
2012-08-08 22:42:50 +02:00
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
a7cbc9e713
lock system wide encryption settings once the admin took a decision
2012-08-08 18:27:12 +02:00
05648dac61
Don't return file handle if the mode supports writing and the file is not writable
2012-08-08 11:25:24 -04:00
5983643abd
fix setFileKey() call in updateKeyfile hook
2012-08-08 15:32:05 +02:00
dc596a72c3
remove function which is no longer needed
2012-08-08 14:20:29 +02:00
d4974b6d4a
set default dependencies in keymanager.php
...
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
5bb3ea9740
define default properties in keymanager.php
2012-08-08 12:13:14 +02:00
35a1738a39
Use new sharing API in OC_Calendar_Share::allSharedwithuser
2012-08-07 23:31:06 +02:00
1e644b5a53
Add Event share backend
2012-08-07 23:27:06 +02:00
9580d0ef29
Initial calendar sharing backend
2012-08-07 14:57:52 -04:00
95031cb139
remoteStorage: Use OCP\\Util for redirecting for login and generating link
2012-08-07 20:43:00 +02:00
4e6b4b265b
remoteStorage: split auth allow template
2012-08-07 20:43:00 +02:00
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
2eac79b782
Some UI improvements on the addressbooks settings.
2012-08-07 00:06:18 +02:00
de7f48b050
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:37:10 -04:00
7c0a5d4a59
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:35:22 -04:00
3be4f5f2f1
Sharing backends for contacts and addressbooks
2012-08-06 16:11:03 -04:00
14d13a740f
Load icons for addressbooks, fix statuses for types other than files
2012-08-06 15:24:08 -04:00
03d65af5dc
Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible
2012-08-06 15:09:01 -04:00
83117445ac
Fix offset for folder detection, no longer including '/Shared' in file target path
2012-08-06 14:33:47 -04:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
ba0cf98175
Remove extra line, caused 'headers already sent' issues
2012-08-06 13:33:53 -04:00
fe6450002d
Change hardcoded urls to use linkTo function
2012-08-06 18:51:41 +02:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
e6759a980b
LDAP: layout settings form. Hope it is now a bit clearer and prettier.
2012-08-06 17:25:59 +02:00
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
95c33e466c
LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only.
...
Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
2012-08-05 23:00:47 +02:00
6fd48675e6
remove accidentally added blank lines
2012-08-05 22:03:47 +02:00
c10010e410
LDAP: check for always available attribute on userExists, fixes oc-1440
2012-08-05 22:02:34 +02:00
c3cbb463e3
add missing \
2012-08-05 21:35:37 +02:00
d546718179
LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302
2012-08-05 21:28:59 +02:00
80ca883d4c
Correct path to ajax file.
2012-08-05 03:36:16 +02:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
086397d8a1
Fix condition checking for resizing breadcrumbs
2012-08-04 15:57:49 -04:00
207ca3ec06
Dynamically resize breadcrumbs, fix for bug oc-468
2012-08-04 15:50:32 -04:00
da4057ecfd
fix label for versioning in admin settings
2012-08-04 18:51:09 +02:00
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
bef63527ce
Reorganize ajax scripts.
2012-08-03 21:32:27 +02:00
3610975bc1
Some fixes for keyboard shortcuts.
2012-08-03 21:32:27 +02:00
e3de746bb6
FF complained about missing charset.
2012-08-03 21:32:27 +02:00
578e074c00
White space.
2012-08-03 21:32:27 +02:00
98057dba5b
Revert "Removed text/plain header."
...
This reverts commit fa6d26b53c
2012-08-03 21:32:27 +02:00
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
b12ed88794
Calendar: remove double html encoding
2012-08-03 16:18:33 +02:00
599741bdd6
audit: update appinfo to OC4
2012-08-03 16:05:48 +02:00
e36e00dc00
Merge branch 'chunked_upload'
2012-08-03 15:58:17 +02:00
773d7b119d
OCS api calls cleanup
2012-08-03 13:52:41 +02:00
a0b2474019
code cleanup and TODOs added
2012-08-03 12:21:49 +02:00
bed05f0302
only force re-login if server-side encryption is enabled
2012-08-03 11:59:32 +02:00
d5808f07ca
return a list of all public keys for a given file
2012-08-03 11:49:55 +02:00
7dc799c167
[tx-robot] updated from transifex
2012-08-03 02:04:12 +02:00
7dda5527f1
Return properly formatted jsondata.
2012-08-02 19:03:45 +02:00
d07f4a5ea8
Correct namespace usage.
2012-08-02 19:03:06 +02:00
40d2bb70d7
Remove logging
2012-08-02 19:01:55 +02:00
8f3357c305
I was a bit too fast in removing methods yesterday...
2012-08-02 18:57:03 +02:00
a484ee817c
If first addressbook was empty it was seen as if there where no contacts at all.
2012-08-02 18:50:20 +02:00
19b3109655
code cleanup
2012-08-02 13:55:23 +02:00
5996ea735a
remove debug output
2012-08-02 10:59:06 +02:00
6b058cd359
allow user to choose encryption mode
2012-08-02 10:40:32 +02:00
a1239a37aa
Line length...
2012-08-02 05:02:36 +02:00
30c3a783d9
Remove onunload handler when delete is cancelled.
2012-08-02 05:01:54 +02:00
20f8971222
Use popup class style for ninja-mode help.
2012-08-02 04:18:44 +02:00
f84e92e6e3
More files to delete \o/
2012-08-02 04:18:44 +02:00
937058cdec
Updated JS namespace.
2012-08-02 04:18:44 +02:00
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
f159f607de
And then the missing files ;)
2012-08-02 00:02:07 +02:00
a8faae4f42
Addressbooks settings rewrite and cleanup.
2012-08-02 00:02:07 +02:00
c4d1ad1b7d
Made dependencies of Kaymanager::setFileKey() explicit using dependency injection
2012-08-01 14:11:41 +01:00
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
a7f3a67bc2
get settings from DB and check the right checkbox in the settings
2012-08-01 10:37:21 +02:00
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
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
82f5f73dff
Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption
...
Conflicts:
apps/files_encryption/lib/crypt.php
2012-07-31 19:38:28 +01:00
84fd62b130
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:35:36 +01:00
eebf76d344
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:28:11 +01:00
3aff7a298c
use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want)
2012-07-31 19:00:54 +02:00
727f4357fb
remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this
2012-07-31 18:54:24 +02:00
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
f6863f9e51
get encryption mode from the settings
2012-07-31 16:52:21 +02:00
e4e6574e42
allow admin to choose between client and server side encryption
2012-07-31 16:37:37 +02:00
9bab06537c
update file encryption key over webdav properties for client side encryption
2012-07-31 15:03:28 +02:00
5eed59bd54
Changed fix parameter to OC.appSettings().
2012-07-31 14:18:32 +02:00
90a1b5a758
Unregister from personal settings.
2012-07-31 12:23:22 +02:00
19c55e2d44
Implemented app settings in popup.
2012-07-31 12:23:22 +02:00
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
b465fc84ae
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:42:33 +02:00
b523366acd
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:30:11 +02:00
29dab0846e
Remove another accidently added 3rdparty app
2012-07-30 10:37:54 -04:00
530e7f03cd
Remove accidently added 3rd party apps
2012-07-30 10:34:12 -04:00
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
dab708b625
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-30 10:07:20 -04:00
519eb39422
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-30 10:07:19 -04:00
3e183b2eea
Set filter to empty if not set by Ampache client
...
Conflicts:
apps/media/lib_ampache.php
2012-07-30 10:07:19 -04:00
d07b8448d1
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-30 10:07:19 -04:00
7d17c59a51
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-30 10:07:19 -04:00
f378415377
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-30 10:07:19 -04:00
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
ee15c40b14
comment added
2012-07-30 12:43:17 +02:00
23391b3694
get/set key files, take shared files into account
2012-07-30 12:38:38 +02:00
01f25119d5
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-07-30 12:28:40 +02:00
f91783e9ab
Fix errors when no addressbook.
2012-07-30 12:28:10 +02:00
fa62ff62d2
Remove deprecated code.
2012-07-30 05:31:48 +02:00
d614c3b1d5
Code style.
2012-07-30 05:31:06 +02:00
118d9e17b6
Check if the are contacts marked as deleted and warn if so.
2012-07-30 04:57:14 +02:00
b25b73b5b4
Fixed potential error in logging.
2012-07-30 04:57:14 +02:00
fa6d26b53c
Removed text/plain header.
2012-07-30 04:57:14 +02:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
7ff04be091
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-28 11:06:36 -04:00
e02d8d7f7e
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-27 21:28:41 -04:00
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
dd4765ad16
Set filter to empty if not set by Ampache client
2012-07-27 18:10:40 -04:00
6a4c46e2c2
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-27 18:05:18 -04:00
df9f5b902a
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-27 15:34:51 -04:00
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
48f33be848
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-27 12:32:03 -04:00
bccd372565
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
2012-07-27 14:17:55 +02:00
f752a27605
write keyfiles to server
2012-07-27 14:00:41 +02:00
931c4695a6
run setup routine only for server side encryption
2012-07-27 13:58:58 +02:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
d8aca0c78e
apply fix suggested in oc-1132 - bugfix for oc-1132
2012-07-26 18:40:12 +02:00
6fbed6a588
LDAP: add Test Configuration functionality in the settings
2012-07-26 18:11:12 +02:00
bb229f7291
write private/public key from the client to the server
2012-07-26 17:19:55 +02:00
6c92a85d49
LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
2012-07-26 16:11:32 +02:00
e0121ea75e
LDAP: some cleanup
2012-07-26 16:11:32 +02:00
b893aa9567
code style
2012-07-26 16:11:32 +02:00
8cff0d997f
convert through caldav transmitted rgba calendarcolor to rgb
2012-07-26 14:48:00 +02:00
f7155b4276
convert through caldav transmitted rgba calendarcolor to rgb
2012-07-26 14:46:03 +02:00
e5c84488ff
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
...
Conflicts:
apps/files_encryption/lib/keymanager.php
2012-07-26 14:06:39 +02:00
bdb406916c
fixed path for filesystem view
2012-07-26 13:49:22 +02:00
3ab4ddd1da
function to ask for the encryption mode (server side or client side).
...
Needs to be implemented and integrated into the settings.
2012-07-26 13:47:43 +02:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
42c22bee36
[tx-robot] updated from transifex
2012-07-26 08:03:10 +02:00
efbd7ca166
Updated packages
2012-07-26 01:16:22 +02:00
95936024bc
Updated packages
2012-07-26 01:12:58 +02:00
add8f09355
No longer need hash() in shared storage, already implemented by the common file storage
2012-07-25 17:13:48 -04:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
37bccf54f2
[tx-robot] updated from transifex
2012-07-25 22:15:24 +02:00
9f51841c57
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
2012-07-25 18:28:56 +01:00
b94631de0c
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
2012-07-25 18:40:48 +02:00
3c9919e475
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
2012-07-25 18:21:16 +02:00
adf5c953dd
Fixed use of OCFSV in getPrivateKey()
2012-07-25 16:56:52 +01:00
e6de086fb6
Fixed various bugs in hooks class
...
Fixed documentation syntax in keymanager
2012-07-25 16:51:48 +01:00
d17eb2983f
OpenID: fix include path
2012-07-25 17:45:59 +02:00
66b461629b
Started implementation of new encyryption classes into the encryption proxy
2012-07-25 16:26:03 +01:00
9b0870bb91
add some calendar sharing hooks in stable4 - bugfix for oc-1325
2012-07-25 17:02:24 +02:00
6d1ed388c0
keymanager class for basic operations to store and retrieve keys
2012-07-25 17:01:11 +02:00
d766ca8b19
Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files
2012-07-25 15:33:25 +01:00
71b862e571
LDAP: replace deprecated constant
2012-07-25 15:11:58 +02:00
4a2295b75b
code style
2012-07-25 15:10:56 +02:00
9368ea73c8
added tests and methods relating to handling of legacy keys
2012-07-25 12:38:40 +01:00
6285cc2604
LDAP: remove debug output
2012-07-25 13:19:07 +02:00
ab1d9507a9
code style
2012-07-25 13:18:31 +02:00
edfd789a87
LDAP: remove obsolete require_once
2012-07-25 13:16:31 +02:00
8664729843
code style
2012-07-25 13:14:32 +02:00
15f7d838fa
code style
2012-07-25 13:13:01 +02:00
569e52b87c
remove unnecessary debug output
2012-07-25 13:11:42 +02:00
c8404a7bfa
code style
2012-07-25 13:10:59 +02:00
92f447ca50
code style
2012-07-25 13:09:51 +02:00
a6c5309e16
LDAP: adjust test after refactoring
2012-07-25 12:56:09 +02:00
b10f7aafb7
LDAP: silence warning, but handle the error
2012-07-25 12:56:09 +02:00
25ad1d5c3e
LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly.
2012-07-25 12:56:09 +02:00
d0aebf05bf
LDAP: group backend now implements the interface, does not inherit backend class
2012-07-25 12:56:08 +02:00
42492338fc
LDAP: put app under the OCA\user_ldap\ namespace
2012-07-25 12:56:08 +02:00
5888cb48b6
Support for OCA namespace
2012-07-25 12:56:08 +02:00
afdc5bf264
LDAP: switch user backend from extending class OC_User_Backend to implementing OC_User_Interface for improved flexibility
2012-07-25 12:56:08 +02:00
0bdebe0e4a
LDAP: pass user backend as instance, not classname
2012-07-25 12:56:08 +02:00
6f58eca534
Change read only check to isCreatable
2012-07-24 21:35:03 -04:00
fc72d4b10f
Add root directory checks for CRUDS permissions in shared storage
2012-07-24 21:16:47 -04:00
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
c60c6024a7
Remove toTmpFile() from shared storage, no longer needed
2012-07-24 14:50:43 -04:00
eac297e8c4
Improve file source caching for shared folders
2012-07-24 14:41:19 -04:00
e8675586af
Fix permission check for rmdir(), implement unlink(), rename(), and copy()
2012-07-24 14:22:07 -04:00
9216289856
Wrote new methods for testing if a file is encrypted using AES or Blowfish
...
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
e6678bd454
Permission check should be made on parent folder when creating a new folder
2012-07-23 22:39:29 -04:00
b58e72cdb2
Alert user of errors when creating new files or folders
2012-07-23 22:35:34 -04:00
7b01e3285e
Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage
2012-07-23 22:05:53 -04:00
7967685771
move some openid files to 3rdparty
2012-07-24 00:02:01 +02:00
73734c98e0
- remove namespace from file property name (webdav)
...
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
bd63fddbf4
fix broken properties in the database
2012-07-23 10:34:01 +02:00
708c771296
update routine to fix broken file properties in db
2012-07-23 10:25:26 +02:00
25e1c13ef7
Remove unused ajax file.
2012-07-23 01:17:38 +02:00
67b6ff22bc
Cache DOM lookups, general cleanup.
2012-07-23 01:17:38 +02:00
b60e5942a5
Cleaner event handling.
2012-07-23 01:17:38 +02:00
fb9ef90c45
No need to set checksum on PHOTO.
2012-07-23 01:17:38 +02:00
0439a18324
Cleaner variable handling.
2012-07-23 01:17:38 +02:00
b00de0258b
Make sure notifier cleans up.
2012-07-23 01:17:38 +02:00
644b6e60d5
Revert "No need to set checksum for PHOTO."
...
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
2012-07-23 01:17:38 +02:00
dc05fd7b92
No need to set checksum for PHOTO.
2012-07-23 01:17:38 +02:00
294e65fa38
Use insertContact
2012-07-23 01:17:38 +02:00
641bd7a456
Whitespace
2012-07-23 01:17:38 +02:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
a49c07cf88
progressbar for New->From Url
2012-07-22 03:56:51 +02:00
59ab8b14c7
cache fileid's in oc_cache
2012-07-22 03:24:34 +02:00
ab8ce89df3
Added help for keyboard shortcuts.
2012-07-22 00:15:28 +02:00
38d38c1797
First stab at Ninja mode ;-)
2012-07-21 22:00:27 +02:00
359dc8736a
Improved scrollTo method. Still not quite there...
2012-07-21 22:00:27 +02:00
eb57544518
Added next/previous methods to contacts list.
2012-07-21 22:00:27 +02:00
7d520bc7a9
Remove wrong comment.
2012-07-21 22:00:27 +02:00
81b917b2f6
increase width of user migrates form in personal settings, so you can read the whole label in all languages
2012-07-21 19:50:45 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
57207ddb82
some style fixes for calendar
2012-07-21 17:09:10 +02:00
e07cd26571
Implemented undelete for contacts.
2012-07-21 16:02:12 +02:00
51bafd32d6
Made contactlist optional in insertContact().
2012-07-21 14:26:57 +02:00
00de757169
White space.
2012-07-21 14:26:26 +02:00
11aa571751
Added option to notify method.
2012-07-21 14:24:26 +02:00
687c87bc5b
DRYed inserting into contacts list.
2012-07-21 13:13:41 +02:00
ad12e13f14
Tasks: Remove unused code
2012-07-21 00:52:49 +02:00
060b8865a4
DRY for getting calendar timezone setting
2012-07-21 00:45:30 +02:00
1c30a97833
Style fixes
2012-07-21 00:45:30 +02:00
06b5e05c86
Damn, that Jenkins dude is tough ;)
2012-07-21 00:43:01 +02:00
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
48ec78299e
cleanup some obsolete foldersize code from the shared storage backend
2012-07-21 00:20:27 +02:00
42fbc111a2
Hide progressbar on error.
2012-07-20 22:25:09 +02:00
3103a4cb3f
Corrected retry count for uploaded imports.
2012-07-20 21:54:24 +02:00
38271ded75
Added CSRF checks
2012-07-20 20:12:36 +02:00
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
ecf8e77dab
Remove unused file.
2012-07-20 17:11:13 +02:00
7fff386679
Code style.
2012-07-20 17:11:13 +02:00
3c2967074f
remove unused variable from dropbox filestorage backend
2012-07-20 16:48:28 +02:00
1224d7ec01
minor fixes for the google filestorage backend
2012-07-20 16:47:26 +02:00
23c71b15a0
remove unused variables from webdav file backend
2012-07-20 16:35:51 +02:00
c04aa8d6a9
Add CSRF checks
2012-07-20 15:45:17 +02:00
b3d7043f9c
Change uri fields from 100 to 200 chars.
2012-07-20 15:15:18 +02:00
8c06452434
fixing syntax error
2012-07-20 09:14:32 +02:00
5fe0027568
fixing syntax error
2012-07-20 08:20:45 +02:00
b8eea32478
Coding style.
2012-07-20 00:18:23 +02:00
1cbddcf211
Code style
2012-07-20 00:18:23 +02:00
616f2f336e
Trigger loading of more contacts a bit earlier.
2012-07-20 00:18:23 +02:00
5c0c9bbdc1
Cleaning up a bit.
2012-07-20 00:18:23 +02:00
fc46322d4c
Tweak dragging.
2012-07-20 00:18:23 +02:00
87da179e6c
Eye candy for the draggables.
2012-07-20 00:18:23 +02:00
ad14d67c8d
ftp user backend
2012-07-19 23:03:02 +02:00
b357a968c0
smb user backend
2012-07-19 22:42:26 +02:00
57fb37151a
imap user backend
2012-07-19 22:42:18 +02:00
d294e77721
Development snapshot:
...
- Added methods for sealing data with multiple keys
- Added method for encrypting data, generating iv and keyfile, and returning both
- Added 6 unit test cases (containing 12 tests) for Crypt class
- Commented out old unit tests for now
2012-07-18 18:52:00 +01:00
283561823f
Added methods for handling encrypted file + iv content
...
Improved IV generation
2012-07-17 19:15:59 +01:00
0bd7d14b7a
Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships
2012-07-17 14:09:01 +02:00
ec4891b7d3
Fixed require path.
2012-07-17 12:07:14 +02:00
2c9aa029a7
Added missing CSRF checks.
2012-07-17 12:04:34 +02:00
748fcabba4
Added CSRF checks to files_versions. Expect some error messages - and report them ;)
2012-07-17 11:57:38 +02:00
8444fc5787
Added CSRF checks to Tasks. Expect some error messages - and report them ;)
2012-07-17 11:52:11 +02:00
06ff6c6d7d
Added CSRF checks to Calendar. Expect some error messages - and report them ;)
2012-07-17 11:46:01 +02:00
9326f4f535
Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265.
2012-07-17 10:45:15 +02:00
f4a8c233cf
Added hook for postCreateUser. Probably fix for oc-1265.
...
Conflicts:
apps/calendar/appinfo/app.php
2012-07-17 10:35:46 +02:00
1f4d6896df
Wrong version comparison in update.php.
2012-07-17 03:59:41 +02:00
258df5eea2
Added hook for postCreateUser. Probably fix for oc-1265.
2012-07-17 03:04:04 +02:00
4b8a34df21
Wrong argument count in postCreateUser hook for contacts.
2012-07-17 01:37:28 +02:00
4de66880ed
If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264.
2012-07-17 01:35:35 +02:00
f128b96ac0
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
2012-07-16 23:44:18 +02:00
eb2a15d58f
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
2012-07-16 23:36:11 +02:00
47d50fc424
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-07-16 21:22:07 +02:00
d64300251b
Corrected javascript definition.
2012-07-16 21:21:37 +02:00
47566b0c42
stop using of OC_L10N::tA
2012-07-16 20:26:14 +02:00
19f2ce6997
improve webfinger for situations where owncloud is not installed in the server root
2012-07-16 19:58:05 +02:00
7ab35af6dd
use the remote.php infrastructure for remoteStorage
2012-07-16 19:58:05 +02:00
d4e2cb6e62
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-16 19:53:19 +02:00
296f79d1a4
latin1 => utf8
2012-07-16 01:46:16 +02:00
7a7ac58094
Remove obsolete code.
2012-07-16 01:46:16 +02:00
2035bc7905
Fix sorting - again :-P
2012-07-16 01:46:16 +02:00
0fb1a76113
Bold active address book.
2012-07-16 01:46:16 +02:00
25f50e8273
Set the address book of the active contact active.
2012-07-16 01:46:16 +02:00
8fba6b9bc7
UI part of addressbook merging.
2012-07-16 01:46:16 +02:00
502f420678
Wrap image uploading in anonymous function.
2012-07-16 01:46:16 +02:00
001a47afb0
Remove obsolete FIXMEs.
2012-07-16 01:46:16 +02:00
225726c8d9
latin1 => utf8. I thought I did this a month ago?
2012-07-16 01:41:45 +02:00
dd95149238
Also unlink unsuccessful imports.
2012-07-15 17:34:30 +02:00
d49b789348
Merge branch 'master' into calendar_import
2012-07-15 16:56:38 +02:00
160e701fbf
Make list droppable too instead of just the header.
2012-07-15 12:28:29 +02:00
db034f05ca
Improve temp file handling.
2012-07-15 12:28:29 +02:00
8b49e304e0
Hide file form field behind image so it will maybe work with IE...
2012-07-15 12:28:29 +02:00
48521fcfaa
Made notifications more flexible.
2012-07-15 12:28:29 +02:00
d71da67bee
Typo.
2012-07-15 12:28:29 +02:00
7af608881b
Added notification.
2012-07-15 12:28:29 +02:00
4e684b9e9d
Fixed sorting of addressbooks.
2012-07-15 12:28:29 +02:00
287285880c
Removed obsolete TODO.
2012-07-15 12:28:28 +02:00
eba4f08015
Refactored contacts import.
2012-07-15 04:17:30 +02:00
87912a8c65
Fix loading previous or next contact after deleting one.
2012-07-15 04:17:30 +02:00
140263003a
Give default address book a more intuitive name and replace spaces with underscores in uri.
2012-07-14 14:11:43 +02:00
d45d73eecf
Try to avoid occasional error messages.
2012-07-14 14:11:43 +02:00
7d1f644011
use new way to register remote/public.php entries in user_webfinger
2012-07-13 23:24:22 +02:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
50eef9a71c
update script to fix fscache
2012-07-13 15:17:36 +02:00
f496a9dea6
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:29:59 -04:00
ac395dced1
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:28:29 -04:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
7b2ec41477
Revert santizing toaddress, because PHPMailer now throws exceptions
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
ebcf5bce3c
Sanitize toaddress for emailing private links
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
91a15bae76
Revert santizing toaddress, because PHPMailer now throws exceptions
2012-07-11 16:02:43 -04:00
7077678f7f
Sanitize toaddress for emailing private links
2012-07-11 15:26:22 -04:00
d203fa2c50
Sanitizing file names
2012-07-11 19:15:11 +02:00
c3fea30811
Sanitizing file names
2012-07-11 19:14:04 +02:00
6af99f3a09
Development snapshot:
...
Rewrote crtpt class as Util, Hooks, and Crypt
Switched blowfish for openssl with AES
Added setup() method for creating user keys and directory structure
Many other changes complete and in progress
2012-07-11 17:51:27 +01:00
e896c0a9e3
Fix addressbook sharing, formatItems() changed in past commits
2012-07-11 11:33:48 -04:00
07efd39d8a
prevent script execution during slideshow
2012-07-11 15:44:39 +02:00
e248412ca9
use getStorage() to get versions location
...
update routine implemented
version number of files_versions increased
Conflicts:
apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
ca8028bd73
small fixes in merge request 104, use OCP\Files::getStorage
2012-07-11 02:33:11 +02:00
0b14b4e3e8
Call exit() to prevent further code execution if directory does not exist
2012-07-11 02:33:11 +02:00
ef1924dbbb
gallery :: display big picture according to exif
...
- fixes oc-314
- caching of the 'big' images in subfolder view
next to the tumbnails
- now choosen to use max 1200px for viewing
this helps speeding up the viewing process
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-07-11 02:33:10 +02:00
3134a962d9
Call exit() to prevent further code execution if directory does not exist
2012-07-10 18:59:42 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
bf09bcc854
add OCP\Files to access files
2012-07-10 19:22:06 +02:00
9be6432aac
shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height
2012-07-10 16:58:37 +02:00
acb9612332
fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT
2012-07-10 16:58:37 +02:00
02c9b03b8e
Missing dir added.
2012-07-10 16:58:37 +02:00
3e53bf4a86
Fix for oc-972, oc-1144 and oc-1191
2012-07-10 16:58:37 +02:00
91da4b05b7
fixed typos
2012-07-10 15:51:57 +01:00
7f57591ef1
suppress error when using is_dir on non directory in smb backend
2012-07-10 14:20:30 +02:00
aeed130b3a
improve caching smb results a bit
2012-07-10 14:20:19 +02:00
8a902d8f65
improve filecache support for smb
2012-07-10 14:20:11 +02:00
a1fefea66f
split share and root config for smb backend, also sanitize config a bit more
2012-07-10 14:19:51 +02:00
8fcce55e76
share code between smb and ftp filestorage backends
2012-07-10 14:19:40 +02:00
539e4a1813
smb filestorage backend
2012-07-10 14:19:31 +02:00
9d2cbc88f0
Revert reversion of f5c329af98 :-P
2012-07-10 01:24:40 +02:00
34ac2ea1ba
Don't escape assigned values.
2012-07-10 01:24:40 +02:00
861c379255
Make sure the proper DOM is loaded and the right address book gets expanded.
2012-07-10 01:24:40 +02:00
0744e5a172
Look for the right field :-P
2012-07-10 01:24:40 +02:00
7cb74a0bf3
Reduce variables assigned.
2012-07-10 01:24:40 +02:00
50462903d6
Revert "Delay fetching of carddata and set ETag and size instead."
...
This reverts commit f5c329af98
2012-07-10 01:24:40 +02:00
b97eb3a48f
fixing oc-1198
2012-07-09 23:50:26 +02:00
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
b67199bb45
add css id attribute, minor fixes
2012-07-09 16:04:46 +02:00
6f408c3651
add supersized slideshow
2012-07-09 15:13:23 +02:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
f5c329af98
Delay fetching of carddata and set ETag and size instead.
2012-07-09 01:48:42 +02:00
47aaca49a1
Rescan categories in small batches to reduce memory usage.
2012-07-09 00:16:14 +02:00
d1cf787197
Move code to OC_Contacts_App::scanCategories().
2012-07-09 00:15:37 +02:00
6d123e90f3
Remove deleted address book from list.
2012-07-08 23:38:03 +02:00
0b6cd8d203
Simplify VCF generation.
2012-07-08 23:36:52 +02:00
197086a952
Make it possible to import files using CR as eol.
2012-07-08 18:34:00 +02:00
dc8193fccb
Make it possible to import files using CR as eol.
2012-07-08 18:28:55 +02:00
334257d2b6
Implemented VCFExportPlugin.
2012-07-08 17:52:57 +02:00
3424785db0
Implemented Sabre iCalendar Export Plugin.
2012-07-08 16:58:17 +02:00
747b7fbbfe
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:17:10 +02:00
f5c620006e
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:15:52 +02:00
97106f198f
Set the loading class on the property being changed, not on its container.
2012-07-08 16:11:45 +02:00
d730d3edd4
Set the loading class on the property being changed, not on its container.
2012-07-08 16:10:12 +02:00
25b95a9ec7
Improve checking for active addressbooks and creating default addressbook.
2012-07-08 15:41:38 +02:00
554cb2d3ab
Add missing requesttoken.
2012-07-08 14:48:49 +02:00
47f96e2d5e
Missing semi-colon.
2012-07-08 14:42:33 +02:00
746eef0d5c
Format error response correctly.
2012-07-08 14:31:40 +02:00
e6a60198e4
Return error messages in correct format.
2012-07-08 14:11:48 +02:00
2b22f0db0a
Add missing requesttoken.
2012-07-08 13:28:12 +02:00
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
2c318f45f4
CSRF checks
2012-07-07 16:08:27 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
b7c510a61a
CSRF checks
2012-07-07 16:02:33 +02:00
0abcf0a421
CSRF checks
2012-07-07 15:58:11 +02:00
c63db28eaf
CSRF check
2012-07-07 15:54:52 +02:00
b967530795
increase the time limit again to a sensible granularity of 1 min.
...
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
75d01b065d
Make export batch size configurable.
2012-07-06 13:49:04 +02:00
cafbd02337
Fix endless loop when no addressbooks.
2012-07-06 13:24:56 +02:00
a1872412bf
Correct hack ;)
2012-07-06 12:59:07 +02:00
ab1b4f1f03
Fugly fixed include.
2012-07-06 12:59:07 +02:00
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
f875240b47
comment out some code
2012-07-06 11:23:20 +02:00
9a10efd80f
Merge branch 'master' into calendar_import
2012-07-06 11:01:12 +02:00
a5a1d929ca
No need for being protected.
2012-07-06 03:22:42 +02:00
59b38e668d
Missing requesttoken
2012-07-06 03:22:42 +02:00
5e0b80dc8d
Contacts: Fix copy&paste error
2012-07-05 17:12:52 +02:00
51774cca6b
use OC_Filesystem for rollback
2012-07-05 14:20:40 +02:00
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
55cde0e5aa
moved remove and rename hook to libs/hooks.php
2012-07-05 11:35:08 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
aa95cf2c98
Merge branch 'master' into calendar_import
2012-07-05 11:30:37 +02:00
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
9d00f4d2fb
Correct db default value.
2012-07-05 00:40:11 +02:00
dac2c14ae9
Add missing CSRF check.
2012-07-05 00:37:08 +02:00
b11b6afbb9
Hopefully fix for drag'n'drop import in oc-813.
2012-07-05 00:25:38 +02:00
5d79444852
Missing update script.
2012-07-04 22:58:31 +02:00
706a13544b
Remove ugly activation hack.
2012-07-04 22:13:36 +02:00
7ec2d6ce85
Merge branch 'master' into calendar_import
2012-07-04 21:15:32 +02:00
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
b2eac08ad3
Query contacts in batches of 20. Possible fix for oc-1126.
2012-07-04 16:54:00 +02:00
5fb9b3e965
Disable expires header on thumbnail and photo.
2012-07-04 15:32:41 +02:00
6d3afb3857
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:57:07 +02:00
f72a11f852
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:49:39 +02:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
393eefa5d2
replace some direct links with OC.imagePath
2012-07-03 23:44:47 +02:00
f98bd1ad66
Merge branch 'master' into calendar_import
2012-07-03 22:35:46 +02:00
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
b1c9785eb3
Merge branch 'master' of gitorious.org:owncloud/owncloud
...
Conflicts:
apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
a775deaf22
Moved hooks and versions.php into new lib directory
...
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
1e36e1f2cb
Use formatted shared addressbook in all cases, addressbooks out of order now
2012-07-03 11:36:57 -04:00
4185bd6292
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
2012-07-03 11:11:01 -04:00
b6cff93254
fix spelling fail in code
2012-07-03 16:47:46 +02:00
0b3ed2b048
Merge branch 'master' into calendar_import
2012-07-03 16:39:09 +02:00
ca2b1f7863
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-03 13:55:48 +02:00
cfcfdd674e
Merge branch 'master' into calendar_import
2012-07-03 13:43:52 +02:00
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
77b582e4e6
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
2012-07-02 15:29:34 -04:00
88cbbc86b8
Text editor: Always use UTF-8 to keep Ace happy.
2012-07-02 19:06:40 +00:00
0a6f7b33c3
LDAP: make it UTF-8 save
2012-07-02 20:31:19 +02:00
ab036d4764
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
2012-07-02 17:52:51 +02:00
515adceace
LDAP: reset resource on failed bind
...
check for resource
2012-07-02 14:03:29 +02:00
e89a0949c4
remove some whitespace
2012-07-01 23:32:21 +02:00
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
bf93dd4661
Don't reload the page after sending private link to email address
2012-07-01 11:53:29 -04:00
0b9b1757fe
Add share action to addressbooks!
2012-06-30 21:06:49 -04:00
47f46890c8
Fix generateTarget() for contacts backend
2012-06-30 21:03:36 -04:00
6a060ecd23
use light grey instead of white
2012-07-01 01:02:54 +02:00
c7a4075aaa
Updates contacts migration provider
2012-06-30 22:56:47 +00:00
be11f71d27
fix doc for OC_Calendar_Calendar::generateTextColor()
2012-07-01 00:31:05 +02:00
601237a0c3
add algorithm to generate the calendar's text color
2012-07-01 00:09:33 +02:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
ce331bd1d3
improvements for dropoimport
2012-06-30 23:18:41 +02:00
a705b19cd5
little fix for import
2012-06-30 22:45:12 +02:00
f15941a967
improve dropimport
2012-06-30 22:26:29 +02:00
4890bbb30d
Merge branch 'master' into calendar_import
2012-06-30 22:08:36 +02:00
376431fa0d
import works now for dropimport
2012-06-30 22:08:30 +02:00
fa5b31ac9c
fix documentation style
2012-06-30 17:09:20 +02:00
8e0addebc3
fix some doc
2012-06-30 15:39:20 +02:00
34b2486d53
some improvements for calendar export
2012-06-30 15:23:21 +02:00
390f5cc89f
some work on (drop)import)
2012-06-30 15:17:29 +02:00
51173163ce
Contacts: align the bottom control buttons
2012-06-30 11:22:09 +00:00
704a1c655e
Contacts: fix add contact icon path
2012-06-30 11:07:54 +00:00
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
6e6f90a8a2
fix merge conflicts
2012-06-30 12:44:51 +02:00
34d4eb8edd
some more work on calendar import class
2012-06-30 12:42:36 +02:00
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
252453cd34
fix encryption test cases when not logged in
2012-06-30 01:05:18 +02:00
a4614f83ff
Don't add duplicate contacts in the list when en-/disable an address book.
2012-06-29 23:18:47 +02:00
246894243a
Merge branch 'master' into calendar_import
2012-06-29 21:46:09 +02:00
719c7f7f6e
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
2012-06-29 13:01:00 -04:00
3ed7738d5e
Increment user_openid version to load new app type
2012-06-29 18:38:04 +02:00
f61793aa14
Coding style fixes
2012-06-29 18:38:04 +02:00
2b4ecbaba0
Whitespace fixes
2012-06-29 18:38:04 +02:00
652a874fa6
fix displaying of events
2012-06-29 18:13:52 +02:00
3bcf176a53
add some hooks to fix calendar sharing
2012-06-29 17:27:29 +02:00
7e9455c382
Allow multiple Google Drive and Dropbox external storages to be configured
2012-06-29 11:22:54 -04:00
2d49a491fb
Clear the mount point value for the new mount point row
2012-06-29 11:10:51 -04:00
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
bda0026374
fix birthday calendar
2012-06-29 15:43:18 +02:00
b95996c02c
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
...
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
08e707d258
some work on OC_Calendar_Import
2012-06-29 14:32:07 +02:00
60ec46f706
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
...
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
75af5778a4
pass progresskey the correct way during calender import
2012-06-29 00:49:37 +02:00
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
02e4e0e08f
Gallery: Get all the image information for a directory at once
2012-06-28 22:11:04 +02:00
91d92aed02
fix for previous commit
2012-06-28 19:13:43 +02:00
4b3af1f73b
use OC_Calendar_Export for publicly shared calendars
2012-06-28 19:12:50 +02:00
930bbeabd4
Calendar Export: replace spaces with dashes in the name of the calendar / event
2012-06-28 19:04:14 +02:00
9dd7ca2667
some changes and more doc for OC_Calendar_Export class
2012-06-28 18:54:13 +02:00
9a4709e68d
fix calendar export for Apple iCal - i hate bloody line ends
2012-06-28 16:41:00 +02:00
c4f5639cb4
Merge branch 'master' into calendar_export
2012-06-28 15:24:30 +02:00
bdd1baeb85
use public API
2012-06-28 14:18:57 +02:00
e5792cc064
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
2012-06-28 14:06:20 +02:00
f22f49671b
move hook to erase versions from deleted files to the right place
2012-06-28 12:42:47 +02:00
52f99a7570
delete file versions if the user deletes a file
2012-06-28 11:48:57 +02:00
dac539b619
handover the correct timestamp
2012-06-28 11:46:17 +02:00
3cea1b062e
Merge branch 'master' into calendar_export
2012-06-28 09:27:54 +02:00
e04a605b9b
No need for this anymore.
2012-06-28 01:51:42 +02:00
a48aba316e
Smoother profile picture loading - hopefully.
2012-06-28 01:46:33 +02:00
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
426193cf6c
Migration: Fix contacts and bookmarks
2012-06-27 21:18:31 +00:00
77b7f214d2
Load contactlist progressivly.
2012-06-27 22:44:28 +02:00
e029e8cb14
Merge branch 'master' into calendar_export
2012-06-27 22:27:55 +02:00
8712754f8c
fix style of some doc
2012-06-27 22:27:48 +02:00
1f738d8c9f
Merge branch 'master' into calendar_export
2012-06-27 22:24:12 +02:00
9b605969f1
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
2012-06-27 15:23:49 -04:00
77c66e8cc4
move some documentation to the right place
2012-06-27 21:05:46 +02:00
25a50f00bd
add merge calendar function and add some documentation to OC_Calendar_Calendar
2012-06-27 20:56:58 +02:00
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
895d5707ee
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:09:11 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
c0e86489c9
no reason to strip tags at this point
2012-06-27 17:56:00 +02:00
c67ae2e7f1
no reason to strip tags at this point
2012-06-27 15:56:14 +02:00
235515e84b
Something like this should do it for sharing contacts
2012-06-27 15:44:42 +02:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
90b5cf680f
Merge branch 'master' into calendar_export
2012-06-27 14:05:11 +02:00
060a297260
enable highlighting of address in OSM.
2012-06-27 11:46:42 +02:00
7af76e36e1
enable highlighting of address in OSM.
2012-06-27 11:41:52 +02:00
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
3edc40a68a
Load default categories if there are none,
2012-06-27 02:12:53 +02:00
823bef3a09
Ensure event handlers are being set when adding first contact.
2012-06-27 02:12:53 +02:00
afd9705283
Add check for return value.
2012-06-27 02:12:53 +02:00
b9e1033563
Basic framework for contacts sharing
2012-06-27 01:05:36 +02:00
32f9901bcd
Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
2012-06-27 01:05:36 +02:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
f55f13eebc
Don't call getLocalFile() until you know it actually is music
2012-06-26 14:51:31 -04:00
cad282b73f
Added some error checking.
2012-06-26 18:15:24 +02:00
1b2d09f9ca
Added missing requesttoken.
2012-06-26 18:15:24 +02:00
d8b181cd84
Added error checking on all db queries.
2012-06-26 18:15:24 +02:00
db115429f7
Added createUser hook.
2012-06-26 18:15:24 +02:00
de4a540ce6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 16:30:34 +02:00
46e93168cd
Fix variable name.
2012-06-26 16:06:52 +02:00
7dc72a48cc
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 15:48:21 +02:00
ae00f40b97
add OC_Calendar_Object::createUID()
2012-06-26 15:21:41 +02:00
b9ce4e1f40
add OC_Calendar_Object::createUID()
2012-06-26 15:20:29 +02:00
9cb01bd093
xss fix
2012-06-26 14:27:50 +02:00
c7de74c471
Merge branch 'master' into calendar_export
2012-06-26 14:15:07 +02:00
bf756293c6
Added signals.
2012-06-26 05:26:50 +02:00
8df59852a4
Adjust pic width a bit.
2012-06-26 04:09:45 +02:00
b384d79bf8
Remove x-scrollbar from contacts list.
2012-06-25 23:32:03 +02:00
103ae6faa4
Media: Change includes in app.php to use the autoloader
2012-06-25 21:05:10 +02:00
a72eddeef7
LDAP: compare base trees case insensitively
2012-06-25 20:54:21 +02:00
fb53708d10
LDAP: compare base trees case insensitively
2012-06-25 20:53:45 +02:00
2250fb1159
Emit Completed.
2012-06-25 20:30:21 +02:00
2ad93849ab
Idiot proof dialog ;-)
2012-06-25 19:33:51 +02:00
dc4b891327
Better visual feedback and prevent drop on self.
2012-06-25 18:24:15 +02:00
b8d6ad0431
Improve styling on draggables.
2012-06-25 18:24:15 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
9bb409d881
fix syntax error after merge
2012-06-25 17:34:28 +02:00
ef93bf223a
Try to conserve some memory. Should fix oc-1106 for master.
2012-06-25 17:26:44 +02:00
ad5aa5ac15
Try to conserve some memory. Should fix oc-1106 for stable4.
2012-06-25 17:16:34 +02:00
42a5cd21b9
Missing requesttoken.
2012-06-25 17:15:33 +02:00
ddf321d534
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-25 16:22:19 +02:00
56ed8ba70b
Select which address book to add a contact to. Fixes oc-1071.
2012-06-25 16:21:29 +02:00
594e19bddc
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:49 +02:00
3f6a7859c9
LDAP: cheaper userExists() implementation, fixes oc-1012
2012-06-25 13:22:00 +02:00
d64a7716f1
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:00 +02:00
a09a01a49f
sanitizeHTML() has to be called later to keep the path unchanged
2012-06-25 12:44:54 +02:00
85ac75b4f4
xss vulnerability fixed
2012-06-25 12:38:11 +02:00
9ee528bc74
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:15:20 +02:00
0083dbb3ce
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:11:06 +02:00
052bd8efbb
Drag'n'Drop contacts between addressbook. Still needs some css magic.
2012-06-25 03:42:27 +02:00
51d33768b8
Prevent errors and mini enhancement of saved window in bookmarks
2012-06-24 21:30:14 +00:00
0fb9d0bf29
Correct bookmark app : add through interface and remove missing css
2012-06-24 21:24:43 +00:00
e845e56749
Remove excessive debugging.
2012-06-24 22:25:32 +02:00
3afbc3d2dc
Add some DRYness to logging.
2012-06-24 22:25:32 +02:00
f10c51193b
Fixed function name.
2012-06-24 22:25:32 +02:00
df1eca4fa2
Also load categories from VJOURNAL.
2012-06-24 22:25:32 +02:00
61adae1e49
Use intervals for sessions deletion with postgres fix oc-492
2012-06-24 19:41:23 +00:00
f56b3df0bc
Resolve scanning issue case comparison of songs
2012-06-24 16:03:25 +00:00
c53a8fa541
Correct seq name in media songs fix oc-589
2012-06-24 16:02:41 +00:00
6da926f1c3
Resolve scanning issue case comparison of songs
2012-06-24 15:58:51 +00:00
5b908209de
Correct seq name in media songs fix oc-589
2012-06-24 15:12:05 +00:00
0f9b9fa111
Remove unneeded parameter.
2012-06-24 16:07:18 +02:00
5393c0cfed
Click to select which address book to add to.
2012-06-24 16:03:10 +02:00
9e6d2f2f82
Improve prev/next selection on delete.
2012-06-24 15:07:44 +02:00
a12557ca4d
another fix for oc-1044
2012-06-24 09:42:14 +02:00
ca5de26bac
another fix for oc-1044
2012-06-24 09:41:37 +02:00
17e289aef2
Merge branch 'master' into calendar_export
2012-06-23 19:54:12 +02:00
1c0e72cd5a
Text editor: Waste less space for line numbers
2012-06-23 14:43:52 +00:00
6e5573acb5
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-23 14:42:54 +00:00
5323983fc7
Text editor: Waste less space for line numbers
2012-06-23 14:42:37 +00:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
ded9ea5ad3
Spelling fixes
2012-06-22 22:57:35 +02:00
ea3a6d9fcf
Merge resource error-suppressing fix
2012-06-22 22:54:25 +02:00
2e6e154475
Gallery: Fix opening folders with a ' in the name
2012-06-22 22:46:12 +02:00
0939b1b0ab
Merge branch 'master' into calendar_export
2012-06-22 21:36:51 +02:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
b591c83008
Text Editor: fix editor positioning
2012-06-22 16:20:09 +00:00
41cfd55f55
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-22 16:17:23 +00:00
96ec7a66bb
More session_write_close
2012-06-22 17:21:56 +02:00
0aafc717ec
Text Editor: fix editor positioning
2012-06-22 15:02:03 +00:00
aade44471d
pdf viewer no longer 'eats' keyboard input
2012-06-22 16:10:25 +02:00
1f06cdf81f
Small js fix.
2012-06-22 14:27:46 +02:00
07124ee38d
Cast translation to string.
2012-06-22 14:27:46 +02:00
e1fa9c282b
xss vulnerabilities fixed
2012-06-22 14:11:57 +02:00
b6c862b32f
use sanitizeHTML() function
...
Conflicts:
apps/gallery/lib/tiles.php
2012-06-22 14:03:05 +02:00
5b46734a40
xss vulnerability fixed
2012-06-22 13:58:15 +02:00
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
e5171da300
remove unnecessary closing PHP tag
2012-06-22 12:50:49 +02:00
19931e2008
remove unnecessary closing PHP tag
2012-06-22 12:49:56 +02:00
0d9534eb4b
LDAP: cheaper userExists() implementation
2012-06-22 12:43:09 +02:00
bef9b671ee
LDAP: cheaper userExists() implementation
2012-06-22 12:42:07 +02:00
65c14e21ce
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:32:57 +02:00
8c28aec664
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:30:40 +02:00
82f39d3292
Contacts: Fix name and carddav-url encoding
2012-06-21 23:30:04 +02:00
fd23c286ef
Calendar: Fix caldav url encoding
2012-06-21 23:30:04 +02:00
4a22f4ca78
Calendar: convert choosecalendar.rowfields template from plain php to html+php
2012-06-21 23:30:04 +02:00
1d07b9e291
Calendar: Missing userid in allCalendars call
2012-06-21 23:30:04 +02:00
c047fdafdb
Calendar: Fix missing template parameter 'shared' for new and update calendar
2012-06-21 23:30:04 +02:00
95b5202893
Correct usage of approot
2012-06-21 21:13:12 +00:00
d72b85684f
Only search for VEVENTs.
2012-06-21 20:53:50 +02:00
9045557258
Tasks: Add delete action
2012-06-21 20:18:12 +02:00
d75b5cfdd2
Tasks: Use list label for ordering by list
2012-06-21 20:18:08 +02:00
dda56c5e3d
Tasks: Fix position of the summary input
2012-06-21 20:17:49 +02:00
46ad51cbe2
dont change the encryption key during the test case
2012-06-21 18:53:52 +02:00
bd8b921de4
only use 1 fsview when initializing encryption
2012-06-21 18:36:16 +02:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
37d12144c2
Fix URL delimiter.
2012-06-21 22:03:57 +02:00
ad7154b344
Fix being able to link directly to contact, that I broke in other commit.
2012-06-21 22:02:17 +02:00
b17bf59ced
Only search for VEVENTs.
2012-06-21 20:51:23 +02:00
b17e682609
Tasks: Add delete action
2012-06-21 19:49:28 +02:00
10351550cd
Tasks: Use list label for ordering by list
2012-06-21 19:49:28 +02:00
b9e3b0ddf9
Tasks: Fix position of the summary input
2012-06-21 19:49:28 +02:00
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
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
49033ff8e0
dont change the encryption key during the test case
2012-06-21 18:53:10 +02:00
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
da9107fe69
fix saved file size for uploaded files
2012-06-21 18:07:56 +02:00
7b4cb44af8
truncate decrypted files based on size
2012-06-21 17:51:54 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
49d9eb7acf
fix calendar
2012-06-21 16:24:05 +02:00
096f5598b4
fix calendar
2012-06-21 16:23:13 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
288c5e7581
fix a PHP Notice
2012-06-21 15:20:53 +02:00
f5740a6f92
fix a PHP Notice
2012-06-21 15:20:15 +02:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
3b4d2a971a
check if user is allowed to edit bookmarks
2012-06-21 12:29:50 +02:00
09d2f76727
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 11:51:50 +02:00
2f9763d216
check if user is allowed to edit bookmarks
2012-06-21 11:50:51 +02:00
37ed3b5bd2
make edit event form work with DateTime Property UTC
2012-06-21 11:35:58 +02:00
1db2539223
make edit event form work with DateTime Property UTC
2012-06-21 11:35:20 +02:00
cd005e6c62
use new sanitizeHTML() function
2012-06-21 10:28:43 +02:00
f8ec280b6e
correct presentation of HTML encoded characters
2012-06-21 09:44:20 +02:00
82e8cb23fe
Merge branch 'master' into calendar_export
2012-06-21 09:08:26 +02:00
fedfa4c98e
DateTime objects are directly comparable
2012-06-20 21:38:56 +02:00
a6dc7345d0
Gallery: Move code/js/css from main template to the right place
2012-06-20 21:28:37 +02:00
10a0d5a46c
More changes for updating the contacts list.
2012-06-20 21:00:49 +02:00
dc8c188ffe
Better error checking.
2012-06-20 21:00:49 +02:00
426ed27be2
Make sure address books are shown even if empty.
2012-06-20 21:00:49 +02:00
0f1fe0b505
Log error as ERROR.
2012-06-20 21:00:49 +02:00
e43d02fadb
fix encrypted flags not being saved correctly
2012-06-20 20:18:42 +02:00
9ba467d629
fix encryption for binary files
2012-06-20 20:18:42 +02:00
0f2600e9ea
add binary test case for encryption
2012-06-20 20:18:41 +02:00
e3f1507374
use absolute path for file proxies
2012-06-20 20:18:41 +02:00
40e7b56783
Merge branch 'master' into calendar_export
2012-06-20 20:15:07 +02:00
0f13cbb47d
Merge branch 'master' into calendar_repeat
2012-06-20 20:14:08 +02:00
c1d205cbf5
Merge branch 'master' into calendar_export
2012-06-20 20:14:03 +02:00
d0dbc8beab
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:04:41 +02:00
f255ac8b3a
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:03:25 +02:00
4b231c15d5
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 19:43:02 +02:00
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
6308ca6b8a
Merge branch 'shared_log'
2012-06-20 17:20:46 +02:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
cd934d5d89
Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
2012-06-20 17:10:49 +02:00
5cc75ad818
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-20 17:08:48 +02:00
8e427d80d3
use sanitizeHTML() function
2012-06-20 17:00:55 +02:00
0e61b5457b
use new sanitizeHTML() function
2012-06-20 17:00:33 +02:00
a7f0811829
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 16:31:22 +02:00
5a2c93ec2d
use sanitizeHTML() function
2012-06-20 15:11:14 +02:00
572dd9fbad
Merge branch 'master' into calendar_repeat
2012-06-20 13:29:12 +02:00
27c995230c
Merge branch 'master' into calendar_export
2012-06-20 13:28:30 +02:00
1ecbf459c9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 13:01:55 +02:00
5b02217906
forgotten $, incorrect subtract
2012-06-20 12:47:31 +02:00
7c6b8475eb
LDAP: only map users within the User Base Tree
2012-06-20 12:47:24 +02:00
0289f442a8
forgotten $, incorrect subtract
2012-06-20 12:41:30 +02:00
8d89bba07c
use new sanitizeHTML() function
2012-06-20 12:23:26 +02:00
311c2bc0d3
Calendar: Write-close session to enable parallel events.php requests
2012-06-19 23:18:26 +02:00
c260db0e9a
Tasks: Fix resizing of the content part
2012-06-19 23:17:14 +02:00
0d43d6402d
Tasks: Use POST for ajax calls that change data
2012-06-19 23:17:00 +02:00
cff1b6e699
Don't use substr to get first char of string
2012-06-19 23:16:17 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
0b9a48b4b6
Re-add missing loadhandlers() call.
2012-06-19 14:56:21 +02:00
33aec973df
Loading of contacts was placed outside of $(document).ready() function.
2012-06-19 14:55:14 +02:00
5ce0097b6f
Calendar: only run ->expand if the event is repeating
2012-06-19 13:30:45 +02:00
2b2da6fe35
Calendar: js fix
2012-06-19 13:26:55 +02:00
c8c105df33
Calendar: fix modifying of end DateTime object
2012-06-19 13:04:11 +02:00
a38463d41a
Merge branch 'master' into calendar_repeat
2012-06-19 11:30:12 +02:00
244920aeb0
LDAP: only map users within the User Base Tree
2012-06-19 01:15:58 +02:00
8c8a0cca75
Merge branch 'master' into calendar_export
2012-06-18 23:10:01 +02:00
a1364c9726
fixes oc-1026
2012-06-18 22:48:52 +02:00
debd9c8dfb
fix problem with encryption flag not being saved correctly in the filecache
2012-06-18 18:18:10 +02:00
16560fe5c1
Merge branch 'master' into calendar_repeat
2012-06-18 15:59:26 +02:00
6e405513ab
Merge branch 'master' into calendar_export
2012-06-18 15:59:21 +02:00
13aad8f06d
some little fixes for repeating events caching
2012-06-18 15:58:01 +02:00
79f9d61ec8
Allow apps to load before login, needed for user_openid
2012-06-18 15:40:48 +02:00
beed6e0f0e
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
...
This reverts commit e3b58f6783
2012-06-18 14:47:58 +02:00
e3b58f6783
Revert "create OC_Calendar_Object::generateStartEndDate function"
...
This reverts commit aa7ce480f4
2012-06-18 14:47:09 +02:00
6b6d3d68d4
Merge branch 'master' into calendar_repeat
2012-06-18 14:34:43 +02:00
c2b7d05188
Merge branch 'master' into calendar_export
2012-06-18 14:34:38 +02:00
e5feb4e1aa
Remove obsolete js.
2012-06-18 02:22:22 +02:00
73fd4c979a
Update js after contactlist change.
2012-06-18 02:21:29 +02:00
d8048414aa
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:39:38 +02:00
a4f53922c2
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:36:25 +02:00
cab4a634df
Save addressbook id to be able to rearrange contacts properly.
2012-06-17 23:14:02 +02:00
3efec3fde9
Make contact list fit in viewport.
2012-06-17 23:12:48 +02:00
ea4d8ccf70
Rearrange markup.
2012-06-17 23:12:11 +02:00
8337b30e43
Add thumbnail links so they are loaded when addressbook is expanded.
2012-06-17 23:09:25 +02:00
7d84c4741c
Use uasort instead of usort.
2012-06-17 21:50:49 +02:00
46a771d2e6
Sort addressbooks.
2012-06-17 21:47:15 +02:00
fb700de4a4
Add effect on addressbook show/hide.
2012-06-17 21:37:13 +02:00
9e4a41e9cb
Add effect on addressbook show/hide.
2012-06-17 21:34:56 +02:00
5a8f4b8783
Adjustments for inview handler etc.
2012-06-17 20:25:32 +02:00
b6b6d69158
Moved parsing to the controller and js to contacts.js.
2012-06-17 20:25:32 +02:00
2875901fc7
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
91f5a1de39
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
b1cfc99f63
Styled address book entries.
2012-06-17 20:25:32 +02:00
56d25d4d1b
Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
2012-06-17 20:25:32 +02:00
92e35bd843
now a little less in template - more in ajax controller
2012-06-17 20:25:32 +02:00
7f485d1b20
contacts app now lists contacts sorted by expandable/collapsable addressbooks
2012-06-17 20:25:32 +02:00
b8daae30b6
Merge branch 'master' into calendar_repeat
2012-06-17 16:41:49 +02:00
4b872d10fc
Merge branch 'master' into calendar_export
2012-06-17 16:41:44 +02:00
8d67ca09b5
user_migrate: remove old code
2012-06-17 12:07:16 +00:00
b064fc6968
user_migrate: remove old code
2012-06-17 12:06:40 +00:00
229587a31e
Merge branch 'master' into calendar_repeat
2012-06-17 08:36:26 +02:00
a8da950819
Merge branch 'master' into calendar_export
2012-06-17 08:36:20 +02:00
ad4f066bac
suppress error when using is_dir on non directory in smb backend
2012-06-17 03:09:49 +02:00
ed66c63c29
improve caching smb results a bit
2012-06-17 02:59:38 +02:00
769cbe9a4c
improve filecache support for smb
2012-06-17 02:54:23 +02:00
33ab91710f
PDF Viewer: Double encode link.
2012-06-16 19:49:57 +02:00
9c6d82d00d
PDF Viewer: Double encode link.
2012-06-16 19:48:33 +02:00
7f1e0287a9
Merge branch 'master' into calendar_repeat
2012-06-16 19:04:50 +02:00
56f8fc0f70
Merge branch 'master' into calendar_export
2012-06-16 19:04:45 +02:00
707660b35f
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:57:51 +02:00
1118498050
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:54:55 +02:00
4cbdd59859
Fix char encoding.
2012-06-16 18:38:20 +02:00
6642ef6a50
Fix string encoding probs.
2012-06-16 18:06:47 +02:00
fd9a4f8d51
Merge branch 'master' into calendar_repeat
2012-06-16 09:48:43 +02:00
be4820bbca
Merge branch 'master' into calendar_export
2012-06-16 09:48:32 +02:00
fc632b5795
fix merge conflicts
2012-06-16 09:48:07 +02:00
31ec93bd00
remove a lot of closing php tags and empty lines at a file's end in calendar app
2012-06-16 09:45:17 +02:00
05c1afd0d1
Merge branch 'master' into calendar_repeat
2012-06-16 09:41:31 +02:00
4d392801cc
Merge branch 'master' into calendar_export
2012-06-16 09:41:24 +02:00
cbe5449f47
remove a closing php tag in calendar
2012-06-16 09:40:32 +02:00
b6375e7a8c
remove a closing php tag in calendar
2012-06-16 09:40:03 +02:00
a6531d0311
Merge branch 'master' into calendar_repeat
2012-06-16 09:35:53 +02:00
81e8ffc4ba
Merge branch 'master' into calendar_export
2012-06-16 09:35:48 +02:00
bf2062b09d
write_close the session when scanning files or music
2012-06-16 01:35:39 +02:00
ec3033a5dd
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-15 19:34:25 -04:00
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02:00
c1744d2eb6
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:17:31 +00:00
8484e16516
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-15 23:14:48 +00:00
e37ef6dd47
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:14:40 +00:00
4268fe61ba
Calendar: Write-close session to enable parallel events.php requests
2012-06-16 00:44:23 +02:00
6d3ae575b6
Remove $DOCUMENTROOT, not used
2012-06-16 00:11:36 +02:00
03951ccc6b
fix encryption proxy for updated filecache
2012-06-15 23:11:55 +02:00
19bfe21401
add binary test case for encryption
2012-06-15 23:11:33 +02:00
fbd45a939f
Merge branch 'master' into calendar_repeat
2012-06-15 20:48:32 +02:00
4d2894f390
Merge branch 'master' into calendar_export
2012-06-15 20:48:26 +02:00
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
5c6a7172ca
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:58:10 +02:00
8f6121ffa8
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:57:04 +02:00
aa7ce480f4
create OC_Calendar_Object::generateStartEndDate function
2012-06-15 12:11:22 +02:00
4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
22a33b509f
use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
2012-06-15 11:39:19 +02:00
e4529301ff
change some function names in OC_Calendar_Repeat
2012-06-15 11:34:21 +02:00
5c10683432
use easier parseable date to init datetime
2012-06-15 11:29:16 +02:00
6f20d51646
fix generateEventOutput for calendar hook
2012-06-15 11:25:29 +02:00
b6a8de8530
don't clean and cache calendar on every update
2012-06-15 11:24:40 +02:00
f9c34942e1
applied merge request #128 : fixed some sorting and display issues with gallery app.
...
This also fix bug #872 for the new gallery
2012-06-15 10:46:29 +02:00
0dd4ea5a4f
Merge branch 'master' into calendar_export
2012-06-15 10:41:06 +02:00
4b7bdd5ace
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
...
Conflicts:
apps/gallery/templates/index.php
2012-06-15 09:51:04 +02:00
effb6f1309
Update stylesheet for type=url.
2012-06-15 04:32:01 +02:00
8a68d09b0f
Use type=url for URL field.
2012-06-15 04:32:01 +02:00
92083aa20c
Fix upload for Google Drive; Google Documents List API documentation was misleading
2012-06-14 20:57:08 -04:00
f6aa366857
Make sure there is a calendar after delete.
2012-06-15 02:10:55 +02:00
3c75ac5f62
Update calendar after delete.
2012-06-15 02:07:32 +02:00
ad8c4ab182
Only create new calendar when there are none. Fix oc-1007.
2012-06-15 01:55:02 +02:00
ad32c20300
Agree on argument type (cleaned this time).
2012-06-15 01:51:26 +02:00
6d43e6565e
Revert "Agree on argument type."
...
This reverts commit 0f6b1be0e6
2012-06-15 00:53:13 +02:00
0f6b1be0e6
Agree on argument type.
2012-06-15 00:50:42 +02:00
1e76a530ea
No need to find calendar twice.
2012-06-15 00:28:12 +02:00
31db583f03
Make events show again.
2012-06-15 00:26:34 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
96a3e28c2e
Cleanup code.
2012-06-14 23:05:31 +02:00
27ab6daeb0
If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...
2012-06-14 23:05:31 +02:00
f3b30e4658
Forgot $ sign for variable
2012-06-14 15:14:01 -04:00
f7e686d4f1
Revert "Fix a counting mistake"
...
This reverts commit c20abfef38
2012-06-14 15:05:20 -04:00
ec69377ade
first load compatibility.js
2012-06-14 21:00:19 +02:00
4cc9bf09be
fix javascript error
2012-06-14 20:55:36 +02:00
4eb0c270aa
fixed handling of fallback_images
2012-06-14 19:38:43 +02:00
b025ff8de3
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:33:00 +02:00
12bfc551fb
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:31:38 +02:00
6e15b231b0
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-14 12:27:30 -04:00
47c03a0eff
Contacts: Fixes for CSRF.
2012-06-14 18:13:01 +02:00
3b58c7a407
Remove debug statements.
2012-06-14 18:03:50 +02:00
a3afd51b94
fixed one issue with last directory in structure having a lot of
...
subdirectories and finally some pictures
2012-06-14 18:02:07 +02:00
b6ee4c458b
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-14 18:00:45 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
4510571aa1
Add app for logging access to shared files
2012-06-14 17:44:41 +02:00
fa67927eb5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
...
Conflicts:
apps/gallery/templates/index.php
2012-06-14 17:08:52 +02:00
60bd2562d8
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:16:13 +02:00
6468e0a1d5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:14:36 +02:00
df4737f52a
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:19:12 +02:00
d28a4f0638
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:17:30 +02:00
cd759aee00
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:45:33 +02:00
87855f2506
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-14 13:44:42 +02:00
211a546600
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:41:39 +02:00
756eb3548f
Use the right csrf token.
2012-06-14 13:23:12 +02:00
544f97f034
debugging output removed
2012-06-14 13:19:11 +02:00
4a47fa255d
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:18:59 +02:00
b0ecef02e9
debugging output removed
2012-06-14 13:17:06 +02:00
e7b93b1807
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:13:17 +02:00
bc6884b176
we don't neede the functions for empty stacks any more
2012-06-14 12:51:27 +02:00
b32afd1331
we don't have empty previewstacks any more - code cleaned up
2012-06-14 12:39:18 +02:00
56d2e99239
deleted some debugging output
2012-06-14 01:29:41 +02:00
22cd610a79
use images from deeper directories for preview if the actual directory doesn't contain any
2012-06-14 01:29:25 +02:00
9f59cc5eb0
improved look of directories not containing images directly
2012-06-14 01:29:17 +02:00
e99a95a756
now also working for directories only containing one image
2012-06-14 01:27:34 +02:00
4711c2bb41
fixed second_level_images issue
2012-06-14 01:27:26 +02:00
e4278574a8
fixed sorting errors and missbehaviours - now sorting like file browser
2012-06-14 01:27:01 +02:00
f9af0ef703
fix another ui bug of calendar
2012-06-13 22:21:23 +02:00
e154806838
fix another ui bug of calendar
2012-06-13 22:20:43 +02:00
92a11011b1
another ui fix
2012-06-13 22:15:12 +02:00
2e44ffaf02
another ui fix
2012-06-13 22:14:40 +02:00
4ff11308a3
fix a ui bug for calendar sharing
2012-06-13 22:13:24 +02:00
b1139e977a
fix a ui bug for calendar sharing
2012-06-13 22:12:54 +02:00
e543ec6eb6
show username of the body who shares in the summary
2012-06-13 22:07:30 +02:00
6bd80d6457
show username of the body who shares in the summary
2012-06-13 22:07:23 +02:00
7d29bee859
fix merge conflicts
2012-06-13 21:40:05 +02:00
61b044e00e
Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts
2012-06-13 21:39:12 +02:00
7a8e7f18db
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
2012-06-13 21:39:12 +02:00
4da6b3a391
Calendar: Make button of #datecontrol_date
2012-06-13 21:39:12 +02:00
c24752dc1d
Merge branch 'master' into calendar_export
2012-06-13 21:38:33 +02:00
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
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
3e339f3d66
Remove check for encryption.
2012-06-13 19:04:47 +02:00
613a122437
Remove check for encryption.
2012-06-13 19:03:34 +02:00
d33d599b1b
Remove debug statements.
2012-06-13 18:57:12 +02:00
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
3a8b280c06
Merge branch 'master' into calendar_export
2012-06-13 15:29:47 +02:00
9bdad6fdbf
fix merge conflicts
2012-06-13 11:40:00 +02:00
7868b25dcc
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:34:35 -04:00
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04:00
48116cf9ab
increase version of calendar app to force db upgrade
2012-06-12 19:54:07 +02:00
d54fc6dfd4
increase possible size of uri in database - fix oc-140
2012-06-12 19:54:07 +02:00
deb2f87556
increase version of calendar app to force db upgrade
2012-06-12 19:53:26 +02:00
dc0adbad02
increase possible size of uri in database - fix oc-140
2012-06-12 19:52:25 +02:00
f7727a322d
Merge branch 'master' into calendar_repeat
2012-06-12 19:26:52 +02:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
635a2f8ec9
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:32:00 +02:00
8626f04f5d
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:27:24 +02:00
71573f7934
Merge branch 'master' into calendar_repeat
2012-06-12 15:58:01 +02:00
c9d408ff8c
automatic cache repeating events after an update
2012-06-12 15:56:51 +02:00
ef6b6ac230
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:16:09 +02:00
f6e7c633a0
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:11:28 +02:00
cee9d400c0
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:33:37 +02:00
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +02:00
b70226b493
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-12 11:57:36 +02:00
4501407283
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:41:13 +02:00
b38ce8adfd
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:39:03 +02:00
5e37a10334
PDF.JS updated, compatibility.js added for browser support, should fix: oc-395
2012-06-12 00:50:34 +02:00
3be5e2af26
utf8 in der DB config
2012-06-11 23:04:28 +02:00
66c3ddcd74
Merge branch 'master' into calendar_repeat
2012-06-11 22:18:46 +02:00
210b71502b
Fix copy/paste error.
2012-06-11 22:18:14 +02:00
3c9be43aa4
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +02:00
e0a5e3e992
Fix js for missing address fields.
2012-06-11 22:15:56 +02:00
c75a7966de
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:15:31 +02:00
ac11647d7a
Fix js for missing address fields.
2012-06-11 22:14:21 +02:00
4b86cbcb6f
Quick fix for index errors when not importing from files.
2012-06-11 22:14:21 +02:00
c75f9f9397
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
2012-06-11 22:14:21 +02:00
8af53829d5
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:14:21 +02:00
08a3a4f185
fix a bug in OC_Calendar_Repeat
2012-06-11 21:43:24 +02:00
759ddcbf32
Tasks: Fix resizing of the content part
2012-06-11 20:34:06 +02:00
0eee140eaf
Gallery: remove extra include of lib/base.php
2012-06-11 20:34:06 +02:00
eddad8bedb
Calendar: remove unused markup from #controls
2012-06-11 20:34:06 +02:00
f9bf34340c
Removed unecessary sanitization
2012-06-11 19:49:24 +02:00
68f819ee20
Removed double sanitization
2012-06-11 19:47:42 +02:00
9edd40354e
Merge branch 'master' into calendar_repeat
2012-06-11 19:46:12 +02:00
ad36fc8938
Fix double sanitization
2012-06-11 19:43:37 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
1d493a70e7
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
2012-06-11 18:13:12 +02:00
18d19b022f
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-11 17:28:15 +02:00
09e744b793
connect OC_Calendar_repeat to events.php
2012-06-11 17:25:03 +02:00
009c4c9045
add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public
2012-06-11 17:15:50 +02:00
2dd84373c1
fix bug in OC_Calendar_Repeat
2012-06-11 17:13:20 +02:00
266c5238c9
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:50:54 +02:00
fcc9a5c8d4
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:48:43 +02:00
739589f485
make sure that contact data are always utf8 encoded to avoid encoding problems
2012-06-11 16:26:21 +02:00
24a1ab8c15
Merge branch 'master' into calendar_repeat
2012-06-11 15:38:02 +02:00
44e62c03e2
increase version number of calendar
2012-06-11 15:37:19 +02:00
32b366585d
some fixes for repeating events caching
2012-06-11 15:36:48 +02:00
e6c8febafc
add hooks to connect calendar / event changes with OC_Calendar_Repeat
2012-06-11 15:18:46 +02:00
5cb9d82b45
modify hooks in OC_Calendar_Calendar
2012-06-11 15:16:59 +02:00
eb3605aa63
modify hooks in OC_Calendar_Object
2012-06-11 15:15:13 +02:00
01bd048bb3
remove insert id
2012-06-11 15:01:48 +02:00
40459c8c66
some work on repeating events caching - basic class should work now :)
2012-06-11 15:00:51 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
74eece2620
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:56:41 +02:00
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
0df67aeae9
ldap: check array for emptiness, not nullness
2012-06-11 12:26:48 +02:00
c110308c1e
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-11 12:14:10 +02:00
7f5e8e39c4
ldap: check array for emptiness, not nullness
2012-06-11 12:13:55 +02:00
6da717b644
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
...
Backport for sanitized user data.
2012-06-11 11:57:36 +02:00
d294373f47
Sanitzing user input
2012-06-11 11:56:54 +02:00
f8337c9d72
Using POST instead of GET.
2012-06-11 11:56:11 +02:00
cc653a8a40
Sanitize user input
2012-06-11 11:54:45 +02:00
8f09299e24
Sanitizing user input
2012-06-11 11:54:03 +02:00
f2216dc9d2
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-11 11:20:51 +02:00
f4c459782b
Merge branch 'master' into calendar_repeat
2012-06-11 10:59:19 +02:00
ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
3f9b967be7
Sanitizing user input
2012-06-11 00:36:58 +02:00
f8d2e21c66
Sanitize user input
2012-06-11 00:23:35 +02:00
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
9f276729c2
Using POST instead of GET.
2012-06-10 23:38:26 +02:00
380aab470f
Sanitzing user input
2012-06-10 23:16:59 +02:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
c898a8a6c9
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:54:52 +02:00
cdac0eae46
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-10 20:47:35 +02:00
6a44d02898
XSS--
2012-06-10 19:54:04 +02:00
bf4626da93
prevent XSS
2012-06-10 19:52:23 +02:00
c6a03ec6d8
remove include command for when
2012-06-10 18:41:17 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
bdb76d4873
Merge branch 'master' into calendar_export
2012-06-10 18:37:16 +02:00
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
3970be3d7f
fix variable name and undefined index notice
2012-06-10 17:25:19 +02:00
31d48d4ba4
adding missing file
2012-06-10 13:20:49 +02:00
de6b683b50
fix first time image loading error
2012-06-10 13:19:22 +02:00
2dca0926b0
gallery: removing search provider for now
2012-06-10 13:19:17 +02:00
7ee722e0da
removing app access check, fix title for links in tiles
2012-06-10 13:18:55 +02:00
e073cd756c
tabs for spaces, fix array key name
2012-06-10 13:18:47 +02:00
f6c07094c2
hide share button until sharing wont be fixed
2012-06-10 13:18:41 +02:00
1853a83874
adding navigation bar to gallery
2012-06-10 13:18:36 +02:00
fe64e625ff
remove old code
2012-06-10 13:18:30 +02:00
f0f9269161
adding missing file
2012-06-10 13:18:17 +02:00
6682c60866
pictures: update script and removal some all stuff
2012-06-10 13:17:23 +02:00
9c1cc15c8d
adding title when fancybox is displayed
2012-06-10 13:16:19 +02:00
c932f93a40
replace spaces with tabs, use const and linkTo instead of static path
2012-06-10 13:16:12 +02:00
276aefba81
hack for file download
2012-06-10 13:16:06 +02:00
71b4cddd52
removing test image
2012-06-10 13:16:00 +02:00
c67de113c6
aviod incorrect image size returning in gallery listing
2012-06-10 13:15:51 +02:00
63c02fd595
use fancybox to display image preview
2012-06-10 13:15:45 +02:00
7aff5eae6c
navigate on galleries
2012-06-10 13:15:39 +02:00
2b80102909
new db scheme
2012-06-10 13:15:32 +02:00
9b2b5e0f6d
git status
2012-06-10 13:15:23 +02:00
76f20eb57c
fix first time image loading error
2012-06-10 13:05:00 +02:00
746994c2be
Fixed merge conflict.
2012-06-10 12:59:36 +02:00
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
0838b4c225
gallery: removing search provider for now
2012-06-10 09:52:33 +02:00
be6848a549
let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways.
2012-06-09 23:18:56 +02:00
995f9c7348
sanitize scope and host
2012-06-09 21:08:24 +02:00
322fd51261
avoid clickjacking
2012-06-09 21:08:24 +02:00
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
b46903fa76
sanitize when logged in as another user
2012-06-09 20:39:24 +02:00
d065b2d29e
prevent opening non-music files through the media ajax api
2012-06-09 17:39:14 +02:00
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
e7f6f7e452
fix another XSS
2012-06-09 16:45:37 +02:00
642e7ce110
fix another XSS
2012-06-09 16:44:48 +02:00
f955f6a685
fix XSS in Calendar
2012-06-09 16:36:01 +02:00
c9214afff8
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
ff4b175622
increase height of event dialog
2012-06-09 15:40:27 +02:00
009fbd89b4
fix creation of monthly repeated events
2012-06-09 15:40:27 +02:00
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
001293a702
removing app access check, fix title for links in tiles
2012-06-09 15:12:50 +02:00
0f454215e7
Code cleanup.
2012-06-09 15:04:08 +02:00
59d16c5f9a
Contacts: Use POST instead of GET.
2012-06-09 15:02:23 +02:00
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
4aee5a7ce4
Tasks: Use POST for ajax calls that change data
2012-06-09 14:39:41 +02:00
c83f418a02
Merge branch 'master' into calendar_repeat
2012-06-09 12:30:39 +02:00
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
201a40a1a3
tabs for spaces, fix array key name
2012-06-08 21:55:28 +02:00
0c7431e57d
hide share button until sharing wont be fixed
2012-06-08 21:44:33 +02:00
8bc22907b8
adding navigation bar to gallery
2012-06-08 21:44:33 +02:00
6b0a2ae60e
remove old code
2012-06-08 21:44:32 +02:00
71b04717ab
adding missing file
2012-06-08 21:44:31 +02:00
9e434dea60
tabs for spaces, removing thumbnail on file removal
2012-06-08 21:44:31 +02:00
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
23533a763a
Don't fix bugs not present in this branch ;-)
2012-06-08 20:44:58 +02:00
5eb5d23ac1
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
...
Conflicts:
apps/contacts/ajax/uploadphoto.php
2012-06-08 20:43:42 +02:00
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
e83e30a8a9
Merge branch 'master' into calendar_repeat
2012-06-08 19:54:42 +02:00
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
eb192ff4f3
code cleanup from previous commit
2012-06-08 16:31:12 +02:00
cf1430df45
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-08 16:27:07 +02:00
0722ff6e32
fix for bug #872 : Folders not holding any images are ignored, even if they hold subfolders with images
2012-06-08 16:24:31 +02:00
0dc371f579
typo in var
2012-06-08 14:58:07 +02:00
f70615106f
typo in var
2012-06-08 14:57:27 +02:00
8c7fa15aaf
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:58:00 +02:00
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
1d93a8fcfe
Merge branch 'master' into calendar_export
2012-06-08 11:20:17 +02:00
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
4afcae8d56
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-07 23:38:50 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
0f68276921
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:56:06 +02:00
c2f557f1dd
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:55:32 +02:00
4beabe23e7
ldap: enable the destructor
2012-06-07 18:15:11 +02:00
6626598435
ldap: enable the destructor
2012-06-07 18:13:41 +02:00
14e1be56a0
pictures: update script and removal some all stuff
2012-06-07 17:08:04 +02:00
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +02:00
f3f3c791ba
ldap: correct query condition and determining of success
2012-06-07 13:40:26 +02:00
691f00eb39
ldap: check index carefully, can be 0
2012-06-07 13:40:16 +02:00
44880ab3fa
ldap: remove unused private functions
2012-06-07 13:39:42 +02:00
6894882ca9
ldap: correct query condition and determining of success
2012-06-07 13:39:42 +02:00
470cb17f90
ldap: check index carefully, can be 0
2012-06-07 13:39:42 +02:00
9266f4da99
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:10:19 +02:00
312536dbf9
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:08:42 +02:00
de6d550cce
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:22:25 +02:00
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
3d48bf18d3
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:58:15 +02:00
3804f68ff5
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:55:40 +02:00
9c84149119
A bit of pixel-pushing.
2012-06-07 10:55:40 +02:00
8fd6cdf407
adding title when fancybox is displayed
2012-06-06 23:29:23 +02:00
5417d803c4
replace spaces with tabs, use const and linkTo instead of static path
2012-06-06 23:23:49 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
a90089c792
hack for file download
2012-06-06 22:20:56 +02:00
7c88081acb
removing test image
2012-06-06 22:13:49 +02:00
aa0fc3c69a
aviod incorrect image size returning in gallery listing
2012-06-06 22:13:49 +02:00
671fe49809
use fancybox to display image preview
2012-06-06 22:13:49 +02:00
76e7e361ae
navigate on galleries
2012-06-06 22:13:49 +02:00
34a21a63ce
new db scheme
2012-06-06 22:13:49 +02:00
6d211155ab
git status
2012-06-06 22:13:48 +02:00
bb07c20bf4
fixed var name, $filename should be $foldername
2012-06-06 18:11:23 +02:00
c960e42a17
fixed var name, $filename should be $foldername
2012-06-06 18:08:51 +02:00
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
ed950e3ba2
Correct mime type.
2012-06-06 15:29:33 +02:00
48ccfa42d3
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:31:22 +02:00
190fca1121
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:29:48 +02:00
ca0108aabf
Corrected typos.
2012-06-06 11:50:49 +02:00
517bd28940
Corrected typos.
2012-06-06 11:49:45 +02:00
6abe8f9e2e
fixed wrong function call
2012-06-06 10:40:22 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
d8d558377c
Merge branch 'master' into calendar_export
2012-06-06 10:11:34 +02:00
fce614b82c
Less aggressive caching on thumbnails too.
2012-06-06 01:06:13 +02:00
68670bcc66
Cleanup.
2012-06-06 01:06:13 +02:00
624f8ae36d
Also use OC_Cache here.
2012-06-06 01:06:13 +02:00
80de23d08b
Contacts: Removed temp dir cleanup after using OC_Cache.
2012-06-06 01:06:12 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
a3c1f70be4
dont show config option for file upload size if we cant write the new value
2012-06-06 00:24:15 +02:00
063c9accb6
prevent creating files with a / the name
2012-06-06 00:04:02 +02:00
e6c4e53486
prevent creating files with a / the name
2012-06-06 00:02:51 +02:00
20aee83d07
Use UID for cache key.
2012-06-05 21:20:10 +02:00
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +02:00
3a5076d646
show pictures in folder with special characters, e.g. '+'
2012-06-05 17:58:23 +02:00
0d1a07d4ae
show pictures in folder with special characters, e.g. '+'
2012-06-05 16:36:05 +02:00
769d94ab26
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-06-05 14:14:26 +02:00
44260a552c
xss vulnerability fixed
2012-06-05 10:49:36 +02:00
e817504569
xss vulnerability fixed
2012-06-05 10:49:26 +02:00
d71c4db10a
xss vulnerability fixed
2012-06-05 10:46:28 +02:00
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
64f6534f51
Tasks: styling fixes
2012-06-04 23:04:31 +02:00
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
091b343d5c
Calendar & Contacts: Store import progress in OC_Cache
...
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
4bc88ef59d
prevent xss attacks by manipulating image file names
2012-06-04 18:11:17 +02:00
d5566d0267
prevent xss attacks by manipulating text file names
2012-06-04 18:11:08 +02:00
f291a843bf
prevent xss attacks by manipulating image file names
2012-06-04 16:22:25 +02:00
1d6ca084a6
prevent xss attacks by manipulating text file names
2012-06-04 16:20:03 +02:00
c8f670dfab
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 14:00:35 +02:00
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
782d82730a
commited a bit too much before
2012-06-04 13:28:31 +02:00
8983c6dd6b
commited a bit too much before
2012-06-04 13:27:55 +02:00
2842088b75
Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
2012-06-04 13:14:31 +02:00
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
d657263403
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-04 13:13:53 +02:00
74ac2ac63a
Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
2012-06-04 13:13:43 +02:00
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
b48228ae3d
LDAP: link to documentation on settings page
2012-06-04 13:04:18 +02:00
6560f1d894
don't change events timezone and remove the DTSTART value tag
2012-06-04 12:28:05 +02:00
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
4d1428db0f
Merge branch 'master' into calendar_repeat
2012-06-03 19:17:05 +02:00
865b7d6a7b
Merge branch 'master' into calendar_export
2012-06-03 14:56:25 +02:00
c2a51d1f48
proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid
2012-06-03 14:54:53 +02:00
e58efd7877
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:38 +02:00
34464b1f8b
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:04 +02:00
86279bc192
LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
2012-06-01 14:05:08 +02:00
a4f177d75d
LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
2012-06-01 13:49:11 +02:00
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
e44f9ab46e
correctly detect https
2012-06-01 11:47:14 +02:00
a2b41a140e
correctly detect https
2012-06-01 11:46:18 +02:00
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +02:00
83c6714c72
don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
2012-06-01 11:12:50 +02:00
8ed13e627e
don´t do warnings.
...
Not sure if this start_session call is really needed here.
2012-06-01 11:08:40 +02:00
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
670022cc8a
fix the breadcrumb
2012-05-31 21:43:07 +02:00
5f4132d6ba
more fixes
2012-05-31 21:16:36 +02:00
c3ccdbaa79
more fixes
2012-05-31 21:14:46 +02:00
57a56299d8
more fixes
...
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
d56966f14f
someone broke this completely. Hope it works again. Please check your apache error log and turn php notices on if you work on ajax call
2012-05-31 20:45:39 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
739c5488a5
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-05-31 20:17:30 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
0059535140
fix potential XSS
2012-05-31 20:03:15 +02:00
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
3db28d7616
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-05-31 19:46:51 +02:00
e93bb5135d
Applied fix from kalassico for "Chiper text must be a string" bug ( http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094 )
2012-05-31 12:25:07 +01:00
3b36a9b704
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:07:49 +02:00
7ec3e37199
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:06:27 +02:00
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
0934a975b2
Remove unused L10N variable
2012-05-31 13:01:30 +02:00
c5cc70c0e3
Merge branch 'master' into calendar_repeat
2012-05-31 12:20:56 +02:00
449b9b92f0
LDAP: fix wrong value for input type
2012-05-30 22:37:00 +02:00
93849916bb
LDAP: support for 'member' as group-member-association
2012-05-30 22:36:48 +02:00
8b4e16ec77
LDAP: fix wrong value for input type
2012-05-30 22:34:51 +02:00
4dc7ed139b
don´t hardcode /tmp
2012-05-30 14:18:47 +02:00
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
dbcd26be68
Contacts: Rewrote import script.
2012-05-29 23:41:53 +02:00
f1a48aec73
Merge branch 'master' into calendar_repeat
2012-05-29 19:47:48 +02:00
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +02:00
6515c5c1e7
Contacts: NOTE wasn't saved properly.
2012-05-29 16:45:52 +02:00
51aa84e70a
Contacts: NOTE wasn't saved properly.
2012-05-29 16:43:59 +02:00
dff16e70a9
Contacts: Improve loading and cleanup of dialogs.
2012-05-29 16:43:59 +02:00
29372677ae
add lib collection and lib scanner to media's appinfo/app.php
2012-05-29 13:36:51 +02:00
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +02:00
1c1ed52867
fix status
...
of timezone detection
2012-05-29 13:14:36 +02:00
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
d1f0261b5d
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:57:52 +00:00
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
7b8664bbe5
Check for valid LDAP-resource before querying.
...
Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.
Signed-off-by: Benjamin Diele <benjamin@diele.be>
2012-05-28 17:54:38 +04:00
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
cf113409ad
Contacts: Fix XSS.
2012-05-28 14:41:48 +02:00
1eebbaebdb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-28 13:59:47 +02:00
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
53da328aa1
Contacts: Double check XSS.
2012-05-28 12:56:56 +02:00
8bd6d862b8
Please don't tell me I did that :-P
2012-05-28 12:52:18 +02:00
5b7ef90d3a
add urlencode for caldav link
2012-05-28 10:50:10 +02:00
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
459114b994
Merge branch 'master' into calendar_repeat
2012-05-26 22:54:24 +02:00
3db5fb891c
allow longer paths for gallery
2012-05-26 21:54:49 +02:00
143287738a
allow longer paths for gallery
2012-05-26 21:50:54 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
d2369b6e96
LDAP: support for 'member' as group-member-association
2012-05-26 16:38:37 +02:00
1645f77aad
fix share for users with a point within their name
2012-05-26 15:41:32 +02:00
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
2774ff1ad8
Add HEAD request management for files ajax/download.php
2012-05-25 11:19:38 +02:00
bc9accd26e
Merge branch 'master' into calendar_repeat
2012-05-25 10:30:00 +02:00
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
5fa14806c8
Add translation for error message
2012-05-24 19:16:00 +00:00
2c9311cf48
Add error message when uploading folder or null files. ref oc-739
2012-05-24 18:47:34 +00:00
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
f00a50c76a
Add pending line in file list before trying to upload. Correct indentation
2012-05-24 16:56:19 +00:00
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
d8ca4f78cf
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:36:39 -04:00
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
20e9903396
Correct small style problem with task app fix #oc-689
2012-05-23 22:36:36 +00:00
97d682dc13
Correct small style problem with task app fix #oc-689
2012-05-23 21:02:34 +00:00
3fee3a4633
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-22 14:44:40 +01:00
27f7dae932
removed closing php tag
2012-05-22 13:42:55 +01:00
647888eea2
add a ldap encryption warning
2012-05-22 12:35:28 +02:00
8cd7410447
encryption is not yet compatible with ldap
2012-05-22 12:15:51 +02:00
54a3717005
Contacts: Backport XSS fix.
2012-05-21 21:49:35 +02:00
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
d7c09d8bb5
add a warning
2012-05-20 10:59:37 +02:00
2f8f7501ef
add warning
2012-05-20 10:58:20 +02:00
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
35bd601215
Fix check for when to store a new version of a file
2012-05-18 22:27:43 -04:00
f750da1802
Fix revert link on history page of file versions
2012-05-18 22:07:48 -04:00
89f5701d1a
Fix versioning of shared files
2012-05-18 22:07:48 -04:00
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
122d1efecf
Don't show the select form in the history dropdown if a file has no other versions
2012-05-18 10:39:43 -04:00
c1bb8139a0
LDAP: we're 0.2 now
2012-05-18 18:00:30 +02:00
bae954a797
LDAP: only check once for name conflicts on update. Set a value on install as well
2012-05-18 18:00:30 +02:00
7922338050
Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields.
2012-05-18 17:39:19 +02:00
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
0c7efc234b
LDAP: update meta info
2012-05-18 17:07:00 +02:00
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
ea33b4aaa1
LDAP: don't make us of global constants (completing, was removed with latest additions to update.php)
2012-05-18 12:55:38 +02:00
253f101b39
LDAP: check wether applying naming rule would end up in conflicts on update, if so don't do it
2012-05-18 12:55:37 +02:00
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
7d49bf7f6e
some changes in calendar repeat class
2012-05-18 11:48:18 +02:00
b7aee58ef9
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
2012-05-17 21:26:55 -04:00
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
0aac70aaf1
Revert google webfont removal. Sadly this causes havoc with the editor!
2012-05-17 20:23:43 +00:00
f7366de673
Merge branch 'master' into calendar_repeat
2012-05-17 22:17:23 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
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
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
7a7c301d7d
LDAP: follow user- and groupname char limitations for LDAP display names
...
WARNING: may affect existing installations if display names included unallowed characters. Allowed are only a-zA-Z0-9._-@ This fix is however needed, because names with unallowed characters may cause conflicts
2012-05-17 17:17:40 +02:00
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
2f1e601809
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
2012-05-17 14:31:04 +02:00
9b3847f49b
Initial support for Amazon S3 storage backend
2012-05-16 21:52:05 -04:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
9e83c3f823
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
2012-05-16 21:05:15 +02:00
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
ab18a0bfe8
ldap: unique index names for the database, fixes non-creating of indexes for the second table and potential issues in the app
2012-05-16 18:11:42 +02:00
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
2ad6b5048e
fixed 'delete' label so it doesn't break translations
2012-05-15 16:24:06 +01:00
35effbcd3f
LDAP: convert all DNs to lowercase so to make comparisons and everything work
2012-05-15 11:12:29 +02:00
568b6a7f56
Make only writable files draggable
2012-05-14 20:41:06 -04:00
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
5cf42b88af
Replace all %2F with a / in private link
2012-05-14 20:21:31 -04:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
d4271ed9df
Use original source when resharing a file, fixes bug oc-210
2012-05-14 17:31:03 -04:00
954d4e5200
No need to keep the 'source files' in here, because the latest 'git master' release can be pulled
...
from http://mozilla.github.com/pdf.js/build/pdf.js
README added to document the fact stated above
update.sh added for easy update of pdfjs
CAUTION:
Don't update before OC4! API has been changed and we need to adopt files_pdfviewer
2012-05-14 23:21:29 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
e03c5f39a8
Call is_writable explicitly on folders for readonly check
2012-05-14 16:31:00 -04:00
e74f4b406f
Remove logging.
2012-05-14 17:50:24 +02:00
9b3d8660eb
Contacts: Had forgotten to call local function.
2012-05-14 17:49:33 +02:00
de850dfa52
Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P
2012-05-14 17:49:33 +02:00
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
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
84827ff992
some fixes for calendar's export.php
2012-05-14 15:52:24 +02:00
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
0c8740c1d5
LDAP: and don't forget the else part
2012-05-14 13:13:08 +02:00
82cfb3e0f5
LDAP: don't store agent password in plain text
2012-05-14 12:58:58 +02:00
2e34673989
LDAP: no whitespaces after the , in the DNs, resolves conflicts with some servers
2012-05-14 12:25:33 +02:00
1f2b37c08b
Contacts: Photo upload handlers wern't being loaded for new contacts.
...
Name conflict with two FileUploads :-P
2012-05-14 11:08:00 +02:00
3514ec5947
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-14 10:52:25 +02:00
1fc74ea174
Add ctmp extension to blacklist to make sync test files not versioned.
2012-05-14 10:51:41 +02:00
40f91d9f7c
Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated.
2012-05-14 10:13:45 +02:00
6d37f9b951
Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways
2012-05-13 21:10:27 -04:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
0fb90fa875
set public handeler in info,xml for sharing
2012-05-14 00:28:27 +02:00
4e1e978b89
Contacts: Forgot one file for the import fix.
2012-05-13 23:27:14 +02:00
9295f49553
Contacts: Add error checking and reporting to import from files app.
2012-05-13 23:27:14 +02:00
1629c77eb5
Validate bookmark inputs, fixes bug oc-636
2012-05-13 16:58:47 -04:00
90518e8d2a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-13 20:50:19 +00:00
b80b8656eb
Third time lucky fixing google font include
2012-05-13 20:49:54 +00:00
8a42d159f7
Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2.
2012-05-13 16:45:03 -04:00
ddb8d1460b
Revert "Remove google webfont include"
...
This reverts commit 30d31fecd9
2012-05-13 20:43:20 +00:00
21dfe9dc5e
Fixed keyboard shortcut for saving files. Thanks adlr in #ace!
2012-05-13 20:19:20 +00:00
30d31fecd9
Remove google webfont include
2012-05-13 19:41:41 +00:00
78ecfc89a7
Fix breadcrumb path
2012-05-13 19:33:42 +00:00
ddf0903ace
add post user delete hook for calendar sharing
2012-05-13 20:03:52 +02:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
da9486157d
Merge branch 'master' into calendar_repeat
2012-05-13 19:10:49 +02:00
0892abd050
some little js fixes for drop import
2012-05-13 15:08:27 +02:00
62a86748b5
Merge branch 'master' into calendar_dropimport
2012-05-13 15:06:02 +02:00
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
5ac10a9c0e
hide share tab for new events, because you can't share an event that haven't got an id yet
2012-05-13 12:28:28 +02:00
f45411f79d
fix another php notice
2012-05-13 12:25:26 +02:00
85cc34fd05
fix another php notice
2012-05-13 12:14:08 +02:00
f6dc158d51
fix php notice and displaying of events
2012-05-13 12:02:36 +02:00
56bd3f1220
Revert "Edited combobox to adhere to coding standards and added a dblclick handler."
...
This reverts commit 19b55d3fce
2012-05-13 06:22:15 +02:00
996020d82b
Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
...
This reverts commit a36a8faad4
2012-05-13 06:22:15 +02:00
dfef36ba2f
some changes for calendar repeat class
2012-05-12 23:16:11 +02:00
b1cae9651e
add functions get cached events in a specific time period
2012-05-12 23:00:21 +02:00
dc34ed5a12
Merge branch 'master' into calendar_repeat
2012-05-12 22:55:35 +02:00
546ae30421
non-minified version added
2012-05-12 20:56:29 +02:00
51cb1c9ffa
fixing file headers with copyright
2012-05-12 20:46:07 +02:00
19b55d3fce
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-05-12 13:43:34 +02:00
a36a8faad4
Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)
2012-05-12 13:43:33 +02:00
ab9927d5fc
oc-627, calling base function instead of loading too much useless functions
2012-05-12 13:25:04 +02:00
b4e7c05959
Encoded slashes (%2F) don't look pretty in our private link urls
2012-05-11 20:58:21 -04:00
faebee5f25
Turn async off when fetching users to make sure the users get removed from the select form
2012-05-11 20:39:48 -04:00
d07512c82d
fix gallery previous not showing
2012-05-12 00:37:19 +02:00
736739bbbd
load remote and public paths from info.xml during upgrade instead of setting them every time
2012-05-11 20:33:56 +02:00
3c2af95108
LDAP: offer only ownCloud-enabled users for sharing
2012-05-11 19:21:13 +02:00
8e5240d579
Contacts: Make the structured name dialog modal to avoid confusion.
2012-05-11 18:21:55 +02:00
646a4bd635
Contacts: Clone event handlers as well.
2012-05-11 18:21:55 +02:00
08e0b6cf5e
Contacts: Also strip parameters.
2012-05-11 18:21:55 +02:00
d98d72aa99
improved url generation - made use of OC.linkTo() for linking to versions history page
2012-05-11 17:13:58 +01:00
f0362dbf58
register public.php?service=host-meta
2012-05-11 17:25:32 +02:00
9469c9947f
fix warning 'unknown var appsDir'
2012-05-11 16:59:44 +02:00
7efa7171e3
LDAP: wrong assumptions for case (in)sensitivity, implement far better solution
2012-05-11 15:42:57 +02:00
3fd2e0d2ce
correct host-meta mime type
2012-05-11 15:27:11 +02:00
4c02a82f6c
move lrdd to jrd
2012-05-11 15:26:45 +02:00
b133f22d7f
move host-meta to JRD because I can't work out how to deal with ampersands in XRD
2012-05-11 15:21:45 +02:00
a95c1b8082
fix auth dialog includes
2012-05-11 15:21:45 +02:00
03fad97764
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
61d535984d
clean up auth dialog
2012-05-11 11:05:44 +02:00
2e309aae97
announce OAuth2 implicit grant end-point the new way
2012-05-11 10:52:37 +02:00
02cee2c562
trying to fix /.well-known/host-meta
2012-05-11 10:47:42 +02:00
0c7f0aa3fa
attempt to align the webfinger app with new public.php routing
2012-05-11 10:26:30 +02:00
59a2616105
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
2012-05-10 23:04:27 -04:00
20d9a8b6a1
Fix accidental creation of duplicate files because of extra / in search results
2012-05-10 22:04:05 -04:00
a3f250bfe6
Fix text files for search results
2012-05-10 21:44:04 -04:00
0c86f8a61e
Fix image previews for search results
2012-05-10 21:36:17 -04:00
daff3aa667
Prevent overwriting of private link status
2012-05-10 21:06:45 -04:00
60103d9b94
Only mount shared storage after a user has logged in, fixes shared folder not appearing for some WebDAV clients and sync client
2012-05-10 19:56:41 -04:00
e5840e1fe2
Contacts: Hack to add structured name from formatted name.
2012-05-11 01:14:11 +02:00
aa51639271
Contacts: Fix check for version.
2012-05-11 01:14:11 +02:00
78c11700f9
Added some margin.
2012-05-11 01:14:11 +02:00
4094f6f8e0
Correct undef variable mistake from prev commit
2012-05-10 19:51:03 +00:00
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
ffe5ef2268
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
7bc6e86969
Contacts: Fix some regressions from last commit.
2012-05-10 20:44:12 +02:00
3c6c8ecab0
Make email private link submit on enter as well
2012-05-10 11:44:06 -04:00
2c6740b0c7
Some UI and code restructering according to usability tests: https://mail.kde.org/pipermail/owncloud/2012-May/003194.html
2012-05-10 16:53:25 +02:00
ddd991a59e
Minor css fix.
2012-05-10 16:42:10 +02:00
e3f452cf53
larger clickable area for new button
2012-05-10 14:08:08 +00:00
2ae37b32d4
fixing background for clicked new button
2012-05-10 13:44:30 +00:00
8fc565821f
reduced text shadow brightness
2012-05-10 13:37:48 +00:00
46b1f35107
highlight the files new and upload button all the time
2012-05-10 13:34:44 +00:00
7a5028317d
LDAP: don't fall over case insensitive LDAP attribute name
2012-05-10 12:59:20 +02:00
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
9a66b869c0
Gallery: Use App storage instead of contructing our own path
2012-05-10 09:14:27 +02:00
b022ccb863
Whitespace fixes
2012-05-10 09:14:26 +02:00
ac2e0cd6e4
Implement default functions in OC_User backend
...
Simplifies calling these functions, and makes code simpler
functions:
deleteUser
getUsers
userExists
2012-05-10 09:14:26 +02:00
94803dc222
Gallery: No short tags
2012-05-10 09:04:10 +02:00
2062ebacef
Gallery: Show thumbnails after document is ready
2012-05-10 09:04:10 +02:00
93c0e8b3bf
Fix unsharing files also deleting private link, bug fix for oc-251
2012-05-09 17:38:35 -04:00
de6aa0f88c
Use a clean uri param constructor to get files
2012-05-09 21:35:59 +00:00
98cd98e2e5
Skip over users that have already been shared with when sharing with a group
2012-05-09 17:16:31 -04:00
d4636f4b86
Fix renaming of shared files if target already exists, bug fix for oc-81
2012-05-09 17:01:46 -04:00
2e826fa82a
Go back to updating mtime of shared folder to invoke a file cache rescan
2012-05-09 16:20:38 -04:00
3e57e76c48
fix creating the shared folder when the user home folder is not in the root mount
2012-05-09 20:36:08 +02:00
14b240a3f4
Still trying to fix some sharing use cases
2012-05-09 13:51:52 -04:00
a589a700e1
revert 000d7ba975
2012-05-09 18:34:44 +02:00
99db3c01ee
fix bug in events.php
2012-05-09 17:36:48 +02:00
890c57bad5
fix requires in apps/remoteStorage/ajax/revoke.php
2012-05-09 15:40:39 +02:00
4de182c7af
bearer token should be the whole thing, not the http basic pass
2012-05-09 15:28:30 +02:00
9d443e021d
new requires in WebDAV.php
2012-05-09 15:28:30 +02:00
2cf5bb6849
new requires now necessary
2012-05-09 15:28:30 +02:00
7d090a45d2
attempt at reusing access tokens
2012-05-09 15:28:30 +02:00
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
000d7ba975
fix bug in calendar
2012-05-09 11:53:16 +02:00
eb7e2d7d35
Sharing: even if a user has more groups in common, he should appear only once in the dropdown list
2012-05-09 11:35:36 +02:00
fae1ce4ea7
Correct file move by dropping on folder
2012-05-08 22:07:14 +00:00
c1490239e5
LDAP group: support for memberUid, fix for oc-594
2012-05-08 23:49:33 +02:00
7dcf38c40f
Better checking of ajax paramters and better logging
2012-05-08 19:48:28 +00:00
41d0308806
Change label for saving bookmark button
2012-05-08 19:04:06 +00:00
4f88fadbc1
Add remote for media/tomahawk.php
2012-05-08 18:40:40 +02:00
da1da8197e
Calendar: Resize content after creating calendar layout
...
The calendar can be higher than the window, this corrects for the scrollbar
2012-05-08 18:40:40 +02:00
fa4a52260f
Try to correct query string url for search in bookmark
2012-05-08 16:22:35 +00:00
f6df71b74d
Set Content-Disposition to attachment for shared private links
2012-05-08 10:27:02 -04:00
9dee2a6b2c
LDAP: settings for group filter, fixes oc-587
2012-05-08 14:44:29 +02:00
c067cfc3b5
, not .
2012-05-08 14:09:38 +02:00
d01db3a807
LDAP: make sure, configuration is read when a public method needs it
2012-05-08 14:02:16 +02:00
5dee914ed2
LDAP: sqlite compatibility
2012-05-08 13:56:07 +02:00
251a6d1a9f
LDAP: write to log in case bind fails.
2012-05-08 12:04:52 +02:00
cdf5d4e231
fix for previous commit
2012-05-08 08:49:14 +02:00
0ce1cbdd14
fix calendar vulnerability
2012-05-08 08:46:27 +02:00
010b97febd
Avoid touch operation when unshare public link
2012-05-07 22:37:18 +00:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
9b5e0bebef
fix path for ampache in settings
2012-05-07 20:47:32 +02:00
5b7cefb1e5
make ampache work with remote.php
2012-05-07 20:26:09 +02:00
5a1ea62437
LDAP: Fall back to Base DN if user/group base settings are blanked
2012-05-07 18:38:02 +02:00
bf8b3b0696
Forgot to set token variable
2012-05-07 12:36:29 -04:00
e9c7ecf22d
applying coding guideline
2012-05-07 17:35:23 +02:00
0ff5ab65be
applying coding guideline
2012-05-07 17:35:23 +02:00
e0a5f976e7
Fix bug oc-542, encode urls for private links
2012-05-07 11:30:36 -04:00
71423ec566
Fix bug oc-402, check if token is set for a private link
2012-05-07 10:47:55 -04:00
b9033d3b78
Only load sharing statuses if in files app
2012-05-07 10:47:55 -04:00
f28d71bb9c
fix gallery sharing
2012-05-07 16:46:35 +02:00
ef073a148f
make calendar compatible with public.php
2012-05-07 15:48:41 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
5904d5cf50
Merge branch 'remote.php'
2012-05-07 15:07:16 +02:00
1138df0f4b
fix webdav, bloody merge conflicts
2012-05-07 12:47:34 +02:00
6bdbcc1f49
fix path of carddav in addressbook management
2012-05-07 12:18:58 +02:00
b125caaaf6
fix path of caldav in calendar management
2012-05-07 12:16:25 +02:00
ef10603c26
fix pathes in calendar and contacts
2012-05-07 12:02:20 +02:00
46fe2e3e2a
fix merge conflicts
2012-05-07 11:47:14 +02:00
7d2a68fc31
make carddav work with remote.php
2012-05-07 11:24:19 +02:00
8534373f2f
better invalid webfinger URI handling
2012-05-07 11:15:24 +02:00
3a184e2e1d
whitespace correction in webfinger.php
2012-05-07 09:51:37 +02:00
c4e47953ac
require base lib and deal with malformed user addresses in webfinger.php
2012-05-07 09:46:15 +02:00
5155f589fd
prevent xss in webfinger
2012-05-07 09:26:54 +02:00
2d581c675f
Audit: Log sharing actions
2012-05-07 09:04:07 +02:00
a2df8a4746
Audit: Log messages with separate function
2012-05-07 09:04:07 +02:00
1e12db35ee
Audit: Add user login/logout logging
2012-05-07 09:04:07 +02:00
640ba1828f
Start of audit app
...
Audit the filesystem action
2012-05-07 09:04:07 +02:00
65b9850e53
Code cleanup.
2012-05-07 04:46:09 +02:00
471cad7d90
Remove manual file cache insertions of shared files, update mtime of shared folder
2012-05-06 20:14:29 -04:00
41179a1456
Fix feedback for sharing errors
2012-05-06 19:06:24 -04:00
333345d201
Add php-pdo to soft depend check
2012-05-06 21:42:33 +00:00
fe8b10a922
Add php-xml as dependency for core fix oc-364
2012-05-06 21:38:35 +00:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
2488cdb8a1
Calendar: Fixed image paths.
2012-05-06 19:19:16 +02:00
5bf69cace1
Contacts: Re-added some styling that got lost in a revert.
2012-05-06 19:19:15 +02:00
9dbc6b5158
Correct wrong DB quotes for calendar share functions
2012-05-06 15:41:14 +00:00
bede32be24
Contacts: Fix for Android browser again, again.
2012-05-06 13:51:16 +02:00
c1019a6e98
Contacts: Resized Add button. Now how do I add a gradient? ;-)
2012-05-06 13:51:16 +02:00
400ade063c
Revert Android positioning 'fix'.
...
This reverts commit 20f1c1e6ca93ae945414
2012-05-06 13:51:16 +02:00
f2ec68d40c
Revert "Contacts: Fix for leftcontent positioning in Android browser."
...
This reverts commit 93ae945414
2012-05-06 13:51:16 +02:00
f69f764e8b
Working remote.php with webdav and caldav
2012-05-06 00:12:51 +02:00
c996600786
push changes
2012-05-05 22:54:14 +02:00
6c2fc0cbe8
fix writing of webdav.php
2012-05-05 20:43:11 +02:00
aa4f01fbcc
fix pathes for cal andcarddav
2012-05-05 18:58:58 +02:00
4b4c3c3f3a
remove debug messages
2012-05-05 18:58:58 +02:00
24a8451b2e
Tasks: Fix addtask for <5.4 php version
2012-05-05 18:48:24 +02:00
101406eba7
fix writing in remote folder
2012-05-05 18:29:26 +02:00
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
2092caf6d3
Tasks: Fix add task action
2012-05-05 18:16:14 +02:00
70cb053e6b
improve cryptstream fro writing non-chunksized data
2012-05-05 16:49:48 +02:00
d875191777
only emit the filesystem hooks once when creating a new file
2012-05-05 16:49:48 +02:00
4a7591d0ab
Custom icons for contacts app
2012-05-05 16:31:58 +02:00
74a0df335a
Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing
2012-05-05 15:23:48 +02:00
eda42cece9
Contacts: Don't try to render invalid properties.
2012-05-05 13:49:47 +02:00
f9aadfff7a
Contacts: Set min-width on note to make it render correctly.
2012-05-05 13:49:47 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
2c264f836c
Contacts: Better checks for GD library.
2012-05-04 23:53:29 +02:00
d0b7b01737
Tasks: Some styling
2012-05-04 20:57:37 +02:00
19d2b94837
Tasks: More updates to public API
2012-05-04 20:20:37 +02:00
76b8d06284
Add missing file.
2012-05-04 20:17:15 +02:00
1fef13b0c0
Calendar: Use array_merge to join event arrays
2012-05-04 17:34:13 +02:00
eae21f3269
Tasks: Fix ajax calls in javascript
2012-05-04 17:27:10 +02:00
0006b432f5
Tasks: Update for movable apps
2012-05-04 17:20:24 +02:00
439467746a
Tasks: Update to new public API
2012-05-04 17:19:25 +02:00
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
01da64caf7
Contacts: Changed the Add property button to not fixed and use plain button.
2012-05-04 16:36:45 +02:00
248eae2d0f
Contacts: Improve NOTE UI. Cleanup markup.
2012-05-04 15:47:55 +02:00
907fa9d85b
LDAP: check first, if requested attribute exists
2012-05-04 14:13:23 +02:00
716c5a3c8e
LDAP: use the correct attribute for the display name
2012-05-04 14:02:04 +02:00
231eec7325
LDAP: also those functions were not meant to be static
2012-05-04 13:48:55 +02:00
6c670cb82d
LDAP: more cleanup
2012-05-04 13:48:18 +02:00
333e8986f6
LDAP: copyright stuff
2012-05-04 13:26:07 +02:00
def59755ad
LDAP: cleanup
2012-05-04 13:26:07 +02:00
adb32ad347
LDAP: checkPassword ain't static
2012-05-04 13:26:07 +02:00
594221a467
LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
3499783ea5
remove debug info
2012-05-04 13:26:07 +02:00
7aad40ca4d
LDAP: make oc_user_ldap::userExists make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
6f982d2e20
LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
7a06e144ec
LDAP: central function for user and group list retrieval (will replace retrieveList from group part)
2012-05-04 13:26:07 +02:00
2296521a2e
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
2012-05-04 11:16:29 +02:00
e61e40c23d
Contacts: Hack around malformed BDAY.
2012-05-04 01:27:59 +02:00
bde5b4a7ff
Contacts: Don't load event handlers more than once, or you're asking for trouble :-P
2012-05-04 00:13:35 +02:00
07ff1e723a
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
89c8316f8f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2012-05-03 23:26:43 +02:00
077ea94f71
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
...
Conflicts:
apps/calendar/ajax/events.php
2012-05-03 23:18:43 +02:00
76a60a2fc3
ups, we don't have a CSS file therefore
2012-05-03 23:03:05 +02:00
b6ea57c8b6
Bookmarks: Move delete code to Bookmarks class, also change to use id
2012-05-03 17:33:57 +02:00
8076b1e12d
Contacts: Remove some logging.
2012-05-03 16:01:40 +02:00
a89231ac1d
Contacts: Clean up tipsies.
2012-05-03 16:01:40 +02:00
5be9084c73
Contacts: Fixed paths in import.
2012-05-03 16:01:40 +02:00
cbee0d3128
Contacts: Fix paths and improve markup and css in address book overview.
2012-05-03 16:01:40 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
375ba98645
Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path.
2012-05-03 11:15:44 +02:00
15be032740
Contacts: Improve loading contact.
2012-05-03 11:15:44 +02:00
6cc9f600d2
Contacts: Don't resize profile picture if it's not too big.
2012-05-03 11:15:44 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
80dff77b65
Fix private links
2012-05-02 19:24:43 -04:00
e5ef3e1340
move archive library to core so we can properly depend on it
2012-05-02 23:48:23 +02:00
0b51c53443
run none of the extranal storage tests on default
2012-05-02 23:44:00 +02:00
4ba527625f
don't try to register file actions when we're not in the files app
2012-05-02 23:26:57 +02:00
47081a2471
Gallery: Update version for database update
2012-05-02 21:36:34 +02:00
f7e410147f
Contacts: check for malformed VCards in calendar hook
2012-05-02 21:36:33 +02:00
6d37b8567b
Refactoring and upload support for Google Drive backend
2012-05-02 14:41:57 -04:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
eec7c3833c
fix install
2012-05-02 19:02:41 +02:00
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
33c343ed11
add require_once('../lib/base.php'); to webdav.php
2012-05-02 16:47:25 +02:00
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
f1830866a3
Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup.
2012-05-02 12:10:44 +02:00
72256abf34
Contacts: Trying to improve PHOTO handling a bit.
2012-05-02 11:44:00 +02:00
6750998984
files is not internal any more, part II
2012-05-02 11:26:22 +02:00
8ed8d9cd91
fixing namespace
2012-05-02 00:55:26 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
ab58471904
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-01 20:07:36 +02:00
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
20f3875f1b
Change default from address to sharing-noreply@server for emailing private links
2012-05-01 13:06:17 -04:00
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
f817ff573e
Merge branch 'master' into calendar_repeat
2012-05-01 16:18:55 +02:00
f75a7c084f
add class for repeating events
2012-05-01 16:16:12 +02:00
3f9ac6405a
port some of the log call to the new public api
...
more to come
2012-05-01 14:29:34 +02:00
51b6aab436
LDAP: remove Notices on settings
2012-05-01 12:25:17 +02:00
54854b2e3d
LDAP: decent behaviour and log message when there is no connection to the LDAP server
2012-05-01 12:17:33 +02:00
11314c81d9
add/remove handlers
2012-05-01 10:07:48 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
e409e7cd4c
forgot a file
2012-05-01 09:38:10 +02:00
5193ddd7d7
fixing syntax error
2012-04-30 21:55:25 +02:00
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
f425b80deb
one todo less
2012-04-30 19:21:29 +02:00
b20b30b6fe
Implement a basic versioning configuration. Only a on/off switch for now.
...
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
a8b6fdd396
Contacts: Small css tweaks.
2012-04-30 01:01:24 +02:00
0bccd9c18c
Contacts: Forgot to add the import template.
2012-04-29 23:26:14 +02:00
f6fefe9a36
Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
...
Remove an obsolute file and did some cleanup.
2012-04-29 22:12:27 +02:00
023479b1e2
Contacts: removed unused method and ajax file.
2012-04-29 22:12:27 +02:00
163344243b
jquery.combobox: Added 'showButton' option
2012-04-29 22:12:27 +02:00
b862c49ae6
enable by default. at least during oC4 testing
2012-04-29 21:18:28 +02:00
0d0129221b
add a info.xml to files
2012-04-29 21:17:22 +02:00
84bd83b1dc
fix file deletion
2012-04-29 16:09:41 +02:00
c6f034a5d2
Support "songs" ampache API action for proper rhythmbox support
2012-04-29 00:47:57 +02:00
afeb9d9cbf
moving the file actions properly
2012-04-28 23:11:48 +02:00
bef701c448
add version file to files app
2012-04-28 13:35:05 +02:00
7eb7492360
some fixes for sharing
2012-04-27 23:14:53 +02:00
72c0d6968e
fix duplicated entries on upload
2012-04-27 22:48:27 +02:00
6e7f5ec4ce
Tasks: Add input to edit the task location
2012-04-27 20:26:12 +02:00
c627657fc6
Tasks: Fix the display of the list of tasks
2012-04-27 17:48:08 +02:00
a1b309a42a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-27 13:23:58 +01:00
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
80c850d018
added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts
2012-04-27 13:19:16 +01:00
768041b6cb
Contacts: Added convinience method for notifications.
2012-04-27 10:35:31 +02:00
18c11ec81b
jquery.combobox: Added 'editable' option and cleaned up a bit.
2012-04-27 10:35:31 +02:00
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
f7fb4a54c9
ampache should work now
2012-04-26 22:00:37 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
78b2da583d
move files to the correct place
2012-04-26 21:24:41 +02:00
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
cbba469990
LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers.
...
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.
thanks for the feedback of Kevin van Kuik
2012-04-25 20:35:30 +02:00
0933b5e7ab
use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things.
2012-04-25 20:35:30 +02:00
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
e1cd690a7c
LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though.
2012-04-25 20:35:29 +02:00
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
20f1c1e6ca
Forgot to fix one file...
2012-05-06 00:39:01 +02:00
6c554d0ffa
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
93ae945414
Contacts: Fix for leftcontent positioning in Android browser.
2012-05-06 00:34:08 +02:00
2953f4d11a
Contacts: Removed redundant styles.
2012-05-06 00:34:07 +02:00
b462795be2
added a nice API to get the installes Apps with names, urls and icon from the outside.
...
This is useful for some nice upcoming desktop and mobile integration
2012-05-05 23:42:38 +02:00
565e02d061
Add back removed groups to the select form correctly
2012-05-05 17:10:07 -04:00
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
ef9511c713
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls
2012-05-05 15:18:14 -04:00
d764585d8b
Remove blind effect for email private link in drop down
2012-05-05 14:57:25 -04:00
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
60c0827ba3
Merge branch 'master' into movable_apps
2012-04-25 09:23:01 +02:00
9ee2bb9719
fix js fail in media player
2012-04-25 09:22:19 +02:00
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
a3d0a74d03
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-24 15:38:36 +02:00
69a2173fdb
non working app. moved to the apps-playground repository
2012-04-24 14:00:44 +02:00
b824425186
Added loading indicator.
2012-04-24 11:38:11 +02:00
988f98fc6f
Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)
2012-04-24 11:35:56 +02:00
22f4acadc0
Contacts: In app import (for Chrome and Firefox only)
2012-04-24 01:44:07 +02:00
b8da5c5262
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
2012-04-24 01:44:07 +02:00
dfc94cbe84
Contacts: In app import. Cleanup still needed.
2012-04-24 01:44:07 +02:00
0cd9570277
Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
2012-04-24 01:44:07 +02:00
4ea927a798
wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
2012-04-23 23:54:49 +02:00
b704ff1bc7
Tasks: Simple add task action
2012-04-23 22:13:35 +02:00
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
d1110c62ef
fix file path in apps/media/ajax/api.php
2012-04-23 20:01:48 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
728e6a6bf9
Tasks: Simple categories input
2012-04-23 18:28:44 +02:00
3b9d283245
fix path in apps/files/templats/index.php
2012-04-23 16:25:07 +02:00
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
08fe6bdb27
fix path in /apps/files/js/timezone.php
2012-04-23 16:17:35 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
e8f062dc93
Contacts:
...
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
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
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
260c48c29a
cleanup the admin page layout mess a bit. Still a lot to improve in the future :-)
2012-04-21 23:23:02 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
acea156a3d
Tasks: Save description field
2012-04-20 23:37:42 +02:00
3d68732657
Tasks: Due date without time support added
2012-04-20 22:56:59 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +02:00
1384be4bff
Tasks: Task summary is always text, at it as suchs
2012-04-20 18:19:10 +02:00
70ba428222
Tasks: Make gettasks more robust against malformed VTODO data
2012-04-20 18:18:07 +02:00
c75bbb59a9
Tasks: Add due property handling
2012-04-20 18:16:39 +02:00
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
b39c3d4c4e
make use of the fact that stream_read will always read 8192 bytes for encryption stream
...
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
921fc59d8f
Tasks: Add "more" block containing description
2012-04-18 17:28:16 +02:00
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
4dabd0fb9c
test data for archives
2012-04-17 18:04:06 +02:00
6ba30cb713
Tasks: Clicking task summary opens input for edit
2012-04-17 17:32:21 +02:00
66018b89b2
LDAP: don't forget to unbind
2012-04-16 18:03:02 +02:00
86192c2f8d
checked, works for me
2012-04-16 17:31:39 +02:00
9cd5221d47
group ldap: check configuration
2012-04-16 17:28:58 +02:00
ed54de1bbf
group LDAP: implement groupExists function, needed for Sharing
2012-04-16 16:23:00 +02:00
8afeb0fedb
Tasks: Implement task lists overview
2012-04-16 15:34:14 +02:00
320fde9eec
OC_Group does expect object, not string
2012-04-16 15:09:38 +02:00
899c7631d5
minor code beautification
2012-04-16 15:09:38 +02:00
e1948c651b
use the right attribute for member retrieval
2012-04-16 15:09:38 +02:00
02f4e78f3e
a string be a string
2012-04-16 15:09:38 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
b0e68d039c
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 15:09:54 +00:00
712e25bb02
Update ace
2012-04-15 15:09:37 +00:00
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
9ac65c51f5
dont try to view psd files
2012-04-15 16:26:08 +02:00
fef3434bdf
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 14:02:13 +00:00
738601f4fe
Remove google web font
2012-04-15 14:01:59 +00:00
679ddc0e32
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 16:01:06 +02:00
f36d31f74d
pdfjs updated from github
2012-04-15 15:59:31 +02:00
80f4c4f923
Bookmarks: handle input with & and ?, fixes oc-201
2012-04-15 15:53:40 +02:00
9ee3eb1412
remove unused css
2012-04-15 13:44:43 +00:00
947d2e5705
Tasks: Mark task as complete when checking the checkbox
2012-04-15 15:39:49 +02:00
19d81068f6
Tasks: Code cleanup
2012-04-15 15:38:44 +02:00
b3ae2208b1
clean the collection view after rescanning
2012-04-15 15:19:30 +02:00
cf3bb08dfb
enable archive support on default
2012-04-15 15:19:30 +02:00
9ee931e790
only run archive tests if the test data is available
2012-04-15 15:19:30 +02:00
819af69972
group LDAP: simple basic tests
2012-04-15 14:50:03 +02:00
0a46c7a393
group LDAP: usersInGroup not getUsersInGroup
...
offer static readonly properties
2012-04-15 14:50:03 +02:00
2a03db6065
don't forget changes in lib_ldap for last commit
2012-04-15 14:50:03 +02:00
8a6fa65ed6
group LDAP: implemented getUsersInGroup()
2012-04-15 14:50:03 +02:00
b480071946
group LDAP: implemented getUserGroups()
2012-04-15 14:50:03 +02:00
0912f40ebe
typo
2012-04-15 14:50:03 +02:00
54a9fd2e6a
group LDAP: implemented inGroup()
2012-04-15 14:50:03 +02:00
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +02:00
29bb5d27e4
few pieces of documentation
2012-04-14 18:26:51 +02:00
19243b3e91
give back expected result types as long as logic is not there yet
2012-04-14 18:08:40 +02:00
e160acefe3
test for ldap group backend
2012-04-14 18:08:40 +02:00
61a43419a5
starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class
2012-04-14 18:08:40 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
44c34115a4
Remove go to line
2012-04-14 12:49:31 +00:00
7d1880078c
Merge branch 'master' into tasks
2012-04-14 13:47:56 +02:00
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
5c55b9c5ac
Sharing: Add a filename after public share link
...
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
8ed4606685
LDAP: don't keep possibly outdated passwords
2012-04-14 11:08:50 +02:00
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
0aaaefbb4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-13 20:10:35 +00:00
1165b358b4
Update language string
2012-04-13 20:09:04 +00:00
b9f9228a22
Contacts: Save the category list update when updating/adding contact
2012-04-13 21:13:58 +02:00
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
b654121b50
Contacts: Better error reporting.
2012-04-13 18:50:40 +02:00
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
8686667b10
some idexes for the media player tables
2012-04-13 18:49:50 +02:00
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
e9c1f8b4e6
Contacts: No need to sort the categories anymore
2012-04-12 23:10:49 +02:00
43ba23430d
Contacts: Change "category" to "group" in UI
2012-04-12 23:10:49 +02:00
78189e2247
Contacts: update category list when the categories change
2012-04-12 23:10:49 +02:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
5fa90cd214
Contacts: Also initialize org var in updateValuesFromAdd
2012-04-12 23:10:49 +02:00
86edc0da31
Contacts: add space before parameter
2012-04-12 23:10:49 +02:00
fa853102e4
Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
...
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
48f99fe661
off by default. great tool for developers but confusing for users.
2012-04-12 20:23:45 +02:00
bd262eaac0
Fixed OC-261 by modifying js files in apps/media/
2012-04-12 17:56:53 +02:00
d9aa31fd92
Use OC_Helper::serverHost() in openid settings
2012-04-12 17:51:17 +02:00
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
2dfa02a346
Contacts: fix function names to coding standard
2012-04-10 21:53:36 +02:00
3f6e971571
Contacts: Don't lowercase categories value when saving
2012-04-10 21:19:39 +02:00
fd72556fd1
Contacts: Make part.no_contacts.php translatable
2012-04-10 21:15:38 +02:00
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
47f94548ce
don´t enable by default. still broken
2012-04-10 15:05:33 +02:00
6cf3f10d35
fix includes
2012-04-09 22:51:53 +02:00
b0894b3148
Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do.
2012-04-09 22:10:29 +02:00
4fda6af725
Contacts: Fix for not being able to add contact to empty/non-existant address book.
2012-04-09 16:30:58 +02:00
9c247ce874
Removed padding.
2012-04-09 16:30:58 +02:00
53091551d8
Re-added file I had accidentally removed earlier :-P
2012-04-09 16:30:58 +02:00
ecc596534a
Decode json response for admin exports
2012-04-08 19:08:17 +00:00
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
00449cdf37
rename admin_export -> admin_migrate
2012-04-07 17:23:25 +00:00
23d39f7ef0
Display errors on import
2012-04-07 16:13:18 +00:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
b71cf1a4f9
Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
2012-04-07 16:03:43 +02:00
660951dc64
Add some filetypes
2012-04-07 13:32:00 +00:00
a098c7c685
Give editor focus after saving
2012-04-06 21:38:38 +00:00
22466010fc
Provide undo when closing editor with unsaved changes
2012-04-06 21:37:28 +00:00
2fe0716cb4
Show nice errors
2012-04-06 20:52:41 +00:00
60e3b563e2
webdav needs to load authentication apps
2012-04-04 12:41:32 +02:00
dd4e577f6d
Contacts: l11n for geo autocomplete. Not sure if it works though.
2012-04-03 08:13:10 +02:00
fc555b48ec
Contacts: Added autocomplete using geonames.org.
2012-04-03 07:29:47 +02:00
b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
adc9d906e4
confirm close when there are unsaved changes
2012-04-02 17:44:15 +00:00
dc499c5b4e
add * to filename when changes have been made
2012-04-02 17:27:06 +00:00
d0cb99e347
use OC_Dialogs instead of alert()
2012-04-02 16:35:11 +00:00
33c1fa6e28
webfinger protocol compatible + minor changes
2012-04-02 17:12:52 +02:00
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
d896c19011
cal import should group events by uid, export should have correct newlines, fix for oc-384
2012-03-31 20:16:42 -07:00
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
3e84d85482
remove debug
2012-03-31 22:50:57 +00:00
aba3182a7d
Fix loading image after export failure
2012-03-31 22:47:38 +00:00
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
f9f91a08b4
webfinger reimplementation started
2012-03-31 02:42:41 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
5161758921
create static host-meta instead of symlink and .htaccess
2012-03-30 21:35:09 +02:00
6abb2cb92e
fix sharing nested galleries
2012-03-30 21:14:01 +02:00
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
e3203f87ff
Merge branch 'master' into calendar_sharing
2012-03-30 18:42:09 +02:00
284955573c
clarifying remoteStorage description
2012-03-30 18:18:37 +02:00
dde5660915
renamed Gallery to Pictures, still needs to be changed in the code to also reflect in the path
2012-03-30 18:18:37 +02:00
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
f74d11c0c3
fix gallery sharing when root is not /
2012-03-29 20:45:21 +02:00
4b3282b325
Contacts: Removed obsolete code.
2012-03-29 15:36:04 +02:00
11f7eeb63a
Improve actions on delete.
2012-03-29 15:25:24 +02:00
b559952806
Cleanup stylesheet.
2012-03-29 15:25:24 +02:00
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
72882beb0d
enble browsing tar files in the web interface
2012-03-28 23:53:51 +02:00
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
e57de98bbe
add extract all option to OC_Archive
2012-03-28 23:47:44 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
0d16f177cb
add scrollbar to the music list - bugfix for oc-301
2012-03-28 16:21:54 +02:00
34a0128ddf
whitespace indentation fix
2012-03-28 16:12:34 +02:00
bcda46eda3
webfinger installation creates symlink in document root
2012-03-28 16:07:50 +02:00
bd4fd76bfb
Fix bookmarks migration provider
2012-03-27 21:35:29 +00:00
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
cb2dd97509
Trigger autocomplete wo button.
2012-03-27 12:30:20 +02:00
fa165498cc
Improvements in adding/deleting properties.
2012-03-27 12:30:20 +02:00
ff038f8766
Contacts: Update contact list thumbnail when deleting PHOTO.
2012-03-27 12:30:20 +02:00
ff75d65d7e
Merge branch 'master' into calendar_sharing
2012-03-27 09:29:16 +02:00
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
eb3ec05f88
fix gallery scan when an image cant be loaded
2012-03-26 23:56:07 +02:00
73c6db5c8e
crop and resize in a single step when creating thumbnail
...
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
3f881f1ca5
memory cleanup in gallery
2012-03-26 22:40:38 +02:00
60a939dfcf
Small change and muting debug.
2012-03-26 22:26:06 +02:00
0da988a1bb
Check for empty value.
...
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
ee31bc7995
Contacts: Fix saveproperty for categories
2012-03-26 21:47:37 +02:00
a867bcab46
Merge branch 'master' into calendar_sharing
2012-03-26 21:46:40 +02:00
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
34c08b3165
Add test for Google Docs storage backend, tester needs to token and token secret to config
2012-03-24 15:46:28 -04:00
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
c23090b43c
spaces to tabs in bookmarks
2012-03-24 19:55:44 +01:00
a3125f164e
bookmarks tag placement & list width fix
2012-03-24 19:55:43 +01:00
826cb2c650
fix sharing address construction in opera and firefox
2012-03-24 19:26:53 +01:00
be60b451eb
fix albums thumbnails preview for opera
2012-03-24 19:21:36 +01:00
afcf965498
fixup: sharing gallery for loggedin users fail
2012-03-24 18:40:27 +01:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
e0cbefc727
webdav storage backend
2012-03-23 18:55:26 +01:00
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
b63b377c4d
Bookmarks: make link text click clickable too - bugfix for oc-131
2012-03-23 16:58:48 +01:00
45b320d674
use unnamed as title for a bookmark if no title was entered and curl fails
2012-03-23 16:54:15 +01:00
37963fee28
Merge branch 'master' into calendar_sharing
2012-03-22 20:40:20 +01:00
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
82b54938e3
ftp storage backend
2012-03-22 19:56:19 +01:00
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
07d7138df0
Register admin pane
2012-03-20 20:34:20 +00:00
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
19bbb61b20
fix spelling fail in texteditor's style.css
2012-03-20 19:48:08 +01:00
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00
194211500b
register text/x-vcard as a fileaction for vcard import
2012-03-19 09:58:44 +01:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
ddb7197c9c
Merge branch 'master' into calendar_sharing
2012-03-18 00:53:02 +01:00
de09883d86
creating and retrive thumbnails for intermediate galleries
2012-03-17 23:41:10 +01:00
bc085c3ff4
Create new user, create new data dir, copy files, import app data
2012-03-17 16:25:14 +00:00
5234e66bab
Add exportinfo to user exports.
2012-03-17 13:53:00 +00:00
27bf34f7be
Move user import to the admin
2012-03-17 13:30:58 +00:00
eaa1074ccb
Merge branch 'master' into calendar_sharing
2012-03-17 13:59:00 +01:00
122f7e4c2f
Dont truncate the time format
2012-03-17 12:41:16 +00:00
8e22823501
bredcrumb fix
2012-03-17 13:30:45 +01:00
222bb2303f
Added prototype of user import
2012-03-16 22:54:37 +00:00
5332c319a2
Migration info is an object. Other fixes
2012-03-16 22:50:35 +00:00
c442a06a02
Fix export for admin and users. Added 3 admin export types
2012-03-16 21:09:36 +00:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
50233d075c
Improve admin_export ui and move system export cde to OC_Migrate
2012-03-15 20:52:43 +00:00
0fadbee699
fix adding photo to incorrect gallery
2012-03-15 00:09:06 +01:00
193e93e4a9
creating intermediate galleries
2012-03-14 22:28:55 +01:00
c9be325af2
Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method.
2012-03-14 16:43:06 +00:00
a310a81053
move zip creation inside OC_Migrate
2012-03-13 23:09:43 +00:00
a919a136c4
Finish import function for bookmarks
2012-03-13 21:24:07 +00:00
cd2f75fdad
Use data dir from config.php
2012-03-13 17:27:47 +00:00
0f3eebbbd9
added cleanUp() method to OC_Migrate
2012-03-13 17:18:42 +00:00
7e3b35a57c
fix structure of user export zip
2012-03-13 17:08:20 +00:00
111af7fed5
json encode the output
2012-03-13 17:04:49 +00:00
4d5646a59f
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
2012-03-13 16:21:17 +00:00
4a91c6dbed
Make PHOTO deletable.
2012-03-13 14:56:03 +01:00
9e83f0247f
Added sync path for iOS/OS X.
2012-03-13 14:28:38 +01:00
6b01d7be9a
Fixed NOTE property UI.
2012-03-13 02:55:17 +01:00
dd0daa6e33
Cleanup in Contacts.
2012-03-13 00:55:15 +01:00
551b4443e1
Force load profile pic after edit hack.
2012-03-12 21:56:28 +01:00
60fe9dda5d
Remember categories when they have changed.
2012-03-12 21:55:54 +01:00
1cdb4396a4
Fix copyRows() return value. Generate app info and oc info on return
2012-03-12 18:40:14 +00:00
3efa5f17f2
Rename...
2012-03-12 16:47:29 +01:00
c55d2af6b3
More modifications for using jquery.multiple_autocomplete.
2012-03-12 16:44:16 +01:00
2b8125f4ba
Small fix to jquery.multiple_autocomplete.
2012-03-12 15:30:52 +01:00
d36d317bb2
Contacts: Modifications for using categories.
2012-03-12 14:13:03 +01:00
9c032ecc33
Fix return value of export
2012-03-11 22:20:01 +00:00
fa5a5649c6
Fix copyRows() and sqlite connection
2012-03-11 22:09:16 +00:00
618f92b3fb
fix thumbnail generation
2012-03-11 20:00:50 +01:00
d5959872e1
disabling file handlers in gallery for now
2012-03-11 19:17:51 +01:00
4b8ff4d910
media scanner fix
2012-03-11 17:29:21 +01:00
f6075cc1fe
gallery migration to events system
2012-03-11 16:49:42 +01:00
92221e98de
spaces to tabs
2012-03-11 12:03:41 +00:00
d712d7f52c
Lots of fixes, improve copyRows() method and update settings page.
2012-03-10 18:18:58 +00:00
3ca76d24a9
Add OC_Migrate::copyRows() method
2012-03-10 15:52:38 +00:00
dc3dd272f7
Text editor will now wrap text based on window size
2012-03-10 14:32:57 +00:00
1aaf008020
fix character encoding bug oc-278
2012-03-10 14:06:30 +00:00
3f507898d0
update file extensions in editor
2012-03-10 14:00:57 +00:00
84d6c53970
filecache search comparition fix
2012-03-09 16:28:26 +01:00
2582fe1c89
Yet a missing file :-P
2012-03-09 13:56:20 +01:00
98bf8cfeb6
Added missing template.
2012-03-09 12:11:52 +01:00
2cbd281637
Merge branch 'vcategories'
2012-03-09 10:29:58 +01:00
8228a554a4
Temporarily disabled multi_autoselect.
2012-03-09 10:29:00 +01:00
bc5d9f5868
Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-)
2012-03-09 07:39:35 +01:00
8495e1a63e
Add missing file.
2012-03-09 07:39:35 +01:00
f8b62d49ee
Tasks: Ordering of the task list
2012-03-08 22:27:29 +01:00
d1b2c10422
Tasks: Update task list when adding or updating tasks
2012-03-08 22:26:54 +01:00
700a120c22
fix write hook for gallery
2012-03-08 15:47:49 +01:00
a33a62bf60
Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
apps/contacts/templates/part.contact.php
2012-03-08 02:55:48 +01:00
ae7aab2d6e
Merge gitorious.org:owncloud/owncloud into vcategories
...
Conflicts:
apps/contacts/ajax/saveproperty.php
apps/contacts/lib/vcard.php
2012-03-07 23:38:44 +01:00
91d85e9b16
Use OC.dialogs.
2012-03-07 22:57:37 +01:00
340320625e
Contacts: Add UI for categories
2012-03-07 21:50:55 +01:00
9908adb320
Merge branch 'master' into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
2012-03-07 21:49:46 +01:00
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
9599548203
Contacts: change card parameter type of VCard::edit and VCard::add
...
changed to OC_VObject
2012-03-07 21:46:42 +01:00
97ab706a6a
Contacts: No random token for contactphoto
2012-03-07 21:46:42 +01:00
46aa011ef9
Contacts: Add Organisation as Name property choice
2012-03-07 21:46:41 +01:00
9ccf46d350
Contacts: convert class attribute selectors to class selectors
2012-03-07 21:46:41 +01:00
57c4d39b1e
Fix conflict.
2012-03-07 20:57:05 +01:00
cf5d63f0ab
some js cleanup for gallary
...
also tabs no spaces
2012-03-07 18:58:10 +01:00
d8d2939668
dont use numRows and fix some of the gallary hooks
2012-03-07 17:31:01 +01:00
75323b86d1
Contacts: UI updates and ajax methods for categories.
2012-03-07 16:39:56 +01:00
1d88ab57ec
dont open the album when clicking the remove/rename button
2012-03-07 16:28:57 +01:00
41817db2e2
no rounded borders for album decoration
2012-03-07 16:27:51 +01:00
a4543175ce
make gallary work with archives
2012-03-07 16:24:49 +01:00
fb88bdba69
Ability to save an arbitrary number of external sites
2012-03-07 14:59:19 +01:00
0a78849391
multilevel gallery
2012-03-04 18:28:41 +01:00
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
af214d9dcd
change gallary scanning to support gallaries inside archives
2012-03-03 22:04:34 +01:00
a5df3f8ea7
allow transparent opening of zip files from the web interface
2012-03-03 21:23:35 +01:00
691103acd5
Use json for migration data
2012-03-03 17:30:21 +00:00
34f05ba180
Udpdate bookmarks migration provider. App version included in export.
2012-03-03 14:35:17 +00:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
4c45483ad3
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
2012-03-03 14:30:52 +01:00
188a304625
Replace db on import. Update user_migration export function.
2012-03-03 13:26:01 +00:00
6906988b4e
Update bookmarks migration provider.
2012-03-03 13:22:45 +00:00
23b64cd9ce
remove the archive after a testcase is done
2012-03-03 01:37:00 +01:00
042878a5a9
add archive library and a storage provider on top of the archive library
...
only zip backend is implemented atm
2012-03-03 00:57:52 +01:00
86fed4c226
Update database.xml locations. Fix dbexport.xml.
2012-03-02 22:19:06 +00:00
8188a9f51b
change <create> value in db export
2012-03-02 21:54:44 +00:00
45ef2ecf52
Fix merge conflict
2012-03-02 21:35:48 +00:00
1865659ce1
Fix missing bracket
2012-03-02 21:01:44 +01:00
503e5cada3
Add /dav.php, a single location bundling all *DAV-operations.
2012-03-02 20:25:20 +01:00
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
1471d8f710
remoteStorage app version 0.5
2012-03-01 20:58:14 +00:00
e10402c61b
remoteStorage app version 0.5
2012-03-01 20:55:20 +00:00
5d8d7ef2a1
remoteStorage app version 0.5
2012-03-01 20:55:12 +00:00
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
ec2f49833d
Calendar: Don't request edit form for readonly events
2012-03-01 21:00:23 +01:00
f914cd0144
Implement showing Birthdays of contacts in the calendar
2012-03-01 21:00:22 +01:00
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
642ccd27ab
Bookmarks: fix loading and displaying of the bookmarks
2012-03-01 20:57:11 +01:00
fa6ad6ba68
LDAP: set also quota, when there is no explicit default value
2012-03-01 14:31:06 +01:00
b192f86d84
LDPA: fix setting variables and add missing ones to the array
2012-03-01 14:21:38 +01:00
eb8ffd9315
LDAP fix: set user quota, if attribute is provided
2012-03-01 14:18:28 +01:00
e76e4e7540
add touch() to all storage backands, and make parameter optional
2012-02-29 23:44:05 +01:00
f040ce044c
consider changed/new setting variables for user_ldap
2012-02-29 13:03:44 +01:00
3c72a7c934
make ldap settings a little bit less ugly
2012-02-29 12:57:11 +01:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
ea15c17149
typo in function call
2012-02-28 21:04:56 +01:00
de642697bb
make LDAP filter for user list configurable
2012-02-28 14:12:53 +01:00
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
aae0d990ca
fix baseUri of the Carddav server
2012-02-26 21:46:20 +01:00
089c24e650
fix baseUri of the Caldav server
2012-02-26 21:44:35 +01:00
8c09330959
add missing parameter to addEventListener function - bugfix for oc-225
2012-02-26 21:29:52 +01:00
04c9cc6034
give users the possibility to choose between monday and sunday as first day of the week
2012-02-26 21:23:20 +01:00
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
8148480cfe
dont enable encryption on default
2012-02-26 16:49:57 +01:00
01fcc080bb
dont set the encryption flag for existing non-encrypted files
2012-02-26 15:56:47 +01:00
ff0a542e48
always set encrypted flag when overwriting a file we should encrypt
2012-02-26 15:32:45 +01:00
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
89865cb8a0
stop using 3rdparty services for timezone detection
2012-02-26 13:45:51 +01:00
0af31a5328
missed one is_writeable
2012-02-26 03:56:45 +01:00
c8c3b8a63e
chunked implementation for readfile
...
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
0b19af5e10
application/ogg is music to
2012-02-26 03:42:48 +01:00
a7d7597d55
fix type error in dir creation for categories
2012-02-25 23:15:31 +00:00
42735429da
bump up version and update license
2012-02-25 22:03:14 +00:00
28650191c3
bump up version and update license
2012-02-25 22:01:04 +00:00
820f2f27f6
security hardening in remoteStorage app
2012-02-25 21:59:58 +00:00
a1d03de666
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-25 21:58:59 +00:00
8fe5251029
unicode chars in gallery name fix
2012-02-25 20:38:22 +01:00
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
097ce76fc4
Merge branch 'master' into sabredav_1.6
2012-02-25 16:29:32 +01:00
3cf81cadd5
gallery thumbnail creation fix
2012-02-25 10:03:58 +01:00
7988541476
cleanup pdfviewer app name
2012-02-24 23:54:38 +01:00
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
9df193f051
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
f285790fa1
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
319e93f7fb
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-23 22:06:43 +01:00
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
8f9c852325
Add filtering on category, priority and location
2012-02-23 21:11:31 +01:00
ce4fe9e7cb
Editor fixed.
2012-02-23 20:36:20 +01:00
a62e109e8c
make the location of the 3rdparty folder flexible.
...
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
196d619689
Little bookmark improvement
2012-02-22 23:58:38 +01:00
358fd1c024
Changed text
2012-02-22 23:53:54 +01:00
77493e8d70
Changed bookmarklet to read later widget
2012-02-22 23:52:56 +01:00
996e6cf419
No bookmarks message will now show up if all bookmarks are delted
2012-02-22 23:28:36 +01:00
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
5387820a3b
changed look of bookmarklet
2012-02-22 23:08:50 +01:00
70f9936651
sharing code between the two bookmarklets
2012-02-22 16:38:05 -05:00
814bc2fd2b
make encryption filetype blacklist configurable
2012-02-22 22:20:46 +01:00
c768751c23
Display more information in the task list
2012-02-22 22:06:06 +01:00
f3ebd29661
Fix updating task for new calendar API
2012-02-22 21:15:57 +01:00
18bac944b4
Change loading of tasks to ajax call
2012-02-22 20:21:27 +01:00
92db4f8be0
Update edittaskform for new calendar API
2012-02-22 20:12:54 +01:00
7f754c02f3
Change code from using OC_Tasks_VTodo to OC_Tasks_App
2012-02-22 20:11:38 +01:00
3f87c2cedb
correct header Content-Type: application/xrd+xml
2012-02-22 19:05:41 +00:00
9850820b42
BearerAuth and multiple tokens support in remoteStorage app
2012-02-22 18:05:52 +00:00
6c6b570ff1
avoid notice in error log from user_webfinger app
2012-02-22 18:04:21 +00:00
fd72f2bd29
Removed redundant code.
2012-02-22 16:04:32 +01:00
e2d6bf4c63
Bookmarklet Window closes itself after submit.
2012-02-22 16:04:32 +01:00
d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
499ec15c26
Add icon for tasks app
2012-02-22 13:32:04 +01:00
4af22bfb7a
Merge branch 'master' into tasks
2012-02-22 11:56:24 +01:00
9460c9e907
remove old import.php
2012-02-22 11:53:28 +01:00
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
cff0ac2bf9
better permission check in resize.php
2012-02-22 10:42:33 +01:00
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
c5c843bfef
Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code.
2012-02-21 23:22:06 +01:00
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
d3e6ea6ac0
Bookmarks: uses the core action icons
2012-02-21 20:28:24 +01:00
3d8d6d718b
add 'permissions' as a sql condition in allSharedwithuser
2012-02-21 20:10:52 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
236d2aa5b8
rename updatecalendar to update
2012-02-21 19:42:48 +01:00
e227a65f66
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
70a369e16d
change links in the event form for the new ajax folders
2012-02-21 19:16:14 +01:00
21f8d0992f
Added missing files
2012-02-21 18:29:49 +01:00
7a49c8e59c
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 23:42:06 +01:00
d5f7a39936
Contact list scroll fix
2012-02-20 23:54:23 +03:00
ffdfe8257b
Contacts: Fix adding/updating address book with empty name.
2012-02-20 15:24:54 +01:00
456ada01fa
Contacts: Apply strip_tags on compound values.
2012-02-20 14:36:21 +01:00
12bcbcdc62
Update ctag in deleteFromDAVData.
2012-02-20 14:24:10 +01:00
8ed4262393
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 13:18:22 +01:00
0ae2e250f5
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-20 11:52:19 +01:00
a069d83f44
fix unexspected T-String in calendars index.php
2012-02-20 11:46:10 +01:00
ec7ed3c882
add rw and r to events.php
2012-02-20 11:35:19 +01:00
619c62e681
change parameter names for shared calendars
2012-02-20 11:31:41 +01:00
548a2e6263
add readonly calendar to the eventsources
2012-02-20 11:28:20 +01:00
3efa69bc84
update js files for new ajax pathes
2012-02-20 11:27:25 +01:00
1cf7fc261f
better var name in changeview.php
2012-02-20 11:26:43 +01:00
8dff0fb58d
add moved files to clean up ajax folder
2012-02-20 11:26:22 +01:00
ceb0016bdc
remove old ajax files
2012-02-20 11:25:42 +01:00
7ff4e40b20
Combing LDAP backend with LDAP extended backend
2012-02-20 10:39:55 +01:00
490c9db15d
Added bookmarklet for browser. Inspired by Google Bookmarks
2012-02-19 20:18:27 -05:00
c62673d360
Added public static OC_VCategories object to OC_Contacts_App.
...
Parse cards for new categories in add and edit methods.
2012-02-19 23:32:09 +01:00
9d2379742b
apps/calendar: update ctag after deleteFromDAVData
...
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
71a2241aee
Fixed call to OC_User. Thanks Burillo on IRC
2012-02-18 23:53:10 +00:00
2ee2f87efe
Strip tags on address on client side.
2012-02-18 11:49:31 +01:00
868cf6bb83
Avoid errors from missing GD library.
2012-02-18 11:49:31 +01:00
96612c506e
Removed obsolete commented code and made minor speed improvements.
...
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
d8734cee02
fix sql command
2012-02-18 11:21:07 +01:00
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
dab5531474
Bookmarks: Fix image urls in bookmarks.js
2012-02-17 22:07:15 +01:00
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
5f3c549227
Contacts: Add removed app enabled check
2012-02-17 22:07:14 +01:00
011bc1e764
fix unsharing of groups
2012-02-17 21:19:04 +01:00
62da0bae43
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
2012-02-17 14:32:02 +01:00
a3b8d54576
Merge branch 'master' into calendar_sharing
2012-02-17 14:14:53 +01:00
86893ea78c
UI tweaks for name selector combobox.
2012-02-16 10:38:00 +01:00
fa7fabf024
Minor tweaks
2012-02-16 10:38:00 +01:00
e6b835bea8
Update breadcrumb css on close
2012-02-14 21:55:51 +00:00
aec6a3c32f
Fix editing shared files and file opening bug. Fixes oc-209 and oc-195
2012-02-14 21:49:51 +00:00
31dab0372d
Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up.
2012-02-14 13:57:11 +01:00
ae426ad115
Added some check for when addinf deleting contacts.
2012-02-14 10:36:22 +01:00
f7161bb48b
Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227
2012-02-14 02:15:21 +01:00
dc20900e10
Modify check for missing UID.
2012-02-14 01:56:38 +01:00
53503148f3
Use proper index file.
2012-02-14 01:47:18 +01:00
4446854f75
Don't try to load a profile picture for contacts the doesn't have any.
2012-02-14 01:11:21 +01:00
07c422d81d
Removed superfluous debug.
2012-02-14 01:02:01 +01:00
3adaacc0ce
Added OC_Contacts_VCard::moveToAddressBook
2012-02-14 01:00:41 +01:00
024405e4f1
Added function for later testing.
2012-02-14 01:00:41 +01:00
a37bd93222
External: Use OC_Util::checkLoggedIn
2012-02-14 00:13:04 +01:00
777804fac2
Gallery: remove unused cover.php
2012-02-14 00:12:22 +01:00
4cc3a3096a
Server verhindert beim OSX Client einen Delete
2012-02-13 23:48:22 +01:00
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
169ddc5b0b
Gallery: Only get local file when generating photo thumbnail
2012-02-13 22:39:30 +01:00
e137020f67
Gallery: Use OC_Respone::enableCaching for (album)thumbnails
2012-02-13 22:38:34 +01:00
e084386770
Gallery: Move login check to beginning of galleryOp.php
2012-02-13 22:33:52 +01:00
e402896001
Gallery: Remove autoloaded includes from galleryOp.php
2012-02-13 22:33:48 +01:00
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
40d343e2af
fix oc-bug 239 - & => &
2012-02-12 22:34:10 +01:00
5c816c0cc9
Contacts: Optimize thumbnail cache handling a bit
2012-02-12 20:40:52 +01:00
125cf79a37
OC_Response: add setExpiresHeader function
2012-02-12 20:40:52 +01:00
45bb6f5fd4
OC_Response: add redirect function
2012-02-12 20:40:52 +01:00
ee7931f457
Contacts: Add missing parameter
2012-02-12 20:40:52 +01:00
0917bdecdd
Contacts: Move response caching to OC_Response
2012-02-12 17:21:33 +01:00
a0bb6079c5
Add description to texteditor info.xml -fix oc-234
2012-02-12 15:42:05 +00:00
f5385e4a63
Contacts: Add id to vars with id in them
2012-02-12 16:12:46 +01:00
623afb69b6
Contacts: cleanup OC_L10N usage
2012-02-12 16:11:41 +01:00
39f342d595
Contacts: Move debug logging of $_POST to after access checks
2012-02-12 15:58:55 +01:00
6eb1427ac0
Contacts: Document usage of OC_Contacts_App::getAddressbook
...
Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
2012-02-12 15:55:36 +01:00
b77132edbe
Contacts: Save last-modified time in REV property if not set
2012-02-12 15:14:25 +01:00
6bd0aad117
Contacts: Fix adding N property in getContactVCard
2012-02-12 15:14:24 +01:00
facd4cbe17
Contacts: Cleanup photo and thumbnail code
2012-02-12 15:14:24 +01:00
90d189a8b3
Access check fix in contacts/ajax/activation.php
...
plus small cleanup
2012-02-12 15:14:24 +01:00
8f3da6ee9b
Small coding style update
...
Fixup OC_Contacts_App
2012-02-12 15:14:23 +01:00
1a74f0a18c
Improve logging in OC_Contacts_App
...
Add logging to errors paths in getAddressbook and getContactObject.
2012-02-12 15:14:23 +01:00
c4ee924869
Cleanup OC_Contacts_Addressbook::find usage
...
Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
2012-02-12 15:14:23 +01:00
c9db88aa3b
Merge branch 'master' into calendar_sharing
2012-02-12 10:46:34 +01:00
73038156cc
check userrights in events.php
2012-02-12 10:40:57 +01:00
b5418173e5
Derive the user principles from the owncloud users
...
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
db23ec5c1c
show shared calendars
2012-02-11 14:02:51 +01:00
66ac6c232c
fix sharing calendar manager
2012-02-11 13:30:15 +01:00
20b9678789
replace database name and table prefix with default values
2012-02-10 20:23:28 +00:00
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
1d6b4f8f3c
Merge branch 'tanghus_contacts'
2012-02-10 16:44:06 +01:00
b4924ed1e5
Variable wasn't reset.
2012-02-10 16:43:40 +01:00
fd9ce6da35
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-10 16:42:45 +01:00
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
2f80df1f9e
Merge branch 'master' of gitorious.org:owncloud/owncloud into migration
2012-02-10 15:24:26 +00:00
9379c3e128
Gallery: remove unset call, not needed anymore
2012-02-09 22:47:05 +01:00
25f1263c11
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-09 19:07:54 +01:00
ff53b0c209
Keep js data structure in sync on changes.
...
More checks for missing properties.
2012-02-09 19:04:07 +01:00
88b2391d2b
Fix wrong var name in sharedstorage.php
2012-02-08 21:12:31 +01:00
7cd1a302d3
Gallery: Add caching headers to album thumbnail sending
2012-02-08 21:12:31 +01:00
158360c09b
Gallery: use thumbnails of images for the album thumbnail
...
The thumbnails were already generated in this function, but now we save them
for displaying of the album.
2012-02-08 21:12:31 +01:00
43d2266f5c
Add caching to gallery thumbnail generation
2012-02-08 21:12:30 +01:00
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
7c03b612d2
OC-41: [Calendar] Date format not translatable
2012-02-08 21:12:30 +01:00
c4a6b99814
use oc_filecache and oc_eventsource for music scanning
2012-02-08 17:30:16 +01:00
9fd07ee10d
Merge branch 'master' into calendar
2012-02-08 17:13:50 +01:00
36d696c30d
dont load pdfview for ie
2012-02-08 16:28:59 +01:00
5f7727629a
Merge branch 'filesystem'
2012-02-08 15:50:58 +01:00
25faa40bd0
More @£#¤ conflicts
...
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
f4a586a52c
Fix merge conflicts
2012-02-08 09:18:58 +01:00
c191ef6459
Added files for new contact editor/viewer.
2012-02-08 09:14:10 +01:00
0c5eb542bd
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
6112cdc7e8
Hide container for emails/phones/adresses if there are none.
2012-02-08 08:47:03 +01:00
9f1370a6d1
Updated copyrights.
...
Element menu didn't update.
2012-02-08 08:47:03 +01:00
c0c6b5310e
Added files for new contact editor/viewer.
2012-02-08 08:47:03 +01:00
3e9a69b9b7
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
...
Conflicts:
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
424c64c0eb
Don't import cards that can't be parsed by Sabre, but log it instead.
...
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
249e46c5b7
Some fixes for malformed VCards.
2012-02-08 07:59:39 +01:00
4db661ba9d
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
23396721e4
Hide container for emails/phones/adresses if there are none.
2012-02-08 07:59:39 +01:00
1e4444f25b
Updated copyrights.
...
Element menu didn't update.
2012-02-08 07:59:39 +01:00
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
cdf1cf82ba
merge 64a617b2a1 into master
2012-02-07 22:49:23 +01:00
2cebfb50a4
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
5962e66b6d
Hide container for emails/phones/adresses if there are none.
2012-02-06 08:15:23 +01:00
bc79951f33
Updated copyrights.
...
Element menu didn't update.
2012-02-06 08:04:06 +01:00
3af427fa54
Added files for new contact editor/viewer.
2012-02-06 07:32:57 +01:00
89616d81f0
Modification for adding photos.
2012-02-06 07:24:39 +01:00
960dd750c9
Added dbexport to export output. Initial import code.
2012-02-05 23:00:38 +00:00
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
89073970d3
change comments in import.php
2012-02-05 12:13:53 +01:00
8337eaa1ec
add import function for contacts
2012-02-05 12:13:53 +01:00
36bc1a2102
Merge branch 'master' into filesystem
2012-02-05 01:22:29 +01:00
55be59e738
Merge branch 'master' into calendar
2012-02-04 21:34:38 +01:00
5e08d1bb40
Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar
2012-02-04 21:27:18 +01:00
b810380d56
add sharing management for calendars
2012-02-04 21:23:31 +01:00
cfc710e768
preferences store fix
2012-02-04 20:15:55 +01:00
f6a27dfa28
stripping root from gallery name
2012-02-04 15:35:58 +01:00
f1672d7d10
handling special chars in dirnames
2012-02-04 11:02:13 +01:00
5a106d1036
gallery: fix FS hooks
2012-02-04 10:30:32 +01:00
24c79c5bce
Updated Migrate_provider bookmakr implementation
2012-02-03 22:41:39 +00:00
1133eaa679
load bookmarks provider class
2012-02-03 21:28:58 +00:00
ee88ded463
more commenting out for debugging, added logging commands
2012-02-03 21:00:12 +00:00
0bbc9ade7d
fix syntax, add logging, debug xml output instead of zip
2012-02-03 20:48:32 +00:00
8df0650658
gallery settings, defining scan root and shor order
2012-02-03 21:38:44 +01:00
ee01d1a81d
removing console error in safari for bookmarks
2012-02-03 21:37:09 +01:00
5507db9b15
Initial migration code, and basic export for bookmarks
2012-02-03 20:32:06 +00:00
ab31a890b6
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
bfa69c3e59
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00
6225b5ec86
More in-/output sanitation,
2012-02-02 17:54:30 +01:00
66b96e4440
Sanitize in- and output.
2012-02-02 17:54:30 +01:00
f81ac81550
fix merge conflicts
2012-02-02 17:48:29 +01:00
7b9fb84fe9
Merge branch 'master' into filesystem
2012-02-02 17:30:54 +01:00
92b8f32386
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
91b705cc4f
remove debug file
2012-02-02 12:37:58 +01:00
f870f9efcf
validate parameters in changeview.php
2012-02-02 12:18:29 +01:00
9e5172f75c
Merge branch 'master' into calendar
2012-02-02 12:12:48 +01:00
f198296576
gallery works in safari now
2012-02-01 22:15:46 +01:00
f999fbf81a
Bookmark layout updated
2012-02-01 22:02:06 +01:00
bbd10a3c94
Bookmark layout updated
2012-02-01 21:19:31 +01:00
d514b1d92d
Merge branch 'master' into filesystem
2012-02-01 15:57:32 +01:00
6583d30e26
fix javascript
2012-02-01 15:40:59 +01:00
e229a6adec
Added searchprovider for bookmarks, initial l10n support for bookmark plugin
...
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
0124809a42
prevent sharing from making aditional http requests while scanning
...
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
39d312861a
add active to the db structure of shared calendars
2012-01-31 22:33:39 +01:00
2b8ec1cad0
Calendar: fix html of import dialog
2012-01-31 22:03:08 +01:00
153467dbe0
add share as a tab
2012-01-31 21:39:40 +01:00
7b82d153c7
Merge branch 'master' into calendar
2012-01-31 21:35:08 +01:00
3a5d3dfd97
increase version number to force db upgrade
2012-01-31 21:33:50 +01:00
32bff22dc7
change db structure of calendar for sharing calendars
2012-01-31 21:26:09 +01:00
64a617b2a1
fix all day with one day to much - bugfix for oc-126
2012-01-31 20:46:27 +01:00
1f718d31e1
Merge branch 'tanghus_contacts'
2012-01-31 19:35:11 +01:00
6c340416d9
Resize profile picture if bigger than 200px on either x or y.
...
Bolded text on message box.
2012-01-31 19:32:24 +01:00
3f1486534f
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
...
Property was added multiple times.
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8
"Missing "N" field: Contacts app not compatible with vcard 3.0 format"
- Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27
"Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
2012-01-31 19:30:56 +01:00
db1f77e4f5
Some reminders in the code of what I have to change post OC3.0
2012-01-31 19:30:56 +01:00
149bbeb260
make tab names translatable
2012-01-31 17:15:25 +01:00
c72c4dd412
add alarm as a tab
2012-01-31 16:59:34 +01:00
4c1fb4c282
fix style of the tabs
2012-01-31 16:49:21 +01:00
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
538618df62
Merge branch 'master' into calendar
2012-01-31 11:58:40 +01:00
fc70c7094a
add tabs for repeating and attendees in the event form
2012-01-31 11:57:09 +01:00
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
e0f655fb70
Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113
2012-01-30 16:49:24 -05:00
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
5574b87e9b
new gallery look and feel
2012-01-30 19:36:33 +01:00
30f1de71a6
remove debug file
2012-01-29 16:08:09 +01:00
928e9b121b
fix version-compare in calendars app.php
2012-01-29 10:59:15 +01:00
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
830cf87697
use the correct hooks to remove contact/calendars of remvoed users
2012-01-26 19:05:46 +01:00
266fbb442e
use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers
...
fixes broken album covers on shared files
2012-01-26 18:12:59 +01:00
63ae4b3dfc
db cleanup after gallery remove
2012-01-25 21:15:27 +01:00
5172e0a7a3
creating thumbnails on upload, recursive remove
2012-01-25 21:07:43 +01:00
e6298325f6
Removed debug output
2012-01-24 23:08:40 +01:00
5458e52935
Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92
...
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
2012-01-24 23:08:40 +01:00
a77f3a07a1
Fix some issues in ampache resonponse
...
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
cdfb252ced
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-24 00:24:09 +01:00
456394d3ec
oc-89 handling no photos in collection alert
2012-01-23 23:25:36 +01:00
e1a499f65d
disable keyboard shortcuts as temp fix
2012-01-23 20:59:37 +00:00
b8e01939e9
fix undefined indices - bugfix for oc-99
2012-01-23 15:05:53 +01:00
66f8a0e1a3
validate the calendar name
2012-01-21 17:42:52 +01:00
78c5c2e7d5
fix Undefined variable - bugfix for oc-69
2012-01-21 17:42:52 +01:00
01ebb74a33
some gallery css fixes
2012-01-21 00:54:02 +01:00
437d50c6f6
recognizing img basing on extension
2012-01-20 23:28:40 +01:00
97901391f4
make media detection based on extention case insensitive
2012-01-20 19:34:34 +01:00
415e968612
fix renaming albums
2012-01-20 19:32:08 +01:00
b5ae924031
dont show errors when not renaming an album
2012-01-20 19:28:57 +01:00
9dcdf517f5
fix deleting/renaming albums with a ' in the name
2012-01-20 19:26:09 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
735fcf8bd2
only double quoted string seems to be detected in js
2012-01-20 17:47:55 +01:00
1c311c36bf
add translation wrappers to gallery strings in js
2012-01-20 17:09:31 +01:00
42ef44e1b4
show proper feedback that collection scanning is done and show the collection afterwards
2012-01-20 01:41:37 +01:00
6ccb1187df
Don't wrap collection cells.
...
This change makes sure cells are never wrapped.
If the text is too big for the column, ellipsis is
used instead.
2012-01-20 01:14:21 +01:00
d12afe0541
Sort songs also by path.
...
Add song_path in the ORDER BY.
Fix oc-31.
2012-01-20 01:14:01 +01:00
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
ccad24a925
[Calendar] Use class for active view button
2012-01-19 21:00:19 +01:00
838766add0
OC-23: [Calendar] Double vertical scrollbar in week view
2012-01-19 20:50:22 +01:00
ca03a26f15
- Added fix for empty 'FN' field on import via CardDAV clients.
...
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
2012-01-19 19:47:09 +01:00
137c630377
Optimizations and more aggressive caching.
2012-01-19 18:28:17 +01:00
5bd117dd6d
UI fixes in contact editor and address book dialog.
...
Error checking in ajax methods.
Localize menu entry.
2012-01-19 16:07:17 +01:00
dc942d6f3e
Added redirecting to static image file and caching for contacts with no photo embedded.
2012-01-19 16:07:17 +01:00
ce13b3b7cd
fix double new calendar button - bugfix for oc 59
2012-01-19 12:27:16 +01:00
b44a7dc36a
enhancement: oc-36
2012-01-17 20:12:26 +01:00
10aa296895
fix: oc-33
2012-01-17 20:00:12 +01:00
69ca0ae177
move loading icon to the top bar
2012-01-17 19:48:29 +01:00
1f95231801
use button for new calendar
2012-01-17 19:09:11 +01:00
6e86b34586
Merge branch 'master' into calendar
2012-01-17 15:57:29 +01:00
91016e37d4
fix ocbug 34
2012-01-17 15:38:32 +01:00
42b1c75a66
fix ocbug 24
2012-01-17 15:18:01 +01:00
7859c1105c
Apps need to be enabled in order to search through Shared directory for media scanning
2012-01-16 22:18:16 -05:00
de16537231
Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file
2012-01-16 20:16:32 -05:00
1f35c94242
Make media app listen for post_delete instead of delete
2012-01-16 19:52:04 -05:00
2179437726
use timepicker to force users to use HH:MM
2012-01-16 20:22:54 +01:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
b0dbca0cc7
fix export link for contacts
2012-01-16 02:27:59 +01:00
15ea83834d
prevent multiply owncloud instances on the same domain intefering with each others playlists
2012-01-15 19:25:55 +01:00
a44bbd8005
don't use depricated <? use the full <?php
2012-01-15 18:58:08 +01:00
6b50980469
Remove reference to unexisting file in music.css.
...
`img/pbar-ani.gif' is not on the repository.
2012-01-15 18:47:17 +01:00
c81beab96d
Merge branch 'master' into calendar
2012-01-15 18:33:46 +01:00
3364502f00
use svg icon for calendar
2012-01-15 18:29:44 +01:00
07cf709eeb
better scanning model for gallery, more feedback to user while scanning
2012-01-15 15:31:37 +01:00
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
3ec5ffe24e
Simple translation for gallery
2012-01-15 12:15:22 +01:00
5ecc10b756
recursive gallery removing on parent dir remove
2012-01-15 12:15:22 +01:00
ec3955b158
change description of the changed colors (calendar)
2012-01-15 10:58:39 +01:00
cf1023567b
change calendar colors
2012-01-15 10:52:07 +01:00
360778e520
use backslash n instead of a real new line
2012-01-15 00:56:11 +01:00
0e428ec595
fix newline problem in contacts
2012-01-15 00:47:50 +01:00
43f7b2fd2d
fix newline problem in calendar
2012-01-15 00:45:27 +01:00
fed7eef4f3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-15 00:31:23 +01:00
87b46decfa
added bart to the authors in info.xml
2012-01-15 00:30:04 +01:00
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
b1433119cc
highlight the current view
2012-01-15 00:06:26 +01:00
ef69abd4dc
constans for signals handling
2012-01-14 23:13:01 +01:00
b106686382
remove ununsed copy-paste leftovers
2012-01-14 22:27:20 +01:00
0615d096ce
make pdf viewer work with text editor
2012-01-14 22:25:07 +01:00
352d73f1e0
some minor changes to the text editor loading
2012-01-14 21:58:16 +01:00
4cc68eac6d
make pdf viewer work a bit better with the rest of owncloud
2012-01-14 21:38:33 +01:00
bfdbcbee12
Fix breadcrumb issue when closing editor
2012-01-14 15:45:19 +00:00
e979aa0c32
fix editor js
2012-01-14 15:36:57 +00:00
58a781d9e4
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-14 15:31:49 +00:00
e0dc8b8ab2
handle gallery remove when removing dir via webinterface
2012-01-14 15:01:57 +01:00
4d1c414ffb
Merge branch 'calendar'
2012-01-14 14:25:49 +01:00
868cf46290
improve import function
2012-01-14 14:22:30 +01:00
06388e1339
handling directory renaming and thumbnail move on gallery name chenge
2012-01-14 13:52:24 +01:00
a9878dca6d
content divs alignment
2012-01-14 11:19:24 +01:00
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
f9c4975a45
improve import form for calendar
2012-01-13 13:57:46 +01:00
0ba472c18a
Too quick on the copy/paste trigger...
2012-01-12 23:43:00 +01:00
1697347045
Oops. Missing ')' :-P
2012-01-12 22:55:43 +01:00
e60860148c
Don't chunk_split encoded image string.
...
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
22356533a0
Added search. Thanks to icewind it was mostly copy/paste :-)
2012-01-12 22:50:12 +01:00
0d120efda5
Add PRODID to vcards created by ownCloud.
2012-01-12 22:50:12 +01:00
28e15fd487
Merge branch 'calendar'
2012-01-12 22:07:23 +01:00
cd8f54ade2
update js of calendar import
2012-01-12 22:06:53 +01:00
9bcd367873
Merge branch 'master' into calendar
2012-01-12 21:44:56 +01:00
0b45d19ea0
change app icon
2012-01-12 16:50:49 +01:00
c6eeb4a808
Don't add address if none of the fields are filled out.
2012-01-12 02:39:33 +01:00
b71ea287aa
reimplement auto playing music from location hash (like from search results)
2012-01-12 02:02:45 +01:00
8de4163ba2
fix searching artists and albums
2012-01-12 02:01:59 +01:00
25213a790d
fix event handler after re-expanding an artist in collection view
2012-01-12 01:18:27 +01:00
1b5d206ca7
fix expending artists and albums in collection view
2012-01-12 01:14:16 +01:00
f4338f631b
fix searching music
2012-01-12 00:54:35 +01:00
118cbf8400
user suggested style change
2012-01-11 23:54:02 +01:00
afa07beda0
resolving depricated script opening
2012-01-11 23:42:13 +01:00
24dc1aec8e
Tweaked some tipsys.
2012-01-11 23:05:34 +01:00
dddcd66ead
using new image backend, moving ajax calls to one file, using generated thumnails to speedup covers loading
2012-01-11 22:06:54 +01:00
237ba65a20
Localizin strings and adding error checking.
2012-01-11 20:07:15 +01:00
eae3e134ff
Make sure VERSION is set.
...
Set REV for each edit.
Download single VCard.
2012-01-11 06:20:06 +01:00
d93a5a0774
Added files for error messages, removed old syle sheet.
2012-01-11 04:05:30 +01:00
1a6ad816a3
CSS cleanup, more error checking, better error messages, general cleanup.
2012-01-11 04:05:30 +01:00
5500041cca
Added missing }
2012-01-11 04:05:29 +01:00
d92b083c1d
fix old calendar name and color not being preserved when editing a calendar
2012-01-11 01:53:25 +01:00
3c910b812b
also use translated string for music navigation entry when showing inline controls
2012-01-11 01:26:27 +01:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
e316cddf65
More fixes on saving TYPE parameters.
...
Use jQuery Dialog for error messages instead of alert()
2012-01-10 14:59:31 +01:00
2a0ed930ef
improved ui for go to line button
2012-01-09 22:42:28 +00:00
66020c5d44
update page title
2012-01-09 22:38:19 +00:00
6d37c7d351
Added live search
2012-01-09 22:22:12 +00:00
60653c0544
Return standard thumbnail even if contact couldn't be found as it could be because it was just added,
2012-01-09 23:16:07 +01:00
aadb81a32a
OC_DB::insertid was being called too late to get the correct result.
2012-01-09 23:14:11 +01:00
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
27d9cbd8c0
Added 'Go to line' functionality
2012-01-09 21:16:41 +00:00
ac63afbd95
Insert new contacts alphabetically correct in the list.
...
Added some tipsys to the editor.
2012-01-09 22:05:28 +01:00
978a08ab1c
Fixed Phone types not being saved correctly when adding them.
2012-01-09 20:38:06 +01:00
604ca61d78
Some cleanup, better error messages and such.
2012-01-09 20:38:06 +01:00
47548fb8c6
Fixed showing first contact if non is selected.
2012-01-09 20:38:05 +01:00
85ab3b3924
Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-)
2012-01-09 20:38:05 +01:00
d91a4fcaf3
Changed SQL queries for looking up contacts to only query once and sort at the same time.
2012-01-09 20:38:05 +01:00
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
3be0564040
improved ui and save button action
2012-01-09 18:17:26 +00:00
19186bf37b
hide save button for read-only files
2012-01-09 17:22:51 +00:00
18b8dc1c21
fixed saving bug
2012-01-09 17:03:19 +00:00
f7f19af816
Handles file permissions. Protect against overwriting changes.
2012-01-08 23:30:50 +00:00
ccc43f0ea0
merge master into filesystem
2012-01-08 18:01:33 +01:00
ed5fb902bd
remove mp3info from dependency check
2012-01-08 17:35:41 +01:00
13784bee18
mp3info is giving to much trouble, get rid of it
2012-01-08 17:35:40 +01:00
041e3575d1
When a music file is playing, the page title gets modified.
2012-01-08 17:35:40 +01:00
4c91ca2f86
Merge branch 'master' into calendar
2012-01-08 16:42:32 +01:00
9c6248443a
dont overwrite the database with the gallery database
2012-01-08 14:35:23 +01:00
4d1ed7e05f
Improve music playlist rendering.
...
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
artist name, and the album the song is coming from.
No need to split this changeset into three different ones for the sake
of atomicity.
Two first elements were on the priorities / bug list available there:
http://gitorious.org/owncloud/pages/Home
2012-01-08 13:45:44 +01:00
c2392bbace
db overwriting, gallery creating fix
2012-01-08 11:25:08 +01:00
21c4515465
rename fix, licence header added
2012-01-08 11:01:25 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
23f52aa6fd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-08 01:34:50 +01:00
2de3b4bd17
rename and delete hooks
2012-01-08 01:32:11 +01:00
5b57cd310e
Also use track_number to retrieve song track.
...
This adds support for id3v2 tags such as TRACK/TOTAL.
2012-01-08 00:30:57 +01:00
6b95d7427a
Sort results from music collection getters.
...
Albums and artists are now ordered by name, song by track number and name.
2012-01-08 00:30:57 +01:00
e51957b4de
gallery version bump to force db update
2012-01-08 00:22:28 +01:00
9ed3c31fc9
automatic adding of photo to album, feedback for user while scanning, general cleanup
2012-01-08 00:14:34 +01:00
c3cda81577
update calendar pot file
2012-01-07 18:30:32 +01:00
67a8ae084a
fix search function
2012-01-07 14:31:47 +01:00
33847dd101
enable gallery and admin_export by default at least for the alpha and beta.
2012-01-07 13:33:53 +01:00
f18e866a1e
improve search function
2012-01-06 14:36:24 +01:00
db490fbc8f
Merge branch 'master' into calendar
2012-01-05 21:02:58 +01:00
cb445deb5f
fix login check in ajax files
2012-01-05 21:02:11 +01:00
486694c2ec
fix js for repeating events
2012-01-05 20:54:44 +01:00
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
edc9a150aa
fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination
2012-01-05 17:49:09 +01:00
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
a88cc91ad9
fix end for repeating events
2012-01-05 17:05:30 +01:00
e0a058c732
remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard
2012-01-03 17:23:50 +01:00
fe59015126
Merge branch 'master' into calendar
2012-01-03 13:51:55 +01:00
30857b24ea
Merge branch 'master' into calendar
2012-01-02 11:41:18 +01:00
5ccd26959f
remove unused js
2012-01-02 11:39:23 +01:00
e6739d230e
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
65c37abef9
added ace source
2012-01-01 23:29:23 +00:00
536bc3d3c5
add jplayer source
2012-01-01 23:48:38 +01:00
67854a94bf
Removed old code
2012-01-01 21:27:38 +00:00
5d9b7bf1dd
Added ace license file
2012-01-01 20:05:30 +00:00
ad9a81bf41
Added support for more file types
2012-01-01 20:04:46 +00:00
4eb7487e61
Updated ace-editor software
2012-01-01 19:45:30 +00:00
853d1730c7
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-01 20:07:01 +01:00
64a24191a3
Fix return for empty Shared folder in opendir()
2012-01-01 14:04:16 -05:00
e04951f8fd
Fixed keyboard shortcuts
2011-12-31 12:28:25 +00:00
215cb1e6e0
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-31 12:21:40 +00:00
1b146b85d2
Removed redundant DB queries.
2011-12-31 01:34:22 +01:00
97471b5c2a
Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead.
2011-12-30 23:39:31 +01:00
830a34a10a
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
2011-12-30 21:09:42 +01:00
4793d25c57
Added license and waiver of conditions for jquery.inview.
...
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
31663cfff5
contacts entry duplication fix
2011-12-30 17:47:14 +01:00
96dc279e8e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-12-30 17:06:48 +01:00
2ea20862fc
gallery fixes
2011-12-30 17:06:29 +01:00
3bb11db943
Merge branch 'master' into calendar
2011-12-29 19:16:33 +01:00
8afb2e98fa
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-28 16:16:35 +00:00
a70fbcea28
More missing js.
2011-12-28 10:31:45 +01:00
5a99310cdf
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
...
Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
16e4e6dcc3
Contacts: small merge cleanups
2011-12-27 22:44:52 +01:00
3e2e5196d2
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
...
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
2011-12-27 22:18:01 +01:00
5fd595c0bf
Calendar: add loading indicator
2011-12-27 21:50:31 +01:00
5bff1c8ad1
some coding style fixes for the pdf viewer
2011-12-27 14:19:07 +01:00
f009ede753
some styling changes for the pdf viewer
2011-12-27 14:09:22 +01:00
1efb4a0c61
remove debug messages in console
2011-12-27 13:41:22 +01:00
f7674d06d3
pdf viewer from Google Code-In program
2011-12-27 12:36:51 +01:00
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
16c8f62658
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
2011-12-26 13:27:53 +01:00
9eef57faed
make repeating events editable
2011-12-25 23:19:49 +01:00
8ee53708ae
use pre-decrement instead of post-decrement
2011-12-25 15:07:53 +01:00
5e6fa608eb
use OC_JSON::checkLoggedIn() in all ajax files
2011-12-22 16:31:01 +01:00
469e983a02
fix merge conflicts
2011-12-21 22:16:46 +01:00
1383cb51e7
removing and renaming albums
2011-12-21 21:55:52 +01:00
6a1a7fcd26
merged with stash
2011-12-21 18:40:43 +01:00
25fa9bf8ec
merged with stash
2011-12-21 18:37:17 +01:00
3c42867109
merged
2011-12-21 18:35:29 +01:00
d5e9c7d572
Gallery: fix calculation of folder thumbnail selection
2011-12-18 23:10:43 +01:00
fbad1da9e2
Contacts: check if PREF parameter is set before useing it
2011-12-18 23:10:43 +01:00
dff9585f64
Contacts: add missing property_options template var
2011-12-18 23:10:43 +01:00
ff346ad135
Calendar: small for loop fix
2011-12-18 23:10:43 +01:00
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
9e50cecf27
Fix shared status for files inside a shared folder
2011-12-17 21:13:54 -05:00
092c41f375
Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js
2011-12-17 20:38:52 +01:00
a7b048dc05
Added thumbnails to contact list. The contacts have a default thumbnail when the page is
...
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
f6ed7a19be
Merge branch 'master' into calendar
2011-12-16 21:21:34 +01:00
f3e8776dc6
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-16 17:43:06 +01:00
feeb0c742a
Misc. changes after review by bartv.
2011-12-16 17:42:07 +01:00
65214bed0c
make the sharing app return the corrrect result for is_writable on the shared folder
2011-12-16 17:31:31 +01:00
59ad0a6c9c
Update README
2011-12-13 10:39:31 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
d55e689261
Added readme.tanghus
2011-12-11 21:17:10 +01:00
3f44a28e28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-11 18:16:14 +00:00
39430c837f
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-11 16:29:53 +01:00
c7b7758816
Updating of contact list when activating/adding/deleting address books now works.
2011-12-11 16:26:00 +01:00
56f12cbfb1
delete unused files
2011-12-10 17:54:42 +01:00
33caa64cce
check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs
2011-12-10 15:11:41 +01:00
b7c754cb32
Merge branch 'master' into calendar
2011-12-10 15:03:33 +01:00
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
2e951c0ce5
Gallary: Fix alignment of album thumbnails
2011-12-09 21:44:13 +01:00
76c37792cb
WIP
2011-12-09 21:41:21 +01:00
5cb10548b3
Resolved conflict
2011-12-09 15:28:51 +01:00
7aa8eb3427
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
...
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
2011-12-09 15:25:26 +01:00
b3661adf02
Various fixes to multiple address books handling
2011-12-09 15:10:51 +01:00
ac8177d83e
Merge branch 'master' into calendar
2011-12-09 14:45:41 +01:00
bd68cee8cf
add resettimezone file for testing timezone detection
2011-12-09 14:36:43 +01:00
add48b2657
optimize timezone detection
2011-12-09 14:35:59 +01:00
487c23e27f
Merge branch 'master' into tasks
2011-12-08 20:06:26 +01:00
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
2103c331a0
Merge branch 'master' into calendar
2011-12-08 14:03:14 +01:00
d4546cdf37
bump version number to force db rebuild
2011-12-08 17:19:38 +07:00
a389d94e2b
Imageviewer: fix fancybox.png image url in fancybox css
2011-12-07 20:41:00 +01:00
546b7279a3
Contacts: Add "Preferred" before phone label for preferred numbers
2011-12-07 20:40:59 +01:00
1220edd4df
Contacts: Add direct link to details of a contact
2011-12-07 20:40:59 +01:00
36abf22a48
Contacts: Fix postname var spelling
2011-12-07 20:40:59 +01:00
7e990a8e5c
Contacts: refactor common ajax functions to OC_Contacts_App
2011-12-07 20:40:59 +01:00
247146f703
Contacts: refactor rendering of part.details template
2011-12-07 20:40:58 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
b9e6f5e42d
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
2011-12-07 21:51:47 +07:00
afa93c1f28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-06 23:11:36 +00:00
830efdccac
Fixed adding, editing and deleting address books. One minor UI flaw remains.
2011-12-05 03:38:06 +01:00
2b48b733a3
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
2011-12-04 20:42:30 +01:00
95ae0f23f1
Added UI for selecting/editing address books.
...
Export, CardDAV link and activation/deactivation of address books done.
2011-12-04 20:25:46 +01:00
361d4ac13b
fix merge conflicts
2011-12-03 17:25:17 +01:00
5e4f28ea21
Tasks: Fix php warnings with empty tasks list
2011-12-02 21:33:30 +01:00
9c5306d9b1
Merge branch 'master' into tasks
2011-12-02 21:25:23 +01:00
31846141b0
Contacts: make name editable again
2011-12-02 21:24:48 +01:00
25a6679c1e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-02 16:12:29 +00:00
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
21d613cbc6
Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
...
Fixed indentation in /index.php
2011-12-01 02:02:45 +01:00
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
bf719d6670
Disable save button whilst saving. Refined code.
2011-11-29 22:54:51 +00:00
ced944258a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-29 22:45:26 +00:00
dd7a411f9a
Disable save button while saving. Streamlined code.
2011-11-29 22:11:42 +00:00
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
1d312cf070
Correct ldap check in dependencies_chk app
2011-11-25 23:43:24 +01:00
53ff85e2ad
Contacts: layout updates
2011-11-24 21:36:35 +01:00
6ce6cbf489
Contacts: better label for saving a property
2011-11-24 21:36:35 +01:00
9701145f83
Contacts: make type of phone property also multiselect in addproperty
2011-11-24 21:36:34 +01:00
4a57728ddd
Bookmarks: make a soft-requirement of php-curl
2011-11-24 21:36:34 +01:00
c945989a70
Total rewite of fix.
...
This now re-looks up the username and returns that for use.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
8d092434ed
Adjusted the check user function to lowercase the return.
...
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
18d8dc4757
Added option to lowercase all usernames.
...
This resolves bug with Windows AD servers as LDAP server.
Windows is case insensitve on logon requests.
If users are stored camel case and logon using all lower it causes issues
as OwnCloud is configured to be case sensitive.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
6c01175acd
fix ampache htmlentity calls
2011-11-24 02:53:44 +01:00
bae6c1167c
Merge branch 'fullcalendar'
2011-11-23 21:08:26 +01:00
ee549dfb38
Fix scrolling through months
2011-11-23 21:07:49 +01:00
5e037bfd54
Contacts: remove redundant li in setpropertyform template
2011-11-23 21:07:32 +01:00
a2ecdfcac1
Contacts: support multiple phone type parameter
2011-11-23 21:07:32 +01:00
ad390d5e42
Add type selects to editing ADR & TEL contact property types
2011-11-23 21:07:32 +01:00
a38778f911
fix timeformat setting for fullcalendar
2011-11-20 14:23:26 +01:00
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
4bebf419d1
use oc_appconfig instead of oc_config for the external apps
2011-11-18 20:19:55 +01:00
48ae18a733
- fixed translateable strings in template
...
- added explaination about ldap filter and display name
- bugfix: keys in ldap response are lower case => lower display name filed before searching
2011-11-18 14:08:30 +01:00
bf84aa23f4
- provide a setting for the ldap user display name instead of hardcoded value 'uid' which is not common for Active Directory
...
- provide a sorted list of ldap users
- replaced double quotes by single quotes and spaces by tabs according to coding standards
- replaced hardcoded strings in template by translatable ones
2011-11-18 14:08:30 +01:00
cff6a41e2b
fixed copy&paste error: store ldap_tls setting in user_ldap, not
...
user_tls
2011-11-18 14:07:11 +01:00
0155effdb7
- bugfix: allow anonymous bind for search, then bind with users credentials.
...
- added explaination how to setup anonymous bind for search to template
- make usage of TLS configurable
2011-11-18 14:07:11 +01:00
7454af0c79
apps files_sharing - fix in share.js to check the "can edit" checkbox -
...
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
82f30c709c
apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
...
to enable other user backend
2011-11-18 14:05:38 +01:00
a70c2b3cb9
apps file_sharing
...
changed
$RUNTIME_NOAPPS = true;
to
$RUNTIME_NOAPPS = false;
in ajax/userautocomplete.php - to fetch users also from different user
backends - not only database backend
2011-11-18 14:05:37 +01:00
28cd41a2a4
users_ldap - added getUsers() method to fetch all existing users from
...
LDAP server
2011-11-18 14:05:37 +01:00
96b91e5b0b
fix ampache encoding problem. use htmlentities encoding parameter directly.
2011-11-18 14:03:26 +01:00
0d274b0268
fix id3 tag resolve. should use utf8 from getID3 directly but not
...
to convert them from ISO8859-1 to utf8 after analyze.
2011-11-18 14:03:26 +01:00
3d498002d0
first implementation of the search function
2011-11-14 22:52:34 +01:00
89b3a395df
fix timezone for repeating events
2011-11-12 22:30:09 +01:00
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
eea20e51d8
another fix of caldav url
2011-11-12 16:13:27 +01:00
7fd52de2d3
fix merge conflicts
2011-11-12 15:13:44 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
03d9fab3c0
fix caldav url
2011-11-12 14:06:14 +01:00
88de9e4050
Keyboard shortcuts for saving. Refined code.
2011-11-11 20:46:06 +00:00
26272c4252
automatic timezone detection
2011-11-11 15:51:44 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
b095859a92
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
c65e417666
Use parse function in Calendar_Object
2011-11-09 22:16:24 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
938c5ef21c
contacts: every card needs a version!
2011-11-09 11:35:50 +01:00
4b424e12df
contacts: put property key in background, the value is important!
2011-11-09 11:35:50 +01:00
841be90939
Improve style in contacts
2011-11-09 11:35:50 +01:00
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
c33884779d
Fixed problem closing the editor.
2011-11-07 22:45:26 +00:00
059ab889bd
Fixed error where saving message appears twice.
2011-11-07 22:27:49 +00:00
7a8c762e48
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-07 17:16:56 +00:00
97291fda58
Add allow_url_fopen directive to admin_dependencies_chk
2011-11-06 16:54:05 +01:00
cc35cb74e1
Try to avoid closing the share box too soon on multiple selections
2011-11-06 15:29:51 +01:00
ce2b39b398
Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into merge-requests/69
2011-11-04 00:31:35 +01:00
8eda6f8feb
make webfinger work properly if owncloud is installed in a subdirectory
2011-11-03 13:09:51 +01:00
e2907eb99d
no longer rely on PEAR::isError since we can use PDO now
2011-11-03 13:09:51 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
eaad3ab45f
Be consistent with licencing
2011-10-29 10:15:29 +02:00
a21908cf18
Change name and fix a typo
2011-10-29 10:07:01 +02:00
a809fe9a04
Add a dependencies check apps
2011-10-29 00:27:25 +02:00
8dd2f463f8
Cleanup tipsy popups on more actions
2011-10-27 22:56:22 +02:00
1e8e2ae353
Move unselect call to after the dialog starts
2011-10-27 22:54:39 +02:00
6d4d15b221
Fix html id's in part.addcardform.php
2011-10-27 22:47:56 +02:00
c0e9c805ec
Disable loading non-existing settings script in bookmark app
2011-10-27 22:46:52 +02:00
865be6064a
adjusting to new db "api", merge with master
2011-10-27 21:16:04 +02:00
0d022de0f4
Merge branch 'master' into gallery
2011-10-27 20:27:57 +02:00
6eee638482
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-25 20:48:59 +01:00
715e376cd2
Fix setproperty form
2011-10-25 20:01:40 +02:00
d0e9c81399
Quickfix hanging tipsy popups
2011-10-25 20:01:04 +02:00
55d957489d
Fix fromtime/totime warnings
2011-10-25 19:59:23 +02:00
50649ad0d1
Implement select event creation
2011-10-25 19:57:20 +02:00
950018b5c3
Fix scrolling calendar
2011-10-25 19:56:57 +02:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
74740fb71a
Do not set incorrect components for default calendar
2011-10-23 11:35:29 +02:00
4d60f9d3bd
improved style in contacts
2011-10-22 21:32:07 +02:00
d89666261f
Some improvements on the contact application
2011-10-22 19:23:22 +02:00
b224991ea2
Fix translations, empty properties
2011-10-22 19:23:22 +02:00
dc9c5f10f5
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 16:28:24 +02:00
045c42aa99
new "external" application. you can integrate external application like roundcube, squirellmail or a wiki into ownCloud.
2011-10-22 15:44:34 +02:00
9761a1de3e
translatable error messages
2011-10-22 13:14:54 +02:00
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
42306f1e35
Avoid error when no image is provided for cover or thumbnail
2011-10-22 11:34:49 +02:00
9d46c378b9
Fix unescessary use of non portable 'replace' sql and add loging when GD not installed
2011-10-22 11:01:06 +02:00
0d4240e196
Fix music navigation entry controls going over the sidebar
2011-10-22 02:31:16 -04:00
cf5686def0
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-21 23:24:39 +02:00
433b57c315
fix new allday bug
2011-10-21 22:59:26 +02:00
d50b014aba
fix allday bug
2011-10-21 22:47:31 +02:00
ba3d139de8
Merged from master and fixed issue with opening multiple editors
2011-10-21 21:22:06 +01:00
eb68201bc5
Better event popup
2011-10-21 22:08:55 +02:00
a1eda425ed
added transition function from 'old' calendar to fullcalendar (fixed currentview bug)
2011-10-21 22:08:30 +02:00
61660c068a
Fix function name error in contacts app
2011-10-21 21:49:58 +02:00
f0565de900
use fancybox instead of lightbox
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-21 20:19:39 +02:00
c40383b610
enable listview button
2011-10-21 18:27:12 +02:00
e48377d85b
added transition function from 'old' calendar to fullcalendar (fixed currentview bug) and removed listview (it is not implemented in fullcalendar yet)
2011-10-21 18:19:44 +02:00
d09b3ad2e7
Revert "first implementation of fullcalendar plugin with old buttons working"
...
This reverts commit b40122832f
2011-10-21 17:50:10 +02:00
b40122832f
first implementation of fullcalendar plugin with old buttons working
2011-10-21 16:11:38 +02:00
085001fa24
Disable calendar scrolling, doesn't work yet
2011-10-20 23:49:29 +02:00
96002c8c8f
Implement listview for fullcalendar
2011-10-20 23:49:29 +02:00
beb5d62779
Optimize deleting event
2011-10-20 23:49:28 +02:00
2269f74c27
Fix changing calendar data
2011-10-20 23:49:28 +02:00
3d8a1ccb3f
Implement resizing of events
2011-10-20 23:49:28 +02:00
a8bca282df
Implement moving of event
2011-10-20 23:49:28 +02:00
bb5ccc5731
Connect popup to fullcalendar
2011-10-20 23:49:28 +02:00
0eb6c759d7
Connect newEvent & editEvent to fullcalendar
2011-10-20 23:49:28 +02:00
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
2e6ec6ce0b
Connect calendar buttons to actions
2011-10-20 23:49:27 +02:00
4075d18050
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
a12cdb55b1
Replace ownCloud calendar html with fullcalendar implementation
2011-10-20 23:49:27 +02:00
2906ea3d78
Add caching for filelist sharing icon status to avoid many http req.
2011-10-20 23:03:05 +02:00
e9b6a1018d
remove unneeded definiton of get_temp_dir
2011-10-20 01:27:04 +02:00
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
466b41c36b
Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments
2011-10-19 23:38:35 +02:00
7e34452746
Little trick to avoid editor loading twice on double click
2011-10-19 22:42:44 +02:00
da8d32ae38
Tweak bookmarklet to not change the current page. Correct encoding when add bookmark
2011-10-18 23:27:53 +02:00
9ea34250a0
Lower also the album name in media scanner...
2011-10-18 23:15:47 +02:00
b15d8878b7
Correct use of null for not null columns in media scanner
2011-10-18 22:41:25 +02:00
c32cce4b35
new way of showing gallery covers, missing files
2011-10-18 21:43:33 +02:00
55e8b02a09
new way of showing gallery covers
2011-10-18 21:42:27 +02:00
29368d1c58
Add 3 More log writing in files sharing app
2011-10-18 21:30:08 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
2ac00b378a
Fix file sharing : Don't give a unused param to execute
2011-10-17 23:39:23 +02:00
492931562f
Fix bookmark listing with mysql: limit is binded as string.
2011-10-17 13:49:33 +02:00
4d1776faf9
catch some edge cases in media player
2011-10-17 01:25:11 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
330c513015
prevent error in media player ajax api
2011-10-17 00:25:13 +02:00
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
c383543ec9
Remove unused parameter
2011-10-15 11:45:58 +02:00
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
9bde002c95
Fixed issue with opening editor multiple times.
2011-10-14 22:56:14 +01:00
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
3fee961a0a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-14 22:07:30 +01:00
8450785379
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
2011-10-14 20:38:42 +02:00
ea8461e83d
scrolling in calendar
2011-10-14 13:46:28 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
8da00e2d9a
avoiding notice if ['HTTPS'] is not set
2011-10-13 15:50:08 +02:00
c86d1824fe
Improve handling of calendar export $_GET params
...
* a notice would be reported if either of the 'cal' or 'event' $_GET params
where not supplied, which would result in 'Cannot modify header information'
warnings
2011-10-12 15:23:39 +11:00
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
2011-10-12 15:10:59 +11:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
f49ecee24c
reload calendar automatically
2011-10-10 12:03:30 +02:00
e2468c4343
fix webfinger install script
2011-10-09 17:24:18 +02:00
6e62911a4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-09 17:13:34 +02:00
f4fb6356cd
use install.php properly
2011-10-09 17:12:16 +02:00
42f289d994
Updated bug message
2011-10-09 16:01:48 +01:00
203f7a3a87
Move contact delete button to top right corner
2011-10-09 00:04:37 +02:00
88aa40e6ac
Show add contact form on opening contacts page
2011-10-09 00:04:37 +02:00
19d4e6e1d5
apps/bookmarks: remove unused variable
...
This is not needed anymore since commit
6b64aa3faf
2011-10-08 21:07:43 +02:00
4a4e6eb071
apps/bookmarks: follow redirects when fetching title
...
This solves a problem where hitting a redirect page would lead to a "302
Found" title.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 20:36:40 +02:00
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
adebefad84
Fixed editor loading and file saving issue
2011-10-08 15:46:38 +01:00
6b64aa3faf
removed description. changed target to _blank. removed sorting. updated layout.
2011-10-08 13:54:45 +02:00
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
39e7db7db4
added missing files
2011-10-08 13:11:13 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
0bb3270503
Revert "support of RRULE in calendar app"
...
Reverting as per Georg's request (not stable enough yet)
This reverts commit 55ab68a332
2011-10-08 00:12:57 +02:00
a13d42fdaf
Fixes for adding contact property
2011-10-07 23:01:49 +02:00
46b8703b71
Display contact name without label and in bold
2011-10-07 22:42:50 +02:00
f95e8c62c9
Save the right contact property
2011-10-07 22:38:19 +02:00
8ea9c39241
Fix saving properties with a new contact
2011-10-07 22:25:26 +02:00
bc54f13636
Fix name when adding contact
2011-10-07 21:59:25 +02:00
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
6449a45695
disable openid on default
2011-10-07 17:02:55 +02:00
4fc8e28fba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 16:46:18 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
20554be9f4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 00:15:54 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
bb26fe9300
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
2011-10-06 22:37:06 +02:00
ae56bb63c6
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
2011-10-06 22:36:34 +02:00
878178145d
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
2011-10-06 22:35:36 +02:00
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
b0847a61f5
Start using OC_JSON in gallery app
2011-10-06 21:22:01 +02:00
c30aa4ddeb
Start using OC_JSON in tasks app
2011-10-06 21:21:38 +02:00
16ee08385e
Merge branch 'master' into tasks
2011-10-06 15:37:20 +02:00
4786ed321e
Replace _ in timezone setting with a space
2011-10-06 13:22:36 +02:00
c28f1e0276
Implement timezone fix from Stephen Rees-Carter
2011-10-06 13:22:36 +02:00
bf017fb4bd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-06 13:21:38 +02:00
55ab68a332
support of RRULE in calendar app
2011-10-06 13:21:13 +02:00
c853fc75a1
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
2011-10-06 10:31:05 +11:00
d9464de690
Updated saving feedback
2011-10-05 21:59:03 +01:00
f92fa6989e
another query fix
2011-10-05 22:28:17 +02:00
30343f15e2
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-05 20:49:08 +01:00
af6eb52b5e
correct wrong variable name in remoteStorage app
2011-10-05 20:01:58 +02:00
d5931b8c48
gallery db query fix
2011-10-05 19:32:30 +02:00
edd958836e
Moved addScript and addStyle calls to app.php
2011-10-05 16:32:01 +01:00
86825ee3b5
Cleanup of code. Fixed breadcrumb removal issue
2011-10-05 16:10:11 +01:00
28dcbe3cb0
disabled gallery app by default until it's in a branch
2011-10-05 14:54:34 +02:00
8e532b5ceb
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
0cde2a3146
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
2011-10-05 14:27:50 +04:00
15e5bd16ab
use texteditor for search results
2011-10-05 02:44:24 +02:00
c6a73bee5e
remove now unneeded textviewer
2011-10-05 02:38:55 +02:00
1fba8619d4
move some code to where it belongs and remove duplicated editor app
2011-10-05 02:36:54 +02:00
a8621265e2
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-05 02:11:44 +02:00
813e8b274a
Added all the remaining extensions to filetypes
...
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
93ed844015
Control events are now bound on the page load rather than everytime the editor is loaded.
2011-10-04 20:20:08 +01:00
2c95c799e6
Add new contact name to end of cantact list
2011-10-04 21:16:57 +02:00
fada3517b0
All the basic field for add contact added
2011-10-04 21:16:57 +02:00
39d42fc62b
Save button now removed after closing editor
2011-10-04 20:15:20 +01:00
0179b61f69
fixed another bug with breadcrumbs
2011-10-04 21:05:49 +02:00
451b5940ea
fixed scrollbar issues. fixed missing breadcrumb image.
2011-10-04 21:01:05 +02:00
fa203d186e
Added fillHeight() js function for resizing editor
2011-10-04 19:46:27 +01:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
09c1179094
Fixed breadcrumb issue.
2011-10-04 19:07:22 +01:00
340f6bbaba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
9d918b5ac8
Updated control bar styling and save feedback.
2011-10-04 16:31:26 +01:00
58d284419c
HTML data is now encoded before being shown.
2011-10-04 15:27:29 +01:00
70091ec649
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 10:17:55 +02:00
33b660857a
fix ical import
2011-10-04 10:17:11 +02:00
79da90bb08
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
2011-10-04 10:07:46 +02:00
45fda6f43e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-03 23:43:58 +01:00
6c9ff0e47e
Fixed ajax urls
2011-10-03 23:41:32 +01:00
32ce0d3c6e
Fixed file saving issue.
2011-10-03 23:28:47 +01:00
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
77e12a15b1
fix checkLoggedIn function in import of ical files
2011-10-03 22:52:13 +02:00
c40a1fcede
added import function as filehandler
2011-10-03 22:50:10 +02:00
dec8106665
Add user friendly calendar color chooser
2011-10-03 20:42:47 +02:00
6159b79715
Take setting default value out of loop
2011-10-03 20:42:47 +02:00
ffc5c4dabe
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
2011-10-03 15:18:48 +02:00
acbd31255e
fix add bookmark bug.
2011-10-03 20:44:03 +08:00
a2bcbec791
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 02:01:24 +02:00
36196b6c2d
use browsercache for gallery covers
2011-10-02 19:42:14 +02:00
7bcc0efd6a
show galleries in search results
2011-10-02 19:33:55 +02:00
39c4d9b2ca
enable by default
2011-10-02 18:53:47 +02:00
c3d7ffc877
adding tmp icon for app, extending memory size for php in .htaccess
2011-10-02 17:52:11 +02:00
ee62eb7bb0
adding missing files, don know why they disappeared
2011-10-02 17:48:02 +02:00
6643f68663
merge 'gallery_app_devel' to 'master'
2011-10-02 17:17:46 +02:00
bdcf31cc73
Added translatable text.
2011-10-02 16:06:30 +02:00
213275a1f8
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
daee88fd26
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
fef31bc6c7
Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud
2011-10-02 14:00:55 +02:00
54e5a10846
avoid creating empty albums, removing od depreciated code openings
2011-10-02 13:52:04 +02:00
07b3b103ce
changing <? to <?php
2011-10-02 12:24:02 +02:00
0825073e8c
Editor now loads on top of files app.
2011-10-01 22:48:00 +01:00
0ebe9ad70c
added function to export single events
2011-10-01 23:19:06 +02:00
f9824f6108
choosable default duration of event
2011-10-01 22:53:18 +02:00
339d417420
removing add new album button, removing logs, and unused code
2011-10-01 22:36:01 +02:00
1ea183a0f7
fix duration bug
2011-10-01 21:09:08 +02:00
8219516ec0
removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time
2011-10-01 20:44:08 +02:00
50007f2d40
removed bug, that you can't change time in week view, when event was an allday event
2011-10-01 20:36:20 +02:00
a7431d99e5
remove debugging text in drag and drop function
2011-10-01 20:31:58 +02:00
43a3e46369
added drag and drop function for events in calendar app
2011-10-01 20:27:30 +02:00
83e7f9d54a
showing galleries bahaviour change
2011-10-01 11:26:47 +02:00
5a40804773
bookmarks are now translatable
2011-10-01 11:14:43 +02:00
bf6414d3ad
choosable time format
2011-10-01 10:39:07 +02:00
0514a1925b
choosable first day of week & choosable days of weekend
2011-10-01 09:54:52 +02:00
ddd28aae67
Remove test data from calendar creation
2011-09-30 23:17:30 +02:00
9a5d517ec2
Add more checks for admin user
2011-09-30 23:17:30 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
35d490f8e9
fix playing songs from search results
2011-09-29 23:55:00 +02:00
d59c48217d
Change colspan in choose calendar dialog to 6
2011-09-29 22:15:42 +02:00
84e209f1e0
added app for admins to create a zipfile containing the owncloud data
2011-09-29 17:11:07 +02:00
fcc6d61fe1
only play the music once
2011-09-29 00:48:45 +02:00
0d40617c07
improvements in media collection viewer
2011-09-29 00:42:30 +02:00
8d3c3785bc
sort music collection
2011-09-28 23:50:28 +02:00
f29f601ec4
Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)"
...
Implemented the calendar color as background of the events.
This reverts commit 59d4ddd905
2011-09-28 23:25:22 +02:00
3c361cec92
Removed unnecessary theme files.
2011-09-28 22:23:50 +01:00
c9c7d5e1aa
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
5875b50de0
Use .empty function instead of .html("")
2011-09-28 23:17:26 +02:00
7c20aea96c
Use OC.filePath to locate ajax entry points
2011-09-28 23:17:25 +02:00
3f7d964acd
Color event background with calendar color
2011-09-28 23:17:25 +02:00
45c983e899
Add missing datetime type
2011-09-28 23:17:25 +02:00
93a0e668a6
styling fixes for playback controlls
2011-09-28 22:36:15 +02:00
98ded8d168
Added support for more file types
2011-09-28 21:31:13 +01:00
bc7289bb28
Changed theme. Editing is now default action for all supported types. Fixed static url.
2011-09-28 21:25:25 +01:00
1639a1ca49
fix persistent playlist for media player
2011-09-28 22:21:06 +02:00
c39c6d36df
do not use 'URL' but 'address'
2011-09-28 22:11:47 +02:00
4fe993a55d
Replaced urlencode() and urldecode() with htmlspecialchars() and htmlspecialchars_decode()
2011-09-28 20:26:30 +01:00
2ca74dc334
Ficed text encoding bug. Removed unnecessary file retrival call
2011-09-28 20:23:00 +01:00
3129855cc4
Fixed typo. Added translation support.
2011-09-28 20:17:45 +01:00
3886a749fb
Updated copyright info and ajax responses
2011-09-28 19:52:08 +01:00
61c4f9b3c8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 18:44:17 +02:00
59d4ddd905
commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)
2011-09-28 18:43:59 +02:00
3ab8739809
Implemented ace-editor for basic file editing.
2011-09-28 15:26:54 +01:00
98c59605aa
show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration
2011-09-28 16:05:01 +02:00
e30220e287
media app: show current song, add margin, enable tooltip
2011-09-28 11:46:04 +02:00
8e42b02a22
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 10:29:07 +02:00
8c405a59d8
little bug fixes in calendar app
2011-09-28 23:28:14 +02:00
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
61aa00899d
show only most essential stuff in add and edit event form
2011-09-27 21:56:16 +02:00
f4ecf47e61
Fixed delete cross positioning issue.
2011-09-27 05:26:49 +10:00
e4dc33b368
Reverting: initial commit for gallery app
2011-09-26 20:05:36 +02:00
63e6863222
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-25 22:32:16 +02:00
bc43851d74
initial commit for gallery app
2011-09-25 22:32:08 +02:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
64b68f2474
correctly update the collection when music files are moved around
2011-09-25 01:34:55 +02:00
ae4c83af91
moved scanning to controls bar
2011-09-25 00:17:54 +02:00
368412a730
lots of music improvements, might break some things though
2011-09-25 00:02:50 +02:00
700ac75565
updated translations
2011-09-24 23:12:18 +02:00
a54ea3246c
removed 'share by publiclink' app as it has been superseded by Sharing
2011-09-24 23:03:28 +02:00
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
da63140b04
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-24 19:53:37 +02:00
4aeb2990c0
delete calendar function for userinterface
2011-09-24 19:52:55 +02:00
260893816b
remove getID3 demos due to security issue caused by one of them
2011-09-24 19:09:54 +02:00
842ce24d2b
apps/calendar: check for unset variable
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:07 +02:00
c7d4e72341
set cookie secure if forcessl is enabled
...
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
037d0e9640
apps/contacts: only display buttons if there is a contact
...
If you don't have any contacts, it would display a non-functioning
delete button.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:59 +02:00
983445cd39
apps/contacts: fix wrapping issue in addpropertyform
...
The browser added random line breaks between the label and input field
making it hard to see what's what.
Now we break lines intentionally just like in setpropertyform.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:58 +02:00
d7c165eb35
apps/bookmarks: use curl instead of file_get_contents
...
Don't depend on allow_url_fopen being enabled when we already use curl
elsewhere in the code.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:57 +02:00
934b18405a
fix apps/bookmarks if oc_bookmarks_tags is empty
...
If you have bookmarks, but there are no tags in oc_bookmarks_tags, the
query doesn't return any results. Using a left join fixes this.
Reference:
http://stackoverflow.com/questions/3171276/select-multiple-tables-when-one-table-is-empty-in-mysql
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:56 +02:00
ff10303755
apps/calendar: change ctag after modifying event
...
edit() tried to do that, but it used $id which is the event id and not
the calendar id.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:55 +02:00
d928cd3636
files: hide non functioning code when called from a/f_s/get.php
...
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.
The actions div contains undefined variables and doesn't work either.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:54 +02:00
b0e23a1634
apps/calendar: add delete button to edit event form
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:51 +02:00
761ba4a379
don't escape new lines in vevent description
...
This ended up as "\n\\n" in the data base and the escaped \n was also
visible in the edit form.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:50 +02:00
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
9c550e8e9f
fix error when uploading music
...
These methods are called statically so make them static.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:44 +02:00
6f3c118038
apps/calendar: check if variables are set before using them
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:42 +02:00
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
5741811d36
Fix use of reserved javascript keyword 'new'
2011-09-23 22:22:03 +02:00
6e46bd7373
integrated and updated calendar translations
2011-09-23 20:38:19 +02:00
aa4aa40b57
fixed a few calendar words, hack to get shortcode for May translatable
2011-09-23 20:19:39 +02:00
d3fedc14e2
fixed contacts strings (no technical stuff in the interface, don't scream at people, ...), ready for translation
2011-09-23 20:13:27 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
73d0caf8a4
Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging
2011-09-23 09:40:01 +02:00
917ea58a8c
fix file uploads for IE
2011-09-22 23:25:23 +02:00
0dd5fd5cd3
Mark form field with error message
2011-09-20 21:25:28 +02:00
aad62919da
Small styling fixes
2011-09-20 14:38:16 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
d5656716f6
Fix calendar active checkbox
2011-09-18 17:13:48 +02:00
0660133d2e
Fix event error/success json message
2011-09-18 17:13:47 +02:00
7c5e389067
deleteUser function must be static
2011-09-18 17:13:47 +02:00
8826aa8056
Add basic fields to tasks app
2011-09-17 21:55:06 +02:00
78863696b7
First version of tasks app
2011-09-17 21:55:06 +02:00
d0d3fecc95
no need to escape values when using prepared statements
2011-09-17 02:30:00 +02:00
22db68816e
Remove unused function call
2011-09-17 01:55:05 +02:00
079df42103
Disable the Oneday and Fourweeks buttons in calendar interface
2011-09-17 01:55:04 +02:00
fe62c803e2
fix small bugs
2011-09-17 00:46:04 +02:00
54a3b28dce
Split OC_Contacts_Addressbook in _Addressbook and _VCard
2011-09-17 00:26:57 +02:00
2a84f7f07c
Move most javascript to calendar.js
2011-09-16 17:50:55 +02:00
45d42a9654
Move validateEventForm function and fix success handling
2011-09-16 17:06:57 +02:00
73d3dc91fd
Handle multi open of choosecalendar dialog
2011-09-16 14:11:22 +02:00
0fde26c86c
Close event new/edit dialog when clicking outside the dialog
2011-09-16 14:02:21 +02:00
2353f02d9a
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
15559d3e88
First implementation of edit event
2011-09-16 00:21:19 +02:00
b413dcfa7c
Fix conversion of VTODO and VJOURNAL items
2011-09-16 00:19:43 +02:00
388b14604a
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
d3ee19e675
fix documentation
2011-09-15 23:20:49 +02:00
4d7ed0f2f5
Add documentation to calendar.php
2011-09-15 22:45:58 +02:00
ae622dbbfe
Small fix in documentation
2011-09-15 22:45:40 +02:00
c3ff534b19
Improve reading of vCard files
2011-09-15 11:06:21 +02:00
b6c69e580a
Move php code out of part.eventform
2011-09-14 23:36:23 +02:00
cb9a67906d
Move event form field to part.eventform template
2011-09-14 23:36:23 +02:00
68758f9b2c
Rename calendar javascript functions into Calendar.UI namespace
2011-09-14 23:36:22 +02:00
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
0ff9bc4806
Add link and other edit information to newly added bookmarks.
2011-09-13 16:10:52 +04:30
67addb4882
Add support of editing bookmarks.
2011-09-13 15:40:09 +04:30
9a5530a48f
Correct deleting events over CalDAV
...
A quick patch that corrects not being able to delete
calendar events. (misnamed variable). Thanks to Robert J. Clark.
2011-09-12 19:50:07 +02:00
fb96256c63
offer login popup from oauth dialog
2011-09-12 15:17:52 +02:00
d0746d7e32
offer login popup from oauth dialog, correct base uri
2011-09-12 15:04:21 +02:00
6e569c5ed1
correction in webfinger.php activation trap
2011-09-12 14:59:22 +02:00
f928d4af56
correct xml syntax
2011-09-12 14:35:15 +02:00
5685965fdb
improve uninstalled-protection
2011-09-12 14:22:48 +02:00
f93be510a3
check activation and make activation impossible by default
2011-09-12 14:15:19 +02:00
d07f3d548c
improved troubleshooting instructions
2011-09-12 13:47:14 +02:00
cb7cc99302
correct protocol
2011-09-12 01:22:40 +02:00
6e6be3aa8f
putting activation inside activate.php
2011-09-12 00:32:38 +02:00
994c7f3dad
adding webfinger app
2011-09-12 00:12:34 +02:00
de729d8d8b
renamed last CW to Week
2011-09-11 21:50:13 +02:00
cd44dff5af
Better feedback for saving calendar and openid settings
2011-09-11 20:38:52 +02:00
3234597703
Correct copyright notices
2011-09-11 17:25:02 +02:00
e9df292b62
commented out broken code in add event function
2011-09-11 16:49:08 +02:00
72aa1bf75c
Only show used address attributes in contact view
2011-09-11 12:52:40 +02:00
647fab07c7
fixes in german language
2011-09-10 12:26:01 +02:00
97fc236760
Fix a warning and an error
2011-09-10 11:58:08 +02:00
1afeb5cd12
bug fixes in calendar lib
2011-09-10 10:52:35 +02:00
cbb36829e6
Small update Calendars dialog
2011-09-09 22:28:34 +02:00
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
80f5942868
translatable categories and other translations added
2011-09-09 20:39:38 +02:00
f031e308cd
show caldav url in choose calendar dialog
2011-09-09 18:44:33 +02:00
5fed5bab4a
Improving contacts
2011-09-08 23:36:47 +02:00
74f6dd5d5a
Add creating calendars with the web interface
2011-09-08 12:29:29 +02:00
f3e98878da
Implement calendar list view
2011-09-07 15:13:26 +02:00
dabf10f99c
Use js Date for holding dates in the whole calendar app
2011-09-07 09:49:23 +02:00
fbde66a56c
Eliminate most global calendar js vars
2011-09-07 09:49:23 +02:00
0df98b9a78
Remove generate_ prefix from vars
2011-09-07 09:49:23 +02:00
9b14c276e3
Store date for click in jQuery.data('date_info')
2011-09-07 09:49:23 +02:00
abb6a15aa4
Change generateDates to use js Date for calculations
2011-09-07 09:49:22 +02:00
b7ba0839c6
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-06 17:14:48 +04:30
c5aa139296
Use an animated gif in add-bookmark form, while fetching metadata.
2011-09-06 17:13:03 +04:30
0b5f0ac249
Don't clear bookmark description field, If it is empty in bookmark metadata.
2011-09-06 16:13:23 +04:30
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
f4b9895cbf
having non-editable stuff as input fields is really confusing. You were right Robin ;)
2011-09-04 10:34:57 +02:00
cfb932b073
Add simple popup to event
...
There is not a lot of infomation to display, yet.
2011-09-03 22:15:24 +02:00
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
2e2bdb449f
Update calendar event label creation
2011-09-03 22:15:23 +02:00
1bf215cd08
updated translations
2011-09-03 15:08:58 +02:00
afb07d3e39
Use css class for view selection radio buttons hilighting
2011-09-02 23:51:18 +02:00
208852abf2
Fix event creation date in oneweekview
2011-09-02 23:50:51 +02:00
d33a5ea5d4
Use css classes to find elements, reduces the html size
2011-09-02 23:28:35 +02:00
6155c758be
Cleanup javascript in calendar template
2011-09-02 23:04:02 +02:00
6eff001ebb
another bugfix in new design of calendar
2011-09-02 21:29:59 +02:00
1940bc3dc0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-02 15:49:43 +02:00
e89d622c3a
bug fixes in new design of calendar
2011-09-02 15:49:03 +02:00
e798c32375
renaming core_unhosted app to just unhosted, and cleaning up unused files in it
2011-09-02 15:25:04 +02:00
71205b8b07
adding core_unhosted app
2011-09-02 14:56:40 +02:00
8cdd9ab81b
export function and style fixes in calendar
2011-09-02 12:55:56 +02:00
62cca8264f
Refactor calendar loadEvents and updateView use
2011-09-01 23:27:00 +02:00
804af7f189
Move generate_dates function to Class/Object
2011-09-01 23:23:57 +02:00
b7e9e7e777
Simplify forward_day and backward_day
2011-09-01 22:29:57 +02:00
e765e7e9e8
Changing the active state of the calendar reloads the events.
...
Change from Georg Ehrke
2011-09-01 22:00:14 +02:00
1bb754299a
Change calendar js rendering to class/object
2011-09-01 22:00:14 +02:00
3d2b4b03af
Convert plain javascript to jQuery for readability
2011-09-01 22:00:13 +02:00
578d1de55d
Fix OC_USER_LDAP::checkPassword() to return the username
...
REVIEW: 102487
2011-09-01 13:56:30 -03:00
b579c812b2
Some commented code was still here
2011-09-01 18:33:19 +02:00
31a094becb
Buttons for play/add albums works. Folding albums too.
2011-09-01 18:31:44 +02:00
0c07312ad8
add some categories in calendar
2011-09-01 18:35:32 +02:00
6fa9be73f8
calendar_calendars.components needs to be longer, adjustments in info.xml
2011-09-01 17:27:12 +02:00
8cbe66b5c1
bug fixes at new event form (categorie and calendar)
2011-09-01 16:54:25 +02:00
58129f9a11
Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump
2011-09-01 16:15:48 +02:00
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
a7496b1c9d
Create function getnumberofdays to get a list of month lengths
2011-08-31 21:24:08 +02:00
b0ce1ded97
Move date functions to class structure
2011-08-31 21:24:08 +02:00
361861295f
reload page after add event successfully
2011-08-31 20:41:18 +02:00
5678d78d54
new changes (e.g. show events) by Bart Visscher
2011-08-31 20:20:46 +02:00
9a60313c3b
commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar
2011-08-31 17:29:38 +02:00
f758d223a2
Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar
2011-08-30 21:01:10 +02:00
6ad64c6f8a
Timezone bug fixed
2011-08-29 13:41:19 +02:00
60a5581071
Merge branch 'master' into calendar
2011-08-28 23:38:24 +02:00
281b2187ab
fix detection of empty collection
2011-08-28 23:20:08 +02:00
947216942a
Merge branch 'calendar' of git.kde.org:owncloud into calendar
2011-08-28 20:16:40 +02:00
ca08ccb61c
first add event function in calendar app
2011-08-28 20:13:40 +02:00
d5c73c6d4a
always scan new music files
2011-08-28 19:32:52 +02:00
04eebccc39
apps/user_ldap/user_ldap.php: - Add support for ldapv3 and tls
2011-08-28 12:56:04 +02:00
0054197d02
updated translations
2011-08-28 01:14:32 +02:00
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00
e8fa2d3442
Added db4app lib, and apps test_db that shows how it works.
...
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
f8fc8eb430
no alert popups, ever. They are just dismissed. Use undo instead.
2011-08-27 16:54:20 +02:00
56399d1d79
Play and add buttons in the collection.
2011-08-25 20:57:17 +02:00
ce1d13c9b6
playlist working
2011-08-25 20:37:51 +02:00
ad053d504c
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-25 17:03:56 +02:00
e6bdd25667
fix: links with parameters get cut off at &
2011-08-25 13:51:48 +02:00
0972606072
fix: URLs without protocol are now linked to via HTTP
2011-08-25 13:23:52 +02:00
e0a69bbeac
Make bookmarks sortable by clicks
2011-08-25 12:55:13 +02:00
55a8ee34bd
Make appeareance of the bookmarklet a bit nicer, still room for improvement left
2011-08-25 12:15:03 +02:00
df560b3d9d
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
apps/media/js/collection.js
2011-08-25 09:07:02 +02:00
3fbc8973ee
My own version of music collection.
2011-08-25 09:04:08 +02:00
8c8490b28e
Show users shared with in the drop down for reshared files
2011-08-24 18:41:36 -04:00
e0ff57e8c2
fix javascript error in media player
2011-08-24 23:38:39 +02:00
7cd592e055
Added a Bookmarklet for the Bookmarks app
2011-08-24 22:16:44 +02:00
365c4fdae2
Allow sharing of files shared with you - Bug: Doesn't show up as being shared in the drop down
2011-08-24 12:32:02 -04:00
4c4b1e4c2d
Clear the folder size cache for the 'Shared' folder when a new item is shared
2011-08-24 11:59:03 -04:00
4028dc984a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-24 14:36:16 +02:00
0f3ef8aeb0
check if tag is set, might not show bookmarks on some systems without doing so
2011-08-24 14:36:03 +02:00
f4c498edba
Full path for carddav path
2011-08-24 11:21:27 +02:00
112eccfe33
Support for etags in calendar
2011-08-24 10:19:48 +02:00
c87cee6b1f
Add VJOURNAL to objects that are allowed by default
2011-08-23 22:10:08 +02:00
778404fb29
VTODO and VJOURNAL exist as well
2011-08-23 22:07:40 +02:00
84761b1518
CalDAV seems to work now
2011-08-23 21:42:15 +02:00
cdf0d010eb
today hightlight in calendar app (fourweeksview and onemonthview)
2011-08-23 20:30:11 +02:00
bf68cd8ba4
better multiple language support, first integration of new calendar class
2011-08-23 18:02:36 +02:00
b09ba58ca6
autoretrieve title and description after entering new url
2011-08-23 16:30:55 +02:00
847347b58a
autoretrieve title and description after entering new url
2011-08-23 16:30:29 +02:00
672515c23f
Bookmarks DB structure change, description is optional
2011-08-23 15:24:44 +02:00
89839b4c63
fetch bookmarks even if they are not tagged
2011-08-23 15:12:34 +02:00
7e1759e775
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-23 12:03:49 +02:00
3c3a859b89
follow coding style and use single quotes in php
2011-08-23 12:03:20 +02:00
72a4703d82
simplify bookmarks tag filter sql
2011-08-23 11:57:56 +02:00
53f0381f0f
make tag filter compatible with sqlite
2011-08-23 11:43:27 +02:00
f5cef2fcbf
cleaned up LDAP settings
2011-08-23 11:40:00 +02:00
3b10cddceb
added icon for Admin
2011-08-23 11:37:29 +02:00
900382057d
updated translations
2011-08-23 11:20:37 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
b2fddc408c
/appinfo/app.php bug fixed
2011-08-22 20:09:33 +02:00
96ad8a15b4
Register OC_Share for autoloading and cleanup hooks
2011-08-22 12:37:44 -04:00
c72187474a
Check that the files exist before adding them to the fakedirs
2011-08-22 12:00:56 -04:00
1b64b7395c
Update documentation for unshareFromMySelf()
2011-08-22 11:31:47 -04:00
fbb63f11e4
Some more work on CalDAV integration
2011-08-22 16:59:16 +02:00
c9a11d0aab
some work on media player interface, artists can be collapsed in the collection view again and single albums/songs can be played
2011-08-21 15:28:20 +02:00
09c8cd17cc
remove reset button (again)
2011-08-20 22:50:43 +02:00
0eda75a193
One more bug fix in clearFolderSizeCache()
2011-08-20 15:48:48 -04:00
f10f916f8c
Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes
2011-08-20 15:43:18 -04:00
ceae4fa7b4
Fix bugs preventing file upload in shared folders with write permission
2011-08-20 12:36:20 -04:00
b05be2f26d
Fix textviewer in search results
2011-08-20 12:18:56 -04:00
6afc17be1a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-20 12:03:22 -04:00
631152fc3e
Implement searching of files shared with you
2011-08-20 12:03:03 -04:00
d15673f13f
removed single quotes around publicly linked download file
2011-08-20 17:44:28 +02:00
3cb07254e5
allday bug fixed
2011-08-20 16:52:03 +02:00
fc4d31547b
spanish language pack
2011-08-20 16:02:44 +02:00
8e32cfbf15
bug/style fixes, multiple language support, german language pack
2011-08-20 15:19:43 +02:00
eac4d4ff06
When deleting a bookmark, remove its tags from database.
2011-08-20 12:38:15 +04:30
add0a90e1e
single quotes in JavaScript & PHP, double quotes in HTML
2011-08-20 05:56:04 +02:00
389b2775c2
translation update
2011-08-20 05:12:16 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
c2f0fe51c4
Add getLocalFile() to OC_Filestorage_Shared
2011-08-19 20:05:57 -04:00
778b8543c1
Remove no longer needed functions in OC_Filestorage_Shared
2011-08-19 20:04:35 -04:00
b3f6eb2224
removed unneeded and dangerous reset button
2011-08-19 23:15:27 +02:00
86f6d2fc25
Merge branch 'master' into calendar
2011-08-19 22:58:45 +02:00
d1daca5029
a lot of new functions (e.g. add event form), style fixes, bug fixes
2011-08-19 20:33:48 +02:00
ca86093270
Full support for viewing public links from sharing drop down
2011-08-19 12:47:00 -04:00
5d310ebf92
* Use encodeEntities() function to check input
...
* Separate tags by space
2011-08-19 16:18:08 +04:30
262a652710
Show new bookmark in the list after insertion, And hide it after deletion.
2011-08-19 13:30:05 +04:30
a57d4726bc
Remove some scripts, now you can actually download the files in a public link folder
2011-08-18 19:44:00 -04:00
d1aebcddf2
Add downloadURL to files templates for both public links and files
2011-08-18 19:32:24 -04:00
498356fcb8
Copy get.php into files_sharing, public links now use files templates
2011-08-18 15:35:31 -04:00
4c49a81c8e
language updates, optimization of Help HTML
2011-08-18 19:22:44 +02:00
594532da9a
Merge public link icon check
2011-08-18 13:14:06 -04:00
2ee9e80afe
Swedish translation, thanks to HakanS
2011-08-18 14:33:05 +02:00
6720a45d65
updated translations
2011-08-18 11:46:49 +02:00
8fb75f379a
Comment rename() and prevent trying to move items if the user doesn't have write permission
2011-08-17 22:10:25 -04:00
b4cf61ee32
Bug fixes for mkdir(), renaming/moving support for files inside a shared folder with write permission
2011-08-17 21:58:53 -04:00
4078e0a242
-1 is now a class constant (UNSHARED), for unsharing files from self
2011-08-17 18:00:37 -04:00
1303e40b6e
Remove navigation entry for shared files
2011-08-17 17:44:10 -04:00
5b8658ca10
New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self
2011-08-17 17:43:15 -04:00
1c13b2681a
Fix my last commit 9ee4fc
2011-08-17 14:22:14 -04:00
9ee4fcdf2f
Only show 'Shared' directory if files are shared with you
2011-08-17 13:47:10 -04:00
5925697374
Fix bug in getPermissions() and clean-up unlink() and rename()
2011-08-17 12:58:09 -04:00
683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
b7b3a49203
Functions to get the token of a public link now stored by OC_Share, remove no longer needed ajax call to getlink.php
2011-08-16 21:32:51 -04:00
0edce1796b
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-16 20:21:57 -04:00
582dca4d91
Initial merging of files_sharing and files_publiclink
2011-08-16 20:21:18 -04:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
9f28c20660
fix collection browsing using the ampache api
2011-08-17 00:07:17 +02:00
ea65d90a41
really open website after click
2011-08-16 23:50:46 +02:00
48df7a2a7d
gain compatibility with sqlite3
2011-08-16 23:49:53 +02:00
0573695d05
fix database layout for sqlite3
2011-08-16 21:56:12 +02:00
9c3a836044
hiding public links from navigation now that it's easier to use in the dropdown
2011-08-16 18:36:36 +02:00
717ab56419
Display public icon next to publicly shared files
2011-08-16 12:18:31 -04:00
726933831d
Public link folder uploading not implemented, comment out checkbox for it in dropdown
2011-08-16 12:06:08 -04:00
fd74e43afa
fix expire header for media player
2011-08-16 14:35:05 +02:00
b885bad2ee
wording fix for bookmarks
2011-08-16 12:45:44 +02:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
1ec75330ec
Merge branch 'master' into sharing
2011-08-15 17:49:36 -04:00
82bd2ad310
Merge branch 'master' into calendar
2011-08-15 23:40:03 +02:00
801e4f8611
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-15 17:38:33 -04:00
5b09aef166
Additional user group sharing support and more clean-up in the constructor
2011-08-15 17:37:16 -04:00
5608aaee8a
initial commit of Bookmarks App
2011-08-15 22:05:07 +02:00
6096568da9
Small design changes in Contacts
2011-08-14 23:49:09 +02:00
39ecef39cd
Fix creation of UID in contacts
2011-08-14 23:49:09 +02:00
2cb231d0a4
resolved merge conflict
2011-08-14 19:31:38 +02:00
5cb687d168
Refactor getUserAndGroups() for new user group sharing standard - user@group
2011-08-14 12:16:14 -04:00
e1473cfe83
Change OC_GROUP to OC_Group
2011-08-14 11:44:37 -04:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
970888b92d
fix some details in Personal
2011-08-14 15:06:16 +02:00
f2a21398d7
more info in personal, WebDAV, OpenID
2011-08-14 11:09:51 +02:00
6f37f2917d
fix media player controlls not showing
2011-08-13 17:53:31 +02:00
ee8e6d5442
DONT always scan the collection, I would like to keep some cpu cycles to actually use my pc
2011-08-13 17:41:34 +02:00
595329a8a0
some player styling
2011-08-13 16:34:40 +02:00
2ba3793671
updated translations
2011-08-13 12:43:15 +02:00
c144976676
start scanning music automatically when in Music
2011-08-13 07:02:51 +02:00
ccf410c7b0
first styling for leftcontent
2011-08-13 07:02:25 +02:00
3b5f16b23c
NEEDS MORE FADING
2011-08-13 06:05:00 +02:00
0c903c63d8
first replacement of media player controls with svg
2011-08-13 05:58:11 +02:00
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
122018889a
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
2011-08-12 21:00:41 -04:00
3c517499bb
OC_Share constructor refactored for user group sharing
2011-08-12 20:49:44 -04:00
b0b5a46543
style media player controls using em instead of px
2011-08-13 00:23:15 +02:00
382834ec2b
highlight playing songs in collection
2011-08-13 00:23:15 +02:00
497789cdd8
Clean up constructor for OC_Share, add some error handling for sharing files
2011-08-12 17:22:32 -04:00
a8e6be6016
Change the share file action icon if the file is already shared with someone
2011-08-12 11:34:17 -04:00
a61dde9b52
old files deleted
2011-08-12 14:39:24 +02:00
4ae5c4bc33
bug fixes, style fixes
2011-08-12 14:29:45 +02:00
5a26640f63
partly fix media player
2011-08-12 12:54:49 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
9e35d5a886
Remove hardcoded http:// when generating public links
2011-08-11 16:56:09 -04:00
ce9b36fd3e
some interaction design for user management
2011-08-11 21:00:48 +02:00
c65046773d
Make unshare work from dropdown
2011-08-11 14:20:50 -04:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
6d25943f2f
Fix some areas on dropdown triggering the dropdown to hide
2011-08-11 12:50:29 -04:00
0ad0ed77c5
Hide the dropdown if you click the share file action button
2011-08-11 12:03:48 -04:00
0f91438b80
Don't spawn a new dropdown if there is already one open
2011-08-11 11:52:10 -04:00
2af0269eb9
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
...
Conflicts:
apps/files_sharing/js/share.js
2011-08-11 11:15:17 -04:00
103d23b3a3
Refactoring in dropdown javascript
2011-08-11 11:09:14 -04:00
26ac7f0f1d
get rid of some js errors on the login screen
2011-08-11 16:53:00 +02:00
c824572b91
fix the getlink calls
2011-08-11 16:15:55 +02:00
568fd0df83
changed quotes
2011-08-11 13:53:25 +02:00
511c193631
only load share action when in file browser
2011-08-11 13:33:43 +02:00
b4e89871dd
merged master into sharing
2011-08-11 13:29:22 +02:00
c9c1633882
some work on media player
2011-08-11 11:27:20 +02:00
414e5e174d
merge Georgs calendar
2011-08-11 11:22:07 +02:00
4915610b5f
Fix creation of UID in contacts
2011-08-11 11:20:12 +02:00
8639630a18
polished public links a bit
2011-08-11 11:10:41 +02:00
110f96df78
At least dome layout in Contacts
2011-08-11 10:08:02 +02:00
5324d6f7df
Small fixes
2011-08-10 22:27:55 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
80660bdc07
Fix shared list for files inside of shared folders
2011-08-10 13:38:58 -04:00
c4931cff34
Delete addressbooks of deleted users
2011-08-10 14:28:14 +02:00
cdf91b6b3e
work in new app management
2011-08-10 14:03:54 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
58ab3883b9
Add description to contacts
2011-08-10 11:32:06 +02:00
2b59912b3d
Add CardDAV path
2011-08-10 11:19:12 +02:00
88e338ec23
Only show can edit (if not checked) and unshare button on hover
2011-08-09 17:55:51 -04:00
891ac04c19
Remove references to "multiple addressbooks" :-(
2011-08-09 18:05:52 +02:00
ce76cece09
Remove warning
2011-08-09 18:00:14 +02:00
c6f499c685
Some more fixes. It basically works but looks ugly
2011-08-09 17:42:54 +02:00
7c840e9bbb
Remove users and groups from the select form that have already been shared with
2011-08-09 11:00:14 -04:00
c654442901
No more subnavigation entries, fixing 'Shared'
2011-08-09 10:45:12 -04:00
ec6aed8475
Merge branch 'master' into sharing
2011-08-09 10:42:50 -04:00
cdf2dbcd52
Use chosen select form for selecting users in sharing drop down
2011-08-09 10:34:00 -04:00
6d1c266e1e
You don't always have parameters in vcards!
2011-08-09 15:00:10 +02:00
075db9f7ea
Add default addressbook
2011-08-09 14:49:28 +02:00
5047b6e385
Fix naming bug
2011-08-09 14:15:11 +02:00
76fc062f27
Some more work on the address book
2011-08-09 13:53:58 +02:00
7b38e5d7c7
apps can now add their own forms to the Personal page
2011-08-08 23:46:52 +02:00
6aaa49d386
more media player fixes
2011-08-08 22:31:17 +02:00
23c8d7b3fb
Show which parent folder is shared with the user in the sharing drop down
2011-08-08 15:49:16 -04:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
3b34cba4ae
first mediaplayer styling
2011-08-08 21:40:39 +02:00
8c34ea496a
initial work on the media player interface rework
...
it looks bad atm bu should work enough to be stylable
2011-08-08 17:53:03 +02:00
968f1282ce
Merge branch 'master' into sharing
2011-08-08 13:19:40 +02:00
544c61f983
updated public link fix
2011-08-08 13:19:22 +02:00
b9ce564053
Merge branch 'master' into sharing
2011-08-08 13:04:10 +02:00
ecd2738e83
fixed upload button
2011-08-08 12:48:43 +02:00
b1a369b49f
quick fix for public links, removed expiration date and styled correctly
2011-08-08 11:17:03 +02:00
1aa89b7cbb
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
lib/base.php
2011-08-07 15:56:26 -04:00
5d521d7c7c
Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions
2011-08-07 15:20:57 -04:00
5e2f7bfda9
Small details in contacts
2011-08-06 23:29:25 +02:00
77fccc9d00
TEMPORARY update path for carddav testers
2011-08-06 23:09:55 +02:00
42a6549729
Database.xml
2011-08-06 23:09:38 +02:00
2f10598af6
New app: contacts
2011-08-06 22:32:06 +02:00
f039320a0b
move openid settings to Personal
2011-08-06 10:08:26 +02:00
c998bc1215
fix some issues with browsers not supporting html5 localStorage
2011-08-06 10:08:26 +02:00
843f8aca7c
Full support for making and deleting public links from share dropdown
2011-08-05 11:18:35 -04:00
60a7a9d6f0
allow users to use myhost/owncloud/?myusername as openid identity
2011-08-04 18:49:29 +02:00
122c3a3cf8
dont show confusing 'X files scanned' message when we are not scanning files
2011-08-04 01:26:29 +02:00
93b342ee39
only load the music player outside the media app if the media app isnt already open in another tab
2011-08-04 01:19:21 +02:00
8f01abf054
Share dropdown updates, making public links now works
2011-08-03 15:21:53 -04:00
4851a55c1d
cache the collection for the media player again
2011-08-03 15:36:47 +02:00
de0e16a6f3
fix a bug in the media player outside the media app
2011-08-03 14:26:37 +02:00
8e5184a8b9
correctly save the playlist if songs are removed and dont load the player outisde the media app if the playlist is empty
2011-08-03 14:23:35 +02:00
c79af7cc4f
removed icon for public links navigation subentry
2011-08-03 04:44:17 +02:00
fdb944e7a3
send the filename header for public links
2011-08-03 02:29:33 +02:00
6527048164
dont force a download for public links
2011-08-03 01:06:25 +02:00
a2062036d3
selecting a text file from the search results now activates the text viewer
2011-08-03 00:30:21 +02:00
ad51328408
some fixes for the textviewer already
2011-08-03 00:01:31 +02:00
dd5cc8dcaf
add textviewer plugin
2011-08-02 23:56:53 +02:00
96ab35a331
Animate appearance of share drop down
2011-08-02 15:23:17 -04:00
d0b2a3b1ac
moved dialog css to sharing, fixed position
2011-08-02 19:30:18 +02:00
d71cca0e81
first style for sharing dropdown, some html fixes
2011-08-02 18:58:33 +02:00
0d79560e94
New implementation of share dialog
2011-08-02 12:19:49 -04:00
957b9e8b84
send last modified header for media
2011-08-02 17:02:27 +02:00
900adb35d8
make the progres bar for scanning always go to the full 100%
2011-08-02 04:43:08 +02:00
02ebc4879a
rename media to music in the navigation
2011-08-02 04:27:11 +02:00
c0e7cf2e40
remove now useless 'media' entry from settings
2011-08-02 04:26:32 +02:00
c814f10d7f
fix media sub navigation entries
2011-08-02 04:14:54 +02:00
9f981de854
fance collection scanning wip
2011-08-01 23:55:47 +02:00
ddfc9fc001
Move registering shared storage out of base
2011-08-01 10:58:15 -04:00
29239d6638
remember volume and playback time in the media player
2011-08-01 16:43:02 +02:00
30ce4e5b6b
properly save play/pause state of media player
2011-08-01 16:20:15 +02:00
57ca70e27c
Add support for assigning permissions in share dialog and switch to post
2011-07-31 20:47:53 -04:00
ef22498c6f
some fixes for persistent playlists
2011-08-01 01:59:57 +02:00
9b764cb7f4
show names of next/previous song when you hover the next/previous button
2011-08-01 01:25:34 +02:00
28a64bc2f8
fix an isue with persitent playlists inside the media player app
2011-08-01 01:21:50 +02:00
1933426e3e
make the persitent playlist work anywhere
2011-08-01 01:20:00 +02:00
e1596cc65a
fix bug in saving currently played song
2011-08-01 01:17:54 +02:00
76a2f5b547
persistent playlist for the media player
2011-08-01 01:12:28 +02:00
cbf8f822de
automatically scan songs that are played from the filebrowser
2011-08-01 00:32:44 +02:00
f88b477459
fix search results not displaying
2011-08-01 00:25:53 +02:00
bd6b38e638
cache the media collection between page loads
2011-08-01 00:18:09 +02:00
2d19965750
some improvements to collection scanning
2011-08-01 00:07:46 +02:00
a14a83b9c6
Fix delTree(), it shouldn't be passed to the local storage provider unless the user has delete permission
2011-07-31 15:02:59 -04:00
c185743ae9
Update the folder sizes for shared folders
2011-07-31 14:48:23 -04:00
6e2ce76223
use db transitions for collection scanner
2011-07-31 20:25:13 +02:00
aff8bc62d2
some improvements in oc_media_collections
2011-07-31 20:24:27 +02:00
f88c4b1f48
Human readable permissions in shared files list
2011-07-31 13:15:07 -04:00
17058c9467
Merge branch 'master' into sharing
2011-07-31 12:53:34 -04:00
eb3526c9a6
show images on click in search results
2011-07-31 02:35:54 +02:00
0d3ebbfefd
Merge branch 'master' into sharing
2011-07-30 19:57:57 -04:00
11d1627513
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
...
Conflicts:
lib/base.php
2011-07-30 19:40:19 -04:00
3a08f747fb
more tweaks for media search results
2011-07-31 01:39:25 +02:00
0b44db954f
dont show play and add-to-playlist at the same time
2011-07-31 01:25:33 +02:00
e6821e9d7c
Show play and add-to-playlist buttons in instant search results
...
for now this only works from inside the media app
2011-07-31 00:50:04 +02:00
18949aaa0b
move public links to a subentry of files
2011-07-30 22:22:57 +02:00
d13ba0ee2d
Revise permissions system to support read, write, and delete
2011-07-30 16:03:32 -04:00
09e05d14a0
im in ur branch, fixin teh details
2011-07-30 14:40:10 +02:00
924cd17f2e
Icewind destroyed my changes :-(
2011-07-30 08:56:08 +02:00
51e00d074c
add play button to collection overview to add songs to the playlist and play them imediatly
2011-07-30 04:15:09 +02:00
eee2a2266d
disable unimplemented subentries for media player
2011-07-30 03:25:15 +02:00
773d23bbd5
open the correct subpage when the media player loads
2011-07-30 00:32:09 +02:00
93dd1c57cc
update playcount correctly without having to reload the collection
2011-07-30 00:21:24 +02:00
aa7c6f057b
fix issue with selecting songs in playlist
2011-07-30 00:05:44 +02:00
94e25ecb0c
Some much needed interface work on the media player
2011-07-29 23:55:54 +02:00
f0c1f38f98
Add share action for mutliple selected files
2011-07-29 15:43:29 -04:00
bafd684eb6
Renaming classes :-)
2011-07-29 21:36:03 +02:00
2ff8d7a8bc
One class per file!
2011-07-29 21:03:53 +02:00
2bfad189e7
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
...
Conflicts:
lib/base.php
lib/filestorage.php
2011-07-29 20:42:24 +02:00
45222f34a6
Make 'Share' a subnavigation entry of of 'Files'
2011-07-29 12:20:01 -04:00
1fc41a7bfc
Integrate sharing app with the new interface
2011-07-29 12:11:53 -04:00
fcc9f50641
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-07-29 10:23:15 -04:00
72402ff143
removed some more legacy CSS
2011-07-29 04:24:02 +02:00
67fe835f03
Add a function for removing any duplicate or trailing '/' from the paths
2011-07-28 20:28:22 -04:00
7e3b796de8
More elegant solution for preparing IN ?s, thanks icewind
2011-07-28 20:05:18 -04:00
5bc0619234
Add support for sharing files with user groups
2011-07-28 19:42:02 -04:00
dbcebba882
show media icon in settings as well
2011-07-29 01:33:03 +02:00
b88e5ce9a1
added icon to media app
2011-07-29 01:19:09 +02:00
ab81128e5c
dont throw error when the collection scanner cant detect the length of an audio file
2011-07-28 23:34:39 +02:00
ba246d3b27
Merge branch 'master' into interface
2011-07-28 22:20:34 +02:00
31a067b5a3
Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE
2011-07-28 15:31:52 -04:00
bc51425bb7
keep track of playcount as last played time of music files
2011-07-28 20:59:36 +02:00
aa33812104
hopefully fix some issues with the openid server
2011-07-28 20:12:07 +02:00
0d408fe6f5
make use of the command line tools id3info and mp3info for scanning music if they are available
2011-07-28 20:10:58 +02:00
ece6bd663c
show icons instead of text for file actions
2011-07-28 04:29:04 +02:00
d36850f0f2
Close sharing dialog box on share success
2011-07-27 19:52:10 -04:00
64b5332f33
Make file sharing dialog work - only works for one file/folder and user
2011-07-27 19:25:33 -04:00
2f807a3c7f
Delete requires in applications where possible
2011-07-27 19:25:49 +02:00
0dad1f8ccb
merge master into interface
2011-07-27 16:42:58 +02:00
6585e83037
fix flash fallback for media player and bumb version of jplayer to 2.0.23
2011-07-27 16:40:26 +02:00
ff3140052a
Merge branch 'master' into sharing
2011-07-26 21:29:44 -04:00
1ec0b6ecc1
jQuery dialog for sharing files from within file browser - Not functional yet
2011-07-26 21:27:40 -04:00
344b7f548b
only show songs for which the current user has songs indexed
2011-07-26 22:21:28 +02:00
d6d38ac3fa
only load image viewer when in the file browser
2011-07-26 21:18:13 +02:00
48fe201dd5
fit player controls in smaller header
2011-07-26 16:43:41 +02:00
0e05a86484
some refactoring of the media player code
2011-07-26 16:05:24 +02:00
415ae8e40a
Merge branch 'master' into sharing
2011-07-24 16:08:39 -04:00
5148eb9121
Include groups in user autocomplete
2011-07-24 16:07:39 -04:00
4282a42b3f
Add support for user autocomplete
2011-07-24 15:47:37 -04:00
17b5bcb24f
Bug fixes for unshare() and opendir(), thanks darkh
2011-07-24 14:38:01 -04:00
4993fb4665
Filter out files you unshare from yourself in opendir()
2011-07-23 14:41:01 -04:00
e6e673d7c0
Use SUBSTR instead of LIKE in queries, should now work with SQLite
2011-07-22 20:41:16 -04:00
41a2da234a
remove some debug output and supress some possible errors
2011-07-22 19:37:25 +02:00
0387cc5f1f
Merge branch 'master' into sharing
2011-07-21 19:18:26 -04:00
101c6d151e
fix resizing images in image viewer
2011-07-21 23:30:00 +02:00
38f1cffab3
import media app
2011-07-22 06:30:52 +02:00
302527c2d6
Remove shared items check, it prevents sharing items if there aren't already any.
2011-07-21 14:53:51 -04:00
4abefde290
Remove admin page, administration is not needed at this time for sharing
2011-07-20 16:54:06 -04:00
6af4c465b8
Change all occurences of ['user_id'] to OC_USER::getUser()
2011-07-20 16:52:01 -04:00
fcda3a338c
Fix bug in constructor for appending numbers to already existing targets
2011-07-20 16:41:39 -04:00
3e6037659e
Change permissions to is_writeable
2011-07-20 15:42:49 -04:00
22f8415045
Remove accidental kate swap file
2011-07-20 14:46:01 -04:00
1cfa911ce3
Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider
2011-07-20 14:42:48 -04:00
abf6ba621a
Merge branch 'master' into sharing
2011-07-20 14:30:19 -04:00
c9082d5b0d
Append number to name if target file already exists
2011-07-20 14:16:20 -04:00
029b21bf54
First implementation of sharing user interface
2011-07-20 13:34:16 -04:00
6230001a3c
show expire dates of public links as date and not as datetime
2011-07-20 00:55:47 +02:00
9bc3991c23
serveral small fixes to the openid server
2011-07-20 00:53:55 +02:00
61837428ba
Add post_delete and post_rename hooks and fix the constructor
2011-07-18 16:36:34 -04:00
24e81ce4d5
fix some ldap errors
2011-07-18 18:50:21 +02:00
f4121339af
Fix expiring of public links
2011-07-17 17:41:46 +02:00
1a6718c979
Add extra check for opendir() so it only adds the file to fakedirs if it has a different name than the source
2011-07-16 15:15:18 -04:00
f3f8a96c6d
Add return true to unlink() and rename(), a return is expected by OC_FILESYSTEM
2011-07-16 14:58:12 -04:00
5aaacf3241
Fix bug in rename() so files in a folder that is in a shared folder also get their targets updated
2011-07-16 14:29:22 -04:00
dbcb35655e
Fix bugs in opendir() and add extra checks to ensure functionality in all cases
2011-07-16 14:24:59 -04:00
8ad4a44171
Fix bugs in unlink(), rename(), pullOutOfFolders(), and getItemsInFolder()
2011-07-16 13:06:59 -04:00
8ed0223bd6
Add pullOutOfFolder() function for use by unlink() and rename()
2011-07-14 21:04:09 -04:00
7920e706ea
Refactoring of OC_SHARE, added more documentation for functions
2011-07-14 19:24:48 -04:00
2fb1481613
Bug fix for setTarget() - append fetchAll() to query
2011-07-14 12:40:12 -04:00
24e24f1b65
Add support for copying files between shared folders, add check to fromTmpFile() to confirm path is writeable
2011-07-13 15:27:16 -04:00
d393ccfe2c
Fix bug in getSource(), return false if target isn't in database
2011-07-12 20:18:08 -04:00
b2b7d99302
Add checks in opendir() to prevent including the current directory or parent
2011-07-12 18:22:59 -04:00
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
163c490c92
Remove duplicate '/' from target when searching for source
2011-07-10 14:41:27 -04:00
010920ad08
Add support for files inside of shared folders having different names than the source file
2011-07-08 18:21:20 -04:00
73bab46758
Prevent searching for user directory in getParentFolders()
2011-07-08 15:23:41 -04:00
f1cac00396
Add wildcard to source for database query in unshare()
2011-07-08 15:03:05 -04:00
d91d2178b8
Fix unshare() to remove database entries of files within a shared folder
2011-07-08 14:58:35 -04:00
35d6051e9d
Fix bug in mkdir(), was passing the wrong path
2011-07-07 19:26:25 -04:00
b7c45ba240
mkdir() now checks isWriteable() to see if it has permission, rmdir unshares the folder from the user
2011-07-07 19:22:23 -04:00
58e8312b1c
Fix setIsWriteable() and setTarget()
2011-07-07 18:25:34 -04:00
5e560e9bd9
Merge branch 'master' into sharing
2011-07-06 20:19:44 -04:00
2212b5b5d7
Add wildcard to database query in unshareFromSelf()
2011-07-06 20:16:29 -04:00
2908145b94
Fix bug in is_writeable(), was passing the wrong path
2011-07-06 15:28:50 -04:00
732ad7f6c1
Add support for renaming, moving, and deleting shared files
2011-07-06 15:17:03 -04:00
cf33995892
Refactor OC_SHARE to allow for renaming and write permissions
2011-07-06 12:12:29 -04:00
7362f103ed
only use ldap user backend when it is configured
2011-07-06 00:30:57 +02:00
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
05389827fd
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
lib/base.php
2011-07-04 16:36:30 -04:00
7f0dc638ae
Hopefully fix errors if ldap plugin is not configured
2011-07-04 19:05:14 +02:00
e24e2d0e16
Append LIMIT 1 to getSource queries to improve performance
2011-07-03 11:43:49 -04:00
b03083b881
Fix check for parentDir and fix the return for a nonexistent target in the database
2011-06-27 18:14:04 -04:00
053edde780
Improvements to caching for shared folders
2011-06-27 12:53:10 -04:00
a402c8ffe1
Implement caching for source paths in OC_FILESTORAGE_SHARED
2011-06-27 11:47:36 -04:00
fe178310f3
Use php functions dirname() and basename() instead of manipulating strings in getSource()
2011-06-26 19:21:24 -04:00
12c168b6dd
Add function setTarget(), implement recursion in getSource() for folders
2011-06-25 22:00:52 -04:00
78293ea244
Better implementation of getting shared folder size by using the source path
2011-06-24 19:52:35 -04:00
c8781b1caf
Add error handling for getSource()
2011-06-24 19:38:39 -04:00
e91f42d249
Add support for sharing folders
2011-06-24 19:20:08 -04:00
4ac25942de
you can now use your owncloud url as openid provider
2011-06-24 22:09:55 +02:00
7d2784c4c3
add openid headers to openid request page
2011-06-24 18:02:51 +02:00
1aa8399915
show error on openid request page when no user is selected
2011-06-24 17:17:07 +02:00
2772c66259
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-06-24 16:05:48 +02:00
53cb4c16ed
add template to openid request page
2011-06-24 00:27:46 +02:00
735738fe6f
user_ldap: close ldap connection in dtor
2011-06-23 23:57:18 +02:00
5f29f8a831
user_ldap: implement userExists
2011-06-23 23:57:17 +02:00
d4618d633a
user_ldap: use input-type-password for ldap_password
2011-06-23 23:57:17 +02:00
612f8cb954
user_ldap: add port setting
2011-06-23 23:57:17 +02:00
c8e57d5460
Add user_ldap plugin
2011-06-23 23:57:17 +02:00
467778d66f
Merge branch 'master' into sharing
2011-06-23 17:54:49 -04:00
6452f5b5cb
OpenID now won't load if curl is not available
2011-06-23 18:20:59 +02:00
1ce24d892b
don't show errors when the login isn't an openid identity
2011-06-23 17:58:27 +02:00
bd4aec2c4c
Experimental OpenID user backend and server.
...
Currently all users can set one OpenID identity that allows access to the account.
The identity url's for the server is owncloud/apps/user_openid/user.php/$username
2011-06-23 17:08:04 +02:00
8cbee28416
Better implementation of filesize for shared directory, now storing in oc_foldersize
2011-06-22 21:05:31 -04:00
87097db4eb
Changed self:: and OC_FILESTORAGE_SHARED to ->
2011-06-22 19:47:57 -04:00
e3ea84d048
Changed ctime for the shared folder to the earliest ctime
2011-06-22 19:17:31 -04:00
3f5fde50c1
Forgot to remove TODOs for file?time()s
2011-06-22 18:22:48 -04:00
098fc5ef95
Fixed stat(), file?time()'s now grab most recent time from shared files
2011-06-22 18:16:41 -04:00
ac0d41418e
Correct calculation for shared folder size
2011-06-22 17:55:07 -04:00
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
83958ebd4b
add oc_user::getUser to get the user id of the loggedin user
2011-06-22 12:50:57 +02:00
c0af177223
public link config is also for non admins
2011-06-22 12:40:13 +02:00
a7b7f5a76c
app files_publiclink is now translateable
2011-06-20 00:17:49 +02:00
14dddc0c9e
forgot "event" as a parameter.
2011-06-19 14:23:24 +02:00
97ab331b2a
change db index names to avoid collisions
2011-06-18 23:57:03 +02:00
4e7d1c376f
OC_FILESTOAGE_SHARED now works with hard coded values for files
2011-06-18 13:49:52 -04:00
69b5e01be1
OC_FILESTOAGE_SHARED updates + its own getInternalPath()
2011-06-18 13:29:16 -04:00
e6621b9c78
Added source and target to database fields
2011-06-16 15:54:25 -04:00
fe4a213e1b
Fixed mistakes pointed out by icewind
2011-06-16 14:59:54 -04:00
bf66563cda
First version of shared storage provider - not functional
2011-06-16 14:40:21 -04:00
8603b0973f
Initial setup of sharing app
2011-06-11 16:14:24 -04:00
86dd023448
Adding clear logs functions
2011-06-07 15:48:21 -04:00
bc0790381e
fix loading of image viewer again
2011-06-04 23:14:33 +02:00
277e644558
only load image viewer when in file browser
2011-06-04 23:08:38 +02:00
b0476bf174
fix imageviewer again
2011-06-04 22:41:17 +02:00
dab656007d
fix imageviewer not showing up when using the actions menu
2011-06-04 22:21:16 +02:00
e5816451c8
always show the image in the middle of the screen, regardless of scrolling
2011-06-04 22:20:57 +02:00
4b9665a952
image viewer plugin
2011-06-04 20:48:53 +02:00
da2c9aa807
fix broken links in shared folders
2011-06-02 03:00:20 +02:00
8c5a06028a
port sharing by publiclink fully to the 2.0 codebase and provide a simple gui for it
2011-06-02 02:46:50 +02:00
f36f453dd2
apps are now stored in /apps
2011-04-16 09:46:58 +02:00
Robin Appelman
Bart Visscher
Jan-Christoph Borchardt
Björn Schießle
blizzz
Jenkins for ownCloud
Lukas Reschke
Sam Tuke
Michael Gapczynski
Jörn Friedrich Dreyer
Thomas Tanghus
Frank Karlitschek
Tom Needham
hkjolhede
Tom Needham
Lorenzo M. Catucci
Erik Sargent
Björn Schießle
Brice Maron
libasys
icewind1991
Diederik de Haas
Georg Ehrke
Alessandro Cosentino
Felix Moeller
scambra
denis-b
Susinthiran Sithamparanathan
Benjamin Liles
VicDeo
Michael Göhler
Mat Lipe
Bernhard Posselt
jfd
Juan Carlos Cornejo
jfd
BlackEagle
Johannes Willnecker
Michael Gapczynski
Stephan Bergemann
Marco B
Bartek Przybylski
Michiel de Jong
Benjamin Diele
Sam Tuke
Sam Tuke
Klaas Freitag
Jan-Christoph Borchardt
Vitaly Kuznetsov
Florian Hülsmann
Frank Karlitschek
NIEK Antoine
Jakob Sack
Deepak Mittal
Daniele E. Domenichelli
Scott Shambarger
rok
Marvin Thomas Rabe
Georg Ehrke
Florian Pritz
Henning Becker
Steven
David Iwanowitsch
Cloud Dumper
Kshitij Parajuli
Thomas Olsen
Insanemal
Ignacio Daniel Rostagno
Markus Kalkbrenner
krzaczek
Weng Xuetian
Jakob Sack
David Iwanowitsch
Georg Ehrke
Hendrik Langer
John Kristensen
Stephen Rees-Carter
Borjan Tchakaloff
Florian Jacob
Thomas Schmidt
Scott Barnett
Jan-Christoph Borchardt
Bart Visscher
Golnaz Nilieh
Alexander Wigen
Caio Marcelo de Oliveira Filho
Côme BERNIGAUD
Sascha Schneider
Arthur Schiwon
Dominik Schmidt
Kamil Domanski