Thomas Tanghus
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
Thomas Tanghus
996020d82b
Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
...
This reverts commit a36a8faad4
.
Moved it to unstable branch for now.
2012-05-13 06:22:15 +02:00
Georg Ehrke
dfef36ba2f
some changes for calendar repeat class
2012-05-12 23:16:11 +02:00
Georg Ehrke
b1cae9651e
add functions get cached events in a specific time period
2012-05-12 23:00:21 +02:00
Georg Ehrke
dc34ed5a12
Merge branch 'master' into calendar_repeat
2012-05-12 22:55:35 +02:00
Thomas Mueller
546ae30421
non-minified version added
2012-05-12 20:56:29 +02:00
Thomas Mueller
51cb1c9ffa
fixing file headers with copyright
2012-05-12 20:46:07 +02:00
Thomas Tanghus
19b55d3fce
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-05-12 13:43:34 +02:00
Thomas Tanghus
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
Bartek Przybylski
ab9927d5fc
oc-627, calling base function instead of loading too much useless functions
2012-05-12 13:25:04 +02:00
Michael Gapczynski
b4e7c05959
Encoded slashes (%2F) don't look pretty in our private link urls
2012-05-11 20:58:21 -04:00
Michael Gapczynski
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
Robin Appelman
d07512c82d
fix gallery previous not showing
2012-05-12 00:37:19 +02:00
Robin Appelman
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
Arthur Schiwon
3c2af95108
LDAP: offer only ownCloud-enabled users for sharing
2012-05-11 19:21:13 +02:00
Thomas Tanghus
8e5240d579
Contacts: Make the structured name dialog modal to avoid confusion.
2012-05-11 18:21:55 +02:00
Thomas Tanghus
646a4bd635
Contacts: Clone event handlers as well.
2012-05-11 18:21:55 +02:00
Thomas Tanghus
08e0b6cf5e
Contacts: Also strip parameters.
2012-05-11 18:21:55 +02:00
Sam Tuke
d98d72aa99
improved url generation - made use of OC.linkTo() for linking to versions history page
2012-05-11 17:13:58 +01:00
Michiel de Jong
f0362dbf58
register public.php?service=host-meta
2012-05-11 17:25:32 +02:00
Michiel de Jong
9469c9947f
fix warning 'unknown var appsDir'
2012-05-11 16:59:44 +02:00
Arthur Schiwon
7efa7171e3
LDAP: wrong assumptions for case (in)sensitivity, implement far better solution
2012-05-11 15:42:57 +02:00
Michiel de Jong
3fd2e0d2ce
correct host-meta mime type
2012-05-11 15:27:11 +02:00
Michiel de Jong
4c02a82f6c
move lrdd to jrd
2012-05-11 15:26:45 +02:00
Michiel de Jong
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
Michiel de Jong
a95c1b8082
fix auth dialog includes
2012-05-11 15:21:45 +02:00
Sam Tuke
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
Michiel de Jong
61d535984d
clean up auth dialog
2012-05-11 11:05:44 +02:00
Michiel de Jong
2e309aae97
announce OAuth2 implicit grant end-point the new way
2012-05-11 10:52:37 +02:00
Michiel de Jong
02cee2c562
trying to fix /.well-known/host-meta
2012-05-11 10:47:42 +02:00
Michiel de Jong
0c7f0aa3fa
attempt to align the webfinger app with new public.php routing
2012-05-11 10:26:30 +02:00
Michael Gapczynski
59a2616105
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
2012-05-10 23:04:27 -04:00
Michael Gapczynski
20d9a8b6a1
Fix accidental creation of duplicate files because of extra / in search results
2012-05-10 22:04:05 -04:00
Michael Gapczynski
a3f250bfe6
Fix text files for search results
2012-05-10 21:44:04 -04:00
Michael Gapczynski
0c86f8a61e
Fix image previews for search results
2012-05-10 21:36:17 -04:00
Michael Gapczynski
daff3aa667
Prevent overwriting of private link status
2012-05-10 21:06:45 -04:00
Michael Gapczynski
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
Thomas Tanghus
e5840e1fe2
Contacts: Hack to add structured name from formatted name.
2012-05-11 01:14:11 +02:00
Thomas Tanghus
aa51639271
Contacts: Fix check for version.
2012-05-11 01:14:11 +02:00
Thomas Tanghus
78c11700f9
Added some margin.
2012-05-11 01:14:11 +02:00
Brice Maron
4094f6f8e0
Correct undef variable mistake from prev commit
2012-05-10 19:51:03 +00:00
Jan-Christoph Borchardt
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
Brice Maron
ffe5ef2268
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
Thomas Tanghus
7bc6e86969
Contacts: Fix some regressions from last commit.
2012-05-10 20:44:12 +02:00
Michael Gapczynski
3c6c8ecab0
Make email private link submit on enter as well
2012-05-10 11:44:06 -04:00
Thomas Tanghus
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
Thomas Tanghus
ddd991a59e
Minor css fix.
2012-05-10 16:42:10 +02:00
Jan-Christoph Borchardt
e3f452cf53
larger clickable area for new button
2012-05-10 14:08:08 +00:00
Jan-Christoph Borchardt
2ae37b32d4
fixing background for clicked new button
2012-05-10 13:44:30 +00:00
Jan-Christoph Borchardt
8fc565821f
reduced text shadow brightness
2012-05-10 13:37:48 +00:00
Jan-Christoph Borchardt
46b1f35107
highlight the files new and upload button all the time
2012-05-10 13:34:44 +00:00
Arthur Schiwon
7a5028317d
LDAP: don't fall over case insensitive LDAP attribute name
2012-05-10 12:59:20 +02:00
Vitaly Kuznetsov
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
Bart Visscher
9a66b869c0
Gallery: Use App storage instead of contructing our own path
2012-05-10 09:14:27 +02:00
Bart Visscher
b022ccb863
Whitespace fixes
2012-05-10 09:14:26 +02:00
Bart Visscher
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
Bart Visscher
94803dc222
Gallery: No short tags
2012-05-10 09:04:10 +02:00
Bart Visscher
2062ebacef
Gallery: Show thumbnails after document is ready
2012-05-10 09:04:10 +02:00
Michael Gapczynski
93c0e8b3bf
Fix unsharing files also deleting private link, bug fix for oc-251
2012-05-09 17:38:35 -04:00
Brice Maron
de6aa0f88c
Use a clean uri param constructor to get files
2012-05-09 21:35:59 +00:00
Michael Gapczynski
98cd98e2e5
Skip over users that have already been shared with when sharing with a group
2012-05-09 17:16:31 -04:00
Michael Gapczynski
d4636f4b86
Fix renaming of shared files if target already exists, bug fix for oc-81
2012-05-09 17:01:46 -04:00
Michael Gapczynski
2e826fa82a
Go back to updating mtime of shared folder to invoke a file cache rescan
2012-05-09 16:20:38 -04:00
Robin Appelman
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
Michael Gapczynski
14b240a3f4
Still trying to fix some sharing use cases
2012-05-09 13:51:52 -04:00
Georg Ehrke
a589a700e1
revert 000d7ba975
2012-05-09 18:34:44 +02:00
Georg Ehrke
99db3c01ee
fix bug in events.php
2012-05-09 17:36:48 +02:00
Michiel de Jong
890c57bad5
fix requires in apps/remoteStorage/ajax/revoke.php
2012-05-09 15:40:39 +02:00
Michiel de Jong
4de182c7af
bearer token should be the whole thing, not the http basic pass
2012-05-09 15:28:30 +02:00
Michiel de Jong
9d443e021d
new requires in WebDAV.php
2012-05-09 15:28:30 +02:00
Michiel de Jong
2cf5bb6849
new requires now necessary
2012-05-09 15:28:30 +02:00
Michiel de Jong
7d090a45d2
attempt at reusing access tokens
2012-05-09 15:28:30 +02:00
Robin Appelman
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
Georg Ehrke
000d7ba975
fix bug in calendar
2012-05-09 11:53:16 +02:00
Arthur Schiwon
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
Brice Maron
fae1ce4ea7
Correct file move by dropping on folder
2012-05-08 22:07:14 +00:00
Arthur Schiwon
c1490239e5
LDAP group: support for memberUid, fix for oc-594
2012-05-08 23:49:33 +02:00
Tom Needham
7dcf38c40f
Better checking of ajax paramters and better logging
2012-05-08 19:48:28 +00:00
Brice Maron
41d0308806
Change label for saving bookmark button
2012-05-08 19:04:06 +00:00
Bart Visscher
4f88fadbc1
Add remote for media/tomahawk.php
2012-05-08 18:40:40 +02:00
Bart Visscher
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
Brice Maron
fa4a52260f
Try to correct query string url for search in bookmark
2012-05-08 16:22:35 +00:00
Michael Gapczynski
f6df71b74d
Set Content-Disposition to attachment for shared private links
2012-05-08 10:27:02 -04:00
Arthur Schiwon
9dee2a6b2c
LDAP: settings for group filter, fixes oc-587
2012-05-08 14:44:29 +02:00
Arthur Schiwon
c067cfc3b5
, not .
2012-05-08 14:09:38 +02:00
Arthur Schiwon
d01db3a807
LDAP: make sure, configuration is read when a public method needs it
2012-05-08 14:02:16 +02:00
Arthur Schiwon
5dee914ed2
LDAP: sqlite compatibility
2012-05-08 13:56:07 +02:00
Arthur Schiwon
251a6d1a9f
LDAP: write to log in case bind fails.
2012-05-08 12:04:52 +02:00
Georg Ehrke
cdf5d4e231
fix for previous commit
2012-05-08 08:49:14 +02:00
Georg Ehrke
0ce1cbdd14
fix calendar vulnerability
2012-05-08 08:46:27 +02:00
Brice Maron
010b97febd
Avoid touch operation when unshare public link
2012-05-07 22:37:18 +00:00
Bart Visscher
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
Georg Ehrke
9b5e0bebef
fix path for ampache in settings
2012-05-07 20:47:32 +02:00
Georg Ehrke
5b7cefb1e5
make ampache work with remote.php
2012-05-07 20:26:09 +02:00
Arthur Schiwon
5a1ea62437
LDAP: Fall back to Base DN if user/group base settings are blanked
2012-05-07 18:38:02 +02:00
Michael Gapczynski
bf8b3b0696
Forgot to set token variable
2012-05-07 12:36:29 -04:00
Arthur Schiwon
e9c7ecf22d
applying coding guideline
2012-05-07 17:35:23 +02:00
Arthur Schiwon
0ff5ab65be
applying coding guideline
2012-05-07 17:35:23 +02:00
Michael Gapczynski
e0a5f976e7
Fix bug oc-542, encode urls for private links
2012-05-07 11:30:36 -04:00
Michael Gapczynski
71423ec566
Fix bug oc-402, check if token is set for a private link
2012-05-07 10:47:55 -04:00
Michael Gapczynski
b9033d3b78
Only load sharing statuses if in files app
2012-05-07 10:47:55 -04:00
Georg Ehrke
f28d71bb9c
fix gallery sharing
2012-05-07 16:46:35 +02:00
Georg Ehrke
ef073a148f
make calendar compatible with public.php
2012-05-07 15:48:41 +02:00
Georg Ehrke
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
Georg Ehrke
5904d5cf50
Merge branch 'remote.php'
2012-05-07 15:07:16 +02:00
Georg Ehrke
1138df0f4b
fix webdav, bloody merge conflicts
2012-05-07 12:47:34 +02:00
Georg Ehrke
6bdbcc1f49
fix path of carddav in addressbook management
2012-05-07 12:18:58 +02:00
Georg Ehrke
b125caaaf6
fix path of caldav in calendar management
2012-05-07 12:16:25 +02:00
Georg Ehrke
ef10603c26
fix pathes in calendar and contacts
2012-05-07 12:02:20 +02:00
Georg Ehrke
46fe2e3e2a
fix merge conflicts
2012-05-07 11:47:14 +02:00
Georg Ehrke
7d2a68fc31
make carddav work with remote.php
2012-05-07 11:24:19 +02:00
Florian Hülsmann
8534373f2f
better invalid webfinger URI handling
2012-05-07 11:15:24 +02:00
Michiel de Jong
3a184e2e1d
whitespace correction in webfinger.php
2012-05-07 09:51:37 +02:00
Michiel de Jong
c4e47953ac
require base lib and deal with malformed user addresses in webfinger.php
2012-05-07 09:46:15 +02:00
Michiel de Jong
5155f589fd
prevent xss in webfinger
2012-05-07 09:26:54 +02:00
Bart Visscher
2d581c675f
Audit: Log sharing actions
2012-05-07 09:04:07 +02:00
Bart Visscher
a2df8a4746
Audit: Log messages with separate function
2012-05-07 09:04:07 +02:00
Bart Visscher
1e12db35ee
Audit: Add user login/logout logging
2012-05-07 09:04:07 +02:00
Bart Visscher
640ba1828f
Start of audit app
...
Audit the filesystem action
2012-05-07 09:04:07 +02:00
Thomas Tanghus
65b9850e53
Code cleanup.
2012-05-07 04:46:09 +02:00
Michael Gapczynski
471cad7d90
Remove manual file cache insertions of shared files, update mtime of shared folder
2012-05-06 20:14:29 -04:00
Michael Gapczynski
41179a1456
Fix feedback for sharing errors
2012-05-06 19:06:24 -04:00
Brice Maron
333345d201
Add php-pdo to soft depend check
2012-05-06 21:42:33 +00:00
Brice Maron
fe8b10a922
Add php-xml as dependency for core fix oc-364
2012-05-06 21:38:35 +00:00
Frank Karlitschek
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
Thomas Tanghus
2488cdb8a1
Calendar: Fixed image paths.
2012-05-06 19:19:16 +02:00
Thomas Tanghus
5bf69cace1
Contacts: Re-added some styling that got lost in a revert.
2012-05-06 19:19:15 +02:00
Brice Maron
9dbc6b5158
Correct wrong DB quotes for calendar share functions
2012-05-06 15:41:14 +00:00
Thomas Tanghus
bede32be24
Contacts: Fix for Android browser again, again.
2012-05-06 13:51:16 +02:00
Thomas Tanghus
c1019a6e98
Contacts: Resized Add button. Now how do I add a gradient? ;-)
2012-05-06 13:51:16 +02:00
Thomas Tanghus
400ade063c
Revert Android positioning 'fix'.
...
This reverts commit 20f1c1e6ca
and 93ae945414
.
2012-05-06 13:51:16 +02:00
Thomas Tanghus
f2ec68d40c
Revert "Contacts: Fix for leftcontent positioning in Android browser."
...
This reverts commit 93ae945414
.
2012-05-06 13:51:16 +02:00
Bart Visscher
f69f764e8b
Working remote.php with webdav and caldav
2012-05-06 00:12:51 +02:00
Georg Ehrke
c996600786
push changes
2012-05-05 22:54:14 +02:00
Georg Ehrke
6c2fc0cbe8
fix writing of webdav.php
2012-05-05 20:43:11 +02:00
Georg Ehrke
aa4f01fbcc
fix pathes for cal andcarddav
2012-05-05 18:58:58 +02:00
Georg Ehrke
4b4c3c3f3a
remove debug messages
2012-05-05 18:58:58 +02:00
Bart Visscher
24a8451b2e
Tasks: Fix addtask for <5.4 php version
2012-05-05 18:48:24 +02:00
Georg Ehrke
101406eba7
fix writing in remote folder
2012-05-05 18:29:26 +02:00
Bart Visscher
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
Bart Visscher
2092caf6d3
Tasks: Fix add task action
2012-05-05 18:16:14 +02:00
Robin Appelman
70cb053e6b
improve cryptstream fro writing non-chunksized data
2012-05-05 16:49:48 +02:00
Robin Appelman
d875191777
only emit the filesystem hooks once when creating a new file
2012-05-05 16:49:48 +02:00
Florian Hülsmann
4a7591d0ab
Custom icons for contacts app
2012-05-05 16:31:58 +02:00
Thomas Tanghus
74a0df335a
Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing
2012-05-05 15:23:48 +02:00
Thomas Tanghus
eda42cece9
Contacts: Don't try to render invalid properties.
2012-05-05 13:49:47 +02:00
Thomas Tanghus
f9aadfff7a
Contacts: Set min-width on note to make it render correctly.
2012-05-05 13:49:47 +02:00
Frank Karlitschek
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
Thomas Tanghus
2c264f836c
Contacts: Better checks for GD library.
2012-05-04 23:53:29 +02:00
Bart Visscher
d0b7b01737
Tasks: Some styling
2012-05-04 20:57:37 +02:00
Bart Visscher
19d2b94837
Tasks: More updates to public API
2012-05-04 20:20:37 +02:00
Thomas Tanghus
76b8d06284
Add missing file.
2012-05-04 20:17:15 +02:00
Bart Visscher
1fef13b0c0
Calendar: Use array_merge to join event arrays
2012-05-04 17:34:13 +02:00
Bart Visscher
eae21f3269
Tasks: Fix ajax calls in javascript
2012-05-04 17:27:10 +02:00
Bart Visscher
0006b432f5
Tasks: Update for movable apps
2012-05-04 17:20:24 +02:00
Bart Visscher
439467746a
Tasks: Update to new public API
2012-05-04 17:19:25 +02:00
Bart Visscher
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
Thomas Tanghus
01da64caf7
Contacts: Changed the Add property button to not fixed and use plain button.
2012-05-04 16:36:45 +02:00
Thomas Tanghus
248eae2d0f
Contacts: Improve NOTE UI. Cleanup markup.
2012-05-04 15:47:55 +02:00
Arthur Schiwon
907fa9d85b
LDAP: check first, if requested attribute exists
2012-05-04 14:13:23 +02:00
Arthur Schiwon
716c5a3c8e
LDAP: use the correct attribute for the display name
2012-05-04 14:02:04 +02:00
Arthur Schiwon
231eec7325
LDAP: also those functions were not meant to be static
2012-05-04 13:48:55 +02:00
Arthur Schiwon
6c670cb82d
LDAP: more cleanup
2012-05-04 13:48:18 +02:00
Arthur Schiwon
333e8986f6
LDAP: copyright stuff
2012-05-04 13:26:07 +02:00
Arthur Schiwon
def59755ad
LDAP: cleanup
2012-05-04 13:26:07 +02:00
Arthur Schiwon
adb32ad347
LDAP: checkPassword ain't static
2012-05-04 13:26:07 +02:00
Arthur Schiwon
594221a467
LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
Arthur Schiwon
3499783ea5
remove debug info
2012-05-04 13:26:07 +02:00
Arthur Schiwon
7aad40ca4d
LDAP: make oc_user_ldap::userExists make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
Arthur Schiwon
6f982d2e20
LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP
2012-05-04 13:26:07 +02:00
Arthur Schiwon
7a06e144ec
LDAP: central function for user and group list retrieval (will replace retrieveList from group part)
2012-05-04 13:26:07 +02:00
Thomas Tanghus
2296521a2e
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
2012-05-04 11:16:29 +02:00
Thomas Tanghus
e61e40c23d
Contacts: Hack around malformed BDAY.
2012-05-04 01:27:59 +02:00
Thomas Tanghus
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
Bart Visscher
07ff1e723a
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
Bart Visscher
89c8316f8f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2012-05-03 23:26:43 +02:00
Bart Visscher
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
Arthur Schiwon
76a60a2fc3
ups, we don't have a CSS file therefore
2012-05-03 23:03:05 +02:00
Bart Visscher
b6ea57c8b6
Bookmarks: Move delete code to Bookmarks class, also change to use id
2012-05-03 17:33:57 +02:00
Thomas Tanghus
8076b1e12d
Contacts: Remove some logging.
2012-05-03 16:01:40 +02:00
Thomas Tanghus
a89231ac1d
Contacts: Clean up tipsies.
2012-05-03 16:01:40 +02:00
Thomas Tanghus
5be9084c73
Contacts: Fixed paths in import.
2012-05-03 16:01:40 +02:00
Thomas Tanghus
cbee0d3128
Contacts: Fix paths and improve markup and css in address book overview.
2012-05-03 16:01:40 +02:00
Frank Karlitschek
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
Frank Karlitschek
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
Thomas Tanghus
375ba98645
Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path.
2012-05-03 11:15:44 +02:00
Thomas Tanghus
15be032740
Contacts: Improve loading contact.
2012-05-03 11:15:44 +02:00
Thomas Tanghus
6cc9f600d2
Contacts: Don't resize profile picture if it's not too big.
2012-05-03 11:15:44 +02:00
Frank Karlitschek
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
Michael Gapczynski
80dff77b65
Fix private links
2012-05-02 19:24:43 -04:00
Robin Appelman
e5ef3e1340
move archive library to core so we can properly depend on it
2012-05-02 23:48:23 +02:00
Robin Appelman
0b51c53443
run none of the extranal storage tests on default
2012-05-02 23:44:00 +02:00
Robin Appelman
4ba527625f
don't try to register file actions when we're not in the files app
2012-05-02 23:26:57 +02:00
Bart Visscher
47081a2471
Gallery: Update version for database update
2012-05-02 21:36:34 +02:00
Bart Visscher
f7e410147f
Contacts: check for malformed VCards in calendar hook
2012-05-02 21:36:33 +02:00
Michael Gapczynski
6d37b8567b
Refactoring and upload support for Google Drive backend
2012-05-02 14:41:57 -04:00
Frank Karlitschek
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
Frank Karlitschek
eec7c3833c
fix install
2012-05-02 19:02:41 +02:00
Bart Visscher
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
Georg Ehrke
33c343ed11
add require_once('../lib/base.php'); to webdav.php
2012-05-02 16:47:25 +02:00
Georg Ehrke
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
Frank Karlitschek
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
Frank Karlitschek
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
Frank Karlitschek
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
Frank Karlitschek
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
Thomas Tanghus
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
Thomas Tanghus
72256abf34
Contacts: Trying to improve PHOTO handling a bit.
2012-05-02 11:44:00 +02:00
Arthur Schiwon
6750998984
files is not internal any more, part II
2012-05-02 11:26:22 +02:00
Thomas Müller
8ed8d9cd91
fixing namespace
2012-05-02 00:55:26 +02:00
Frank Karlitschek
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
Frank Karlitschek
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
Frank Karlitschek
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
Frank Karlitschek
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
Frank Karlitschek
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
Frank Karlitschek
ab58471904
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-01 20:07:36 +02:00
Frank Karlitschek
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
Michael Gapczynski
20f3875f1b
Change default from address to sharing-noreply@server for emailing private links
2012-05-01 13:06:17 -04:00
Frank Karlitschek
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
Frank Karlitschek
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
Frank Karlitschek
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
Frank Karlitschek
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
Georg Ehrke
f817ff573e
Merge branch 'master' into calendar_repeat
2012-05-01 16:18:55 +02:00
Georg Ehrke
f75a7c084f
add class for repeating events
2012-05-01 16:16:12 +02:00
Frank Karlitschek
3f9ac6405a
port some of the log call to the new public api
...
more to come
2012-05-01 14:29:34 +02:00
Arthur Schiwon
51b6aab436
LDAP: remove Notices on settings
2012-05-01 12:25:17 +02:00
Arthur Schiwon
54854b2e3d
LDAP: decent behaviour and log message when there is no connection to the LDAP server
2012-05-01 12:17:33 +02:00
Bartek Przybylski
11314c81d9
add/remove handlers
2012-05-01 10:07:48 +02:00
Frank Karlitschek
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
Frank Karlitschek
e409e7cd4c
forgot a file
2012-05-01 09:38:10 +02:00
Thomas Müller
5193ddd7d7
fixing syntax error
2012-04-30 21:55:25 +02:00
Georg Ehrke
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
Georg Ehrke
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
Frank Karlitschek
f425b80deb
one todo less
2012-04-30 19:21:29 +02:00
Frank Karlitschek
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
Thomas Mueller
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Thomas Tanghus
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
Thomas Tanghus
a8b6fdd396
Contacts: Small css tweaks.
2012-04-30 01:01:24 +02:00
Thomas Tanghus
0bccd9c18c
Contacts: Forgot to add the import template.
2012-04-29 23:26:14 +02:00
Thomas Tanghus
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
Thomas Tanghus
023479b1e2
Contacts: removed unused method and ajax file.
2012-04-29 22:12:27 +02:00
Thomas Tanghus
163344243b
jquery.combobox: Added 'showButton' option
2012-04-29 22:12:27 +02:00
Frank Karlitschek
b862c49ae6
enable by default. at least during oC4 testing
2012-04-29 21:18:28 +02:00
Frank Karlitschek
0d0129221b
add a info.xml to files
2012-04-29 21:17:22 +02:00
Robin Appelman
84bd83b1dc
fix file deletion
2012-04-29 16:09:41 +02:00
NIEK Antoine
c6f034a5d2
Support "songs" ampache API action for proper rhythmbox support
2012-04-29 00:47:57 +02:00
Jan-Christoph Borchardt
afeb9d9cbf
moving the file actions properly
2012-04-28 23:11:48 +02:00
Georg Ehrke
bef701c448
add version file to files app
2012-04-28 13:35:05 +02:00
Georg Ehrke
7eb7492360
some fixes for sharing
2012-04-27 23:14:53 +02:00
Bartek Przybylski
72c0d6968e
fix duplicated entries on upload
2012-04-27 22:48:27 +02:00
Bart Visscher
6e7f5ec4ce
Tasks: Add input to edit the task location
2012-04-27 20:26:12 +02:00
Bart Visscher
c627657fc6
Tasks: Fix the display of the list of tasks
2012-04-27 17:48:08 +02:00
Sam Tuke
a1b309a42a
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-27 13:23:58 +01:00
Georg Ehrke
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
Sam Tuke
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
Thomas Tanghus
768041b6cb
Contacts: Added convinience method for notifications.
2012-04-27 10:35:31 +02:00
Thomas Tanghus
18c11ec81b
jquery.combobox: Added 'editable' option and cleaned up a bit.
2012-04-27 10:35:31 +02:00
Thomas Tanghus
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
Georg Ehrke
f7fb4a54c9
ampache should work now
2012-04-26 22:00:37 +02:00
Georg Ehrke
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
Georg Ehrke
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
Georg Ehrke
78b2da583d
move files to the correct place
2012-04-26 21:24:41 +02:00
Sam Tuke
d96e962fc1
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-26 18:45:59 +01:00
Sam Tuke
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
Georg Ehrke
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
Sam Tuke
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
Georg Ehrke
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
Michael Gapczynski
754844f5c9
Add ability to send private links from sharing via email
2012-04-26 10:33:24 -04:00
Sam Tuke
6312067ab5
improved styling, called css file in history.php
2012-04-26 14:32:29 +01:00
Georg Ehrke
ebd82ee772
fixes for media app
2012-04-26 15:23:17 +02:00
Georg Ehrke
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02:00
Sam Tuke
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
Georg Ehrke
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
Sam Tuke
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
Thomas Tanghus
4bb1a2c2d6
Contacts: Some js cleanup.
2012-04-26 10:38:39 +02:00
Thomas Tanghus
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
Michael Gapczynski
c20abfef38
Fix a counting mistake
2012-04-25 19:30:58 -04:00
Michael Gapczynski
32de47d1d9
Update sharing when users are removed, added to groups, and removed from groups
2012-04-25 18:18:58 -04:00
Georg Ehrke
b75f680b8e
gallery app seems to work now :)
2012-04-25 21:20:30 +02:00
Georg Ehrke
1a913ac282
bookmarks app seems to work now :)
2012-04-25 21:20:06 +02:00
Michael Gapczynski
6895c54a3f
Fix javascript checkbox toggle for resharing
2012-04-25 14:37:14 -04:00
Arthur Schiwon
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
Arthur Schiwon
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
Arthur Schiwon
a82d709f87
don't forget new JS file
2012-04-25 20:35:30 +02:00
Arthur Schiwon
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
Sam Tuke
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
Michael Gapczynski
7d9587bab3
Forgot to remove error log messages...
2012-04-25 11:54:16 -04:00
Michael Gapczynski
b369adbd94
Allow admin to disable resharing of files
2012-04-25 11:51:30 -04:00
Sam Tuke
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
Sam Tuke
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
Sam Tuke
81f549baee
made code a little more readable
2012-04-25 13:51:08 +01:00
Thomas Tanghus
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
Georg Ehrke
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
Thomas Tanghus
20f1c1e6ca
Forgot to fix one file...
2012-05-06 00:39:01 +02:00
Bart Visscher
6c554d0ffa
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
Thomas Tanghus
93ae945414
Contacts: Fix for leftcontent positioning in Android browser.
2012-05-06 00:34:08 +02:00
Thomas Tanghus
2953f4d11a
Contacts: Removed redundant styles.
2012-05-06 00:34:07 +02:00
Frank Karlitschek
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
Michael Gapczynski
565e02d061
Add back removed groups to the select form correctly
2012-05-05 17:10:07 -04:00
Bart Visscher
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
Bart Visscher
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
Michael Gapczynski
ef9511c713
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls
2012-05-05 15:18:14 -04:00
Michael Gapczynski
d764585d8b
Remove blind effect for email private link in drop down
2012-05-05 14:57:25 -04:00
Georg Ehrke
03f81fdd88
fix js fail in media player
2012-04-25 10:27:17 +02:00
Georg Ehrke
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +02:00
Georg Ehrke
60c0827ba3
Merge branch 'master' into movable_apps
2012-04-25 09:23:01 +02:00
Georg Ehrke
9ee2bb9719
fix js fail in media player
2012-04-25 09:22:19 +02:00
Robin Appelman
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
Robin Appelman
5c3ea14819
fix mimetypes of encrypted files
2012-04-25 00:12:12 +02:00
Georg Ehrke
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Frank Karlitschek
a3d0a74d03
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-24 15:38:36 +02:00
Frank Karlitschek
69a2173fdb
non working app. moved to the apps-playground repository
2012-04-24 14:00:44 +02:00
Thomas Tanghus
b824425186
Added loading indicator.
2012-04-24 11:38:11 +02:00
Thomas Tanghus
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
Thomas Tanghus
22f4acadc0
Contacts: In app import (for Chrome and Firefox only)
2012-04-24 01:44:07 +02:00
Thomas Tanghus
b8da5c5262
Contacts: Tried to format NOTE field a bit. Needs to be improved more though.
2012-04-24 01:44:07 +02:00
Thomas Tanghus
dfc94cbe84
Contacts: In app import. Cleanup still needed.
2012-04-24 01:44:07 +02:00
Thomas Tanghus
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
Frank Karlitschek
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
Bart Visscher
b704ff1bc7
Tasks: Simple add task action
2012-04-23 22:13:35 +02:00
Georg Ehrke
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
Georg Ehrke
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
Georg Ehrke
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
Georg Ehrke
d1110c62ef
fix file path in apps/media/ajax/api.php
2012-04-23 20:01:48 +02:00
Georg Ehrke
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
Bart Visscher
728e6a6bf9
Tasks: Simple categories input
2012-04-23 18:28:44 +02:00
Georg Ehrke
3b9d283245
fix path in apps/files/templats/index.php
2012-04-23 16:25:07 +02:00
Georg Ehrke
c0df15367f
fix style.css of the files app
2012-04-23 16:18:15 +02:00
Georg Ehrke
08fe6bdb27
fix path in /apps/files/js/timezone.php
2012-04-23 16:17:35 +02:00
Jan-Christoph Borchardt
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
Arthur Schiwon
912c87eeda
LDAP: optimize LDAP requests for users and groups. Settings are still to do, though.
2012-04-23 13:04:58 +02:00
Georg Ehrke
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +02:00
Arthur Schiwon
6ee7dc5f59
only retrieve requested attributes
2012-04-23 12:32:17 +02:00
Arthur Schiwon
fffbf26159
don't forget to declare class properties
2012-04-23 11:22:11 +02:00
Thomas Tanghus
82ba2151d1
Wrong app check.
2012-04-23 10:52:13 +02:00
Thomas Tanghus
8f2e9caf96
Contacts: Tipsyfied photo toolbar.
2012-04-23 10:52:13 +02:00
Robin Appelman
d17eba19c1
fix image viewer
2012-04-22 21:27:20 +02:00
Robin Appelman
c5b31b001a
add the option to disable file encryption while still being able to decrypt existing files
2012-04-22 21:27:20 +02:00
Thomas Tanghus
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
Thomas Tanghus
8a6cb23170
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
2012-04-22 20:47:24 +02:00
Georg Ehrke
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
Georg Ehrke
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
Georg Ehrke
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
Thomas Tanghus
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
Thomas Tanghus
24aff287cf
Link to icon was absolute.
2012-04-22 03:39:59 +02:00
Thomas Tanghus
f85aaf1f58
Contacts: Added bg color and shadow to controls. I suck at CSS...
2012-04-22 02:32:51 +02:00
Thomas Tanghus
80ddf37bb7
Missing double quote.
2012-04-22 02:09:13 +02:00
Thomas Tanghus
651de1e588
Contacts: Fix error on photo crop.
2012-04-22 01:50:46 +02:00
Thomas Tanghus
9e3242d05e
Contacts: Changed layout as discussed with JanC. Still WiP.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
56e064bd09
Don't trigger unnecessary change events.
2012-04-22 00:44:53 +02:00
Thomas Tanghus
16fc4dfd1a
Contacts: Fixed contact photo drag'n'drop upload - again...
2012-04-22 00:44:53 +02:00
Thomas Tanghus
a34631f84e
Contacts: Add check for empty FN field.
2012-04-22 00:44:53 +02:00
Frank Karlitschek
69f3b5e2d2
make the button a bit more consistent to the other ownCloud interface
2012-04-21 23:34:24 +02:00
Frank Karlitschek
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
Georg Ehrke
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
Frank Karlitschek
80950f2e1c
make field completely visible
2012-04-21 23:10:35 +02:00
Frank Karlitschek
ff3b199cc8
use less space
2012-04-21 23:08:52 +02:00
Frank Karlitschek
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
Georg Ehrke
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
Georg Ehrke
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
Bart Visscher
acea156a3d
Tasks: Save description field
2012-04-20 23:37:42 +02:00
Bart Visscher
3d68732657
Tasks: Due date without time support added
2012-04-20 22:56:59 +02:00
Georg Ehrke
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
Georg Ehrke
c3d78cf77a
remove require once lib base in files scan.php
2012-04-20 22:34:13 +02:00
Bart Visscher
1384be4bff
Tasks: Task summary is always text, at it as suchs
2012-04-20 18:19:10 +02:00
Bart Visscher
70ba428222
Tasks: Make gettasks more robust against malformed VTODO data
2012-04-20 18:18:07 +02:00
Bart Visscher
c75bbb59a9
Tasks: Add due property handling
2012-04-20 18:16:39 +02:00
Georg Ehrke
3aeea0c196
Merge branch 'merge-requests/105'
2012-04-19 20:31:24 +02:00
Georg Ehrke
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
Robin Appelman
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
Robin Appelman
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
Robin Appelman
d1ad4dc8d6
add test cases for cryptstream
2012-04-18 20:54:28 +02:00
Robin Appelman
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
Robin Appelman
26e9a0dd13
bugfixes for encryption library and test cases
2012-04-18 20:54:28 +02:00
Georg Ehrke
b44bc9f4b2
remove require once lib base in some more files
2012-04-18 17:42:11 +02:00
Bart Visscher
921fc59d8f
Tasks: Add "more" block containing description
2012-04-18 17:28:16 +02:00
Georg Ehrke
45de7ad221
move files to app folder
2012-04-18 17:27:34 +02:00
Georg Ehrke
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
Georg Ehrke
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
Georg Ehrke
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
Georg Ehrke
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
Georg Ehrke
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
Georg Ehrke
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
Robin Appelman
4dabd0fb9c
test data for archives
2012-04-17 18:04:06 +02:00
Bart Visscher
6ba30cb713
Tasks: Clicking task summary opens input for edit
2012-04-17 17:32:21 +02:00
Arthur Schiwon
66018b89b2
LDAP: don't forget to unbind
2012-04-16 18:03:02 +02:00
Arthur Schiwon
86192c2f8d
checked, works for me
2012-04-16 17:31:39 +02:00
Arthur Schiwon
9cd5221d47
group ldap: check configuration
2012-04-16 17:28:58 +02:00
Arthur Schiwon
ed54de1bbf
group LDAP: implement groupExists function, needed for Sharing
2012-04-16 16:23:00 +02:00
Bart Visscher
8afeb0fedb
Tasks: Implement task lists overview
2012-04-16 15:34:14 +02:00
Arthur Schiwon
320fde9eec
OC_Group does expect object, not string
2012-04-16 15:09:38 +02:00
Arthur Schiwon
899c7631d5
minor code beautification
2012-04-16 15:09:38 +02:00
Arthur Schiwon
e1948c651b
use the right attribute for member retrieval
2012-04-16 15:09:38 +02:00
Arthur Schiwon
02f4e78f3e
a string be a string
2012-04-16 15:09:38 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
Georg Ehrke
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
Tom Needham
b0e68d039c
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 15:09:54 +00:00
Tom Needham
712e25bb02
Update ace
2012-04-15 15:09:37 +00:00
Jakob Sack
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
Jakob Sack
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
Robin Appelman
9ac65c51f5
dont try to view psd files
2012-04-15 16:26:08 +02:00
Tom Needham
fef3434bdf
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 14:02:13 +00:00
Tom Needham
738601f4fe
Remove google web font
2012-04-15 14:01:59 +00:00
Thomas Müller
679ddc0e32
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-15 16:01:06 +02:00
Thomas Müller
f36d31f74d
pdfjs updated from github
2012-04-15 15:59:31 +02:00
Arthur Schiwon
80f4c4f923
Bookmarks: handle input with & and ?, fixes oc-201
2012-04-15 15:53:40 +02:00
Tom Needham
9ee3eb1412
remove unused css
2012-04-15 13:44:43 +00:00
Bart Visscher
947d2e5705
Tasks: Mark task as complete when checking the checkbox
2012-04-15 15:39:49 +02:00
Bart Visscher
19d81068f6
Tasks: Code cleanup
2012-04-15 15:38:44 +02:00
Robin Appelman
b3ae2208b1
clean the collection view after rescanning
2012-04-15 15:19:30 +02:00
Robin Appelman
cf3bb08dfb
enable archive support on default
2012-04-15 15:19:30 +02:00
Robin Appelman
9ee931e790
only run archive tests if the test data is available
2012-04-15 15:19:30 +02:00
Arthur Schiwon
819af69972
group LDAP: simple basic tests
2012-04-15 14:50:03 +02:00
Arthur Schiwon
0a46c7a393
group LDAP: usersInGroup not getUsersInGroup
...
offer static readonly properties
2012-04-15 14:50:03 +02:00
Arthur Schiwon
2a03db6065
don't forget changes in lib_ldap for last commit
2012-04-15 14:50:03 +02:00
Arthur Schiwon
8a6fa65ed6
group LDAP: implemented getUsersInGroup()
2012-04-15 14:50:03 +02:00
Arthur Schiwon
b480071946
group LDAP: implemented getUserGroups()
2012-04-15 14:50:03 +02:00
Arthur Schiwon
0912f40ebe
typo
2012-04-15 14:50:03 +02:00
Arthur Schiwon
54a9fd2e6a
group LDAP: implemented inGroup()
2012-04-15 14:50:03 +02:00
Georg Ehrke
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
Georg Ehrke
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
Bart Visscher
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +02:00
Arthur Schiwon
29bb5d27e4
few pieces of documentation
2012-04-14 18:26:51 +02:00
Arthur Schiwon
19243b3e91
give back expected result types as long as logic is not there yet
2012-04-14 18:08:40 +02:00
Arthur Schiwon
e160acefe3
test for ldap group backend
2012-04-14 18:08:40 +02:00
Arthur Schiwon
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
Robin Appelman
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
Robin Appelman
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
Bart Visscher
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
Tom Needham
44c34115a4
Remove go to line
2012-04-14 12:49:31 +00:00
Bart Visscher
7d1880078c
Merge branch 'master' into tasks
2012-04-14 13:47:56 +02:00
Tom Needham
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
Bart Visscher
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
Bart Visscher
524bd2e75f
Sharing: Don't get share icon for undefined filename
2012-04-14 12:45:32 +02:00
Bart Visscher
7504ceb6f2
Sharing: Define missing template vars
2012-04-14 12:45:32 +02:00
Robin Appelman
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
Arthur Schiwon
8ed4606685
LDAP: don't keep possibly outdated passwords
2012-04-14 11:08:50 +02:00
Georg Ehrke
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
Georg Ehrke
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
Georg Ehrke
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
Georg Ehrke
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
Georg Ehrke
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
Georg Ehrke
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
Georg Ehrke
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
Georg Ehrke
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
Georg Ehrke
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
Tom Needham
0aaaefbb4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-13 20:10:35 +00:00
Tom Needham
1165b358b4
Update language string
2012-04-13 20:09:04 +00:00
Bart Visscher
b9f9228a22
Contacts: Save the category list update when updating/adding contact
2012-04-13 21:13:58 +02:00
Bart Visscher
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
Bart Visscher
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
Bart Visscher
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
Bart Visscher
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
Bart Visscher
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
Thomas Tanghus
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
Thomas Tanghus
b654121b50
Contacts: Better error reporting.
2012-04-13 18:50:40 +02:00
Robin Appelman
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
Robin Appelman
8686667b10
some idexes for the media player tables
2012-04-13 18:49:50 +02:00
Georg Ehrke
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
Georg Ehrke
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
Bart Visscher
e9c1f8b4e6
Contacts: No need to sort the categories anymore
2012-04-12 23:10:49 +02:00
Bart Visscher
43ba23430d
Contacts: Change "category" to "group" in UI
2012-04-12 23:10:49 +02:00
Bart Visscher
78189e2247
Contacts: update category list when the categories change
2012-04-12 23:10:49 +02:00
Bart Visscher
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
Bart Visscher
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
Bart Visscher
5fa90cd214
Contacts: Also initialize org var in updateValuesFromAdd
2012-04-12 23:10:49 +02:00
Bart Visscher
86edc0da31
Contacts: add space before parameter
2012-04-12 23:10:49 +02:00
Bart Visscher
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
Frank Karlitschek
48f99fe661
off by default. great tool for developers but confusing for users.
2012-04-12 20:23:45 +02:00
Deepak Mittal
bd262eaac0
Fixed OC-261 by modifying js files in apps/media/
2012-04-12 17:56:53 +02:00
Daniele E. Domenichelli
d9aa31fd92
Use OC_Helper::serverHost() in openid settings
2012-04-12 17:51:17 +02:00
Robin Appelman
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
Georg Ehrke
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
Georg Ehrke
613e15035e
Merge branch 'master' into sabredav_1.6
2012-04-10 22:44:13 -04:00
Georg Ehrke
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
Georg Ehrke
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
Bart Visscher
2dfa02a346
Contacts: fix function names to coding standard
2012-04-10 21:53:36 +02:00
Bart Visscher
3f6e971571
Contacts: Don't lowercase categories value when saving
2012-04-10 21:19:39 +02:00
Bart Visscher
fd72556fd1
Contacts: Make part.no_contacts.php translatable
2012-04-10 21:15:38 +02:00
Georg Ehrke
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
Frank Karlitschek
47f94548ce
don´t enable by default. still broken
2012-04-10 15:05:33 +02:00
Frank Karlitschek
6cf3f10d35
fix includes
2012-04-09 22:51:53 +02:00
Frank Karlitschek
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
Thomas Tanghus
4fda6af725
Contacts: Fix for not being able to add contact to empty/non-existant address book.
2012-04-09 16:30:58 +02:00
Thomas Tanghus
9c247ce874
Removed padding.
2012-04-09 16:30:58 +02:00
Thomas Tanghus
53091551d8
Re-added file I had accidentally removed earlier :-P
2012-04-09 16:30:58 +02:00
Tom Needham
ecc596534a
Decode json response for admin exports
2012-04-08 19:08:17 +00:00
Georg Ehrke
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
Georg Ehrke
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
Georg Ehrke
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
Georg Ehrke
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
Georg Ehrke
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
Georg Ehrke
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
Georg Ehrke
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
Georg Ehrke
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
Tom Needham
c0869887cf
Return JSON for import and export methods of OC_Migrate
2012-04-07 21:55:16 +00:00
Tom Needham
9edf45a324
Merge branch 'master' into migration
2012-04-07 17:31:30 +00:00
Tom Needham
d2886f2020
Hide instance import as it eats data
2012-04-07 17:27:09 +00:00
Tom Needham
00449cdf37
rename admin_export -> admin_migrate
2012-04-07 17:23:25 +00:00
Tom Needham
23d39f7ef0
Display errors on import
2012-04-07 16:13:18 +00:00
Thomas Tanghus
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
Thomas Tanghus
b71cf1a4f9
Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.
2012-04-07 16:03:43 +02:00
Tom Needham
660951dc64
Add some filetypes
2012-04-07 13:32:00 +00:00
Tom Needham
a098c7c685
Give editor focus after saving
2012-04-06 21:38:38 +00:00
Tom Needham
22466010fc
Provide undo when closing editor with unsaved changes
2012-04-06 21:37:28 +00:00
Tom Needham
2fe0716cb4
Show nice errors
2012-04-06 20:52:41 +00:00
Arthur Schiwon
60e3b563e2
webdav needs to load authentication apps
2012-04-04 12:41:32 +02:00
Thomas Tanghus
dd4e577f6d
Contacts: l11n for geo autocomplete. Not sure if it works though.
2012-04-03 08:13:10 +02:00
Thomas Tanghus
fc555b48ec
Contacts: Added autocomplete using geonames.org.
2012-04-03 07:29:47 +02:00
Thomas Tanghus
b3f107ddda
Contacts: First work on cleaner design.
2012-04-03 03:29:12 +02:00
Thomas Tanghus
896bff5748
Contacts: rescan categories on load if there are none.
2012-04-03 03:29:12 +02:00
Florian Hülsmann
bd9fa658de
merged from upstream
2012-04-02 23:54:18 +02:00
Tom Needham
adc9d906e4
confirm close when there are unsaved changes
2012-04-02 17:44:15 +00:00
Tom Needham
dc499c5b4e
add * to filename when changes have been made
2012-04-02 17:27:06 +00:00
Tom Needham
d0cb99e347
use OC_Dialogs instead of alert()
2012-04-02 16:35:11 +00:00
Florian Hülsmann
33c1fa6e28
webfinger protocol compatible + minor changes
2012-04-02 17:12:52 +02:00
Georg Ehrke
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
Scott Shambarger
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
Tom Needham
eba6a65908
try to use transactions to replace db
2012-04-01 00:25:47 +00:00
Tom Needham
a248cc73e6
Merge branch 'master' into migration
2012-03-31 23:56:16 +00:00
Tom Needham
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00:00
Tom Needham
3e84d85482
remove debug
2012-03-31 22:50:57 +00:00
Tom Needham
aba3182a7d
Fix loading image after export failure
2012-03-31 22:47:38 +00:00
Tom Needham
f7d8a8c571
Merge branch 'master' into migration
2012-03-31 22:44:50 +00:00
Tom Needham
d20eea9761
Use ajax to download file, OC_Dialogs for errors
2012-03-31 22:41:43 +00:00
Georg Ehrke
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
Georg Ehrke
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
Georg Ehrke
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
Georg Ehrke
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
Georg Ehrke
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
Georg Ehrke
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
Georg Ehrke
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
Georg Ehrke
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
Florian Hülsmann
f9f91a08b4
webfinger reimplementation started
2012-03-31 02:42:41 +02:00
Bartek Przybylski
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
Florian Hülsmann
5161758921
create static host-meta instead of symlink and .htaccess
2012-03-30 21:35:09 +02:00
Bartek Przybylski
6abb2cb92e
fix sharing nested galleries
2012-03-30 21:14:01 +02:00
Georg Ehrke
ef1e359c7c
Merge branch 'master' into sabredav_1.6
2012-03-30 18:48:30 +02:00
Georg Ehrke
e3203f87ff
Merge branch 'master' into calendar_sharing
2012-03-30 18:42:09 +02:00
Jan-Christoph Borchardt
284955573c
clarifying remoteStorage description
2012-03-30 18:18:37 +02:00
Jan-Christoph Borchardt
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
Jan-Christoph Borchardt
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
Robin Appelman
523fdda399
add the option to only load apps of a specific type
2012-03-30 14:39:07 +02:00
Georg Ehrke
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
Georg Ehrke
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
Bartek Przybylski
f74d11c0c3
fix gallery sharing when root is not /
2012-03-29 20:45:21 +02:00
Thomas Tanghus
4b3282b325
Contacts: Removed obsolete code.
2012-03-29 15:36:04 +02:00
Thomas Tanghus
11f7eeb63a
Improve actions on delete.
2012-03-29 15:25:24 +02:00
Thomas Tanghus
b559952806
Cleanup stylesheet.
2012-03-29 15:25:24 +02:00
Michael Gapczynski
5fef9dfc22
Make users only able to share with users in groups they belong to
2012-03-28 21:18:17 -04:00
Robin Appelman
72882beb0d
enble browsing tar files in the web interface
2012-03-28 23:53:51 +02:00
Robin Appelman
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
Robin Appelman
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
Robin Appelman
e57de98bbe
add extract all option to OC_Archive
2012-03-28 23:47:44 +02:00
Georg Ehrke
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
Georg Ehrke
0d16f177cb
add scrollbar to the music list - bugfix for oc-301
2012-03-28 16:21:54 +02:00
Florian Hülsmann
34a0128ddf
whitespace indentation fix
2012-03-28 16:12:34 +02:00
Florian Hülsmann
bcda46eda3
webfinger installation creates symlink in document root
2012-03-28 16:07:50 +02:00
Tom Needham
bd4fd76bfb
Fix bookmarks migration provider
2012-03-27 21:35:29 +00:00
Tom Needham
ef33219e4f
import method returns each apps' import status
2012-03-27 21:21:14 +00:00
Tom Needham
553f4533c0
look for migrate.php in appinfo folder
2012-03-27 20:45:37 +00:00
Tom Needham
c8acd4a594
Merge branch 'master' into migration
2012-03-27 20:19:38 +00:00
Georg Ehrke
536a3ecb42
Merge branch 'master' into sabredav_1.6
2012-03-27 20:54:16 +02:00
Georg Ehrke
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
Thomas Tanghus
cb2dd97509
Trigger autocomplete wo button.
2012-03-27 12:30:20 +02:00
Thomas Tanghus
fa165498cc
Improvements in adding/deleting properties.
2012-03-27 12:30:20 +02:00
Thomas Tanghus
ff038f8766
Contacts: Update contact list thumbnail when deleting PHOTO.
2012-03-27 12:30:20 +02:00
Georg Ehrke
ff75d65d7e
Merge branch 'master' into calendar_sharing
2012-03-27 09:29:16 +02:00
Georg Ehrke
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
Robin Appelman
eb3ec05f88
fix gallery scan when an image cant be loaded
2012-03-26 23:56:07 +02:00
Robin Appelman
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
Robin Appelman
3f881f1ca5
memory cleanup in gallery
2012-03-26 22:40:38 +02:00
Thomas Tanghus
60a939dfcf
Small change and muting debug.
2012-03-26 22:26:06 +02:00
Thomas Tanghus
0da988a1bb
Check for empty value.
...
Added missing classes on action icons.
2012-03-26 22:08:03 +02:00
Bart Visscher
ee31bc7995
Contacts: Fix saveproperty for categories
2012-03-26 21:47:37 +02:00
Georg Ehrke
a867bcab46
Merge branch 'master' into calendar_sharing
2012-03-26 21:46:40 +02:00
Thomas Tanghus
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
Georg Ehrke
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
Georg Ehrke
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
Georg Ehrke
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
Georg Ehrke
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
Georg Ehrke
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
Georg Ehrke
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
Georg Ehrke
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
Thomas Tanghus
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
Georg Ehrke
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
Georg Ehrke
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
Michael Gapczynski
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
Michael Gapczynski
d139e3c3cd
Move Google Docs storage backend to files_remote app
2012-03-24 15:28:05 -04:00
Bartek Przybylski
c23090b43c
spaces to tabs in bookmarks
2012-03-24 19:55:44 +01:00
Bartek Przybylski
a3125f164e
bookmarks tag placement & list width fix
2012-03-24 19:55:43 +01:00
Bartek Przybylski
826cb2c650
fix sharing address construction in opera and firefox
2012-03-24 19:26:53 +01:00
Bartek Przybylski
be60b451eb
fix albums thumbnails preview for opera
2012-03-24 19:21:36 +01:00
Bartek Przybylski
afcf965498
fixup: sharing gallery for loggedin users fail
2012-03-24 18:40:27 +01:00
Bartek Przybylski
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
Robin Appelman
e0cbefc727
webdav storage backend
2012-03-23 18:55:26 +01:00
Georg Ehrke
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
Georg Ehrke
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
Georg Ehrke
b63b377c4d
Bookmarks: make link text click clickable too - bugfix for oc-131
2012-03-23 16:58:48 +01:00
Georg Ehrke
45b320d674
use unnamed as title for a bookmark if no title was entered and curl fails
2012-03-23 16:54:15 +01:00
Georg Ehrke
37963fee28
Merge branch 'master' into calendar_sharing
2012-03-22 20:40:20 +01:00
Georg Ehrke
8e8c4a8edc
Merge branch 'master' into sabredav_1.6
2012-03-22 20:40:04 +01:00
Robin Appelman
82b54938e3
ftp storage backend
2012-03-22 19:56:19 +01:00
Georg Ehrke
5b03de9a66
fix comments in crypt lib
2012-03-21 17:43:09 +01:00
Tom Needham
892343c7c1
Fix instance import
2012-03-21 16:30:59 +00:00
Georg Ehrke
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
Georg Ehrke
8f8d486f35
Merge branch 'master' into sabredav_1.6
2012-03-21 09:42:53 +01:00
Tom Needham
07d7138df0
Register admin pane
2012-03-20 20:34:20 +00:00
Tom Needham
0fa5e196ef
Try to use old uid when importing
2012-03-20 20:32:01 +00:00
Tom Needham
514c9ad8e7
Added unified import method.
2012-03-20 20:19:21 +00:00
Georg Ehrke
19bbb61b20
fix spelling fail in texteditor's style.css
2012-03-20 19:48:08 +01:00
Tom Needham
145d6f3566
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
2012-03-19 20:44:20 +00:00
Georg Ehrke
194211500b
register text/x-vcard as a fileaction for vcard import
2012-03-19 09:58:44 +01:00
Georg Ehrke
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
Georg Ehrke
ddb7197c9c
Merge branch 'master' into calendar_sharing
2012-03-18 00:53:02 +01:00
Bartek Przybylski
de09883d86
creating and retrive thumbnails for intermediate galleries
2012-03-17 23:41:10 +01:00
Tom Needham
bc085c3ff4
Create new user, create new data dir, copy files, import app data
2012-03-17 16:25:14 +00:00
Tom Needham
5234e66bab
Add exportinfo to user exports.
2012-03-17 13:53:00 +00:00
Tom Needham
27bf34f7be
Move user import to the admin
2012-03-17 13:30:58 +00:00
Georg Ehrke
eaa1074ccb
Merge branch 'master' into calendar_sharing
2012-03-17 13:59:00 +01:00
Tom Needham
122f7e4c2f
Dont truncate the time format
2012-03-17 12:41:16 +00:00
Bartek Przybylski
8e22823501
bredcrumb fix
2012-03-17 13:30:45 +01:00
Tom Needham
222bb2303f
Added prototype of user import
2012-03-16 22:54:37 +00:00
Tom Needham
5332c319a2
Migration info is an object. Other fixes
2012-03-16 22:50:35 +00:00
Tom Needham
c442a06a02
Fix export for admin and users. Added 3 admin export types
2012-03-16 21:09:36 +00:00
Georg Ehrke
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
Tom Needham
50233d075c
Improve admin_export ui and move system export cde to OC_Migrate
2012-03-15 20:52:43 +00:00
Bartek Przybylski
0fadbee699
fix adding photo to incorrect gallery
2012-03-15 00:09:06 +01:00
Bartek Przybylski
193e93e4a9
creating intermediate galleries
2012-03-14 22:28:55 +01:00
Tom Needham
c9be325af2
Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method.
2012-03-14 16:43:06 +00:00
Tom Needham
a310a81053
move zip creation inside OC_Migrate
2012-03-13 23:09:43 +00:00
Tom Needham
a919a136c4
Finish import function for bookmarks
2012-03-13 21:24:07 +00:00
Tom Needham
cd2f75fdad
Use data dir from config.php
2012-03-13 17:27:47 +00:00
Tom Needham
0f3eebbbd9
added cleanUp() method to OC_Migrate
2012-03-13 17:18:42 +00:00
Tom Needham
7e3b35a57c
fix structure of user export zip
2012-03-13 17:08:20 +00:00
Tom Needham
111af7fed5
json encode the output
2012-03-13 17:04:49 +00:00
Tom Needham
4d5646a59f
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
2012-03-13 16:21:17 +00:00
Thomas Tanghus
4a91c6dbed
Make PHOTO deletable.
2012-03-13 14:56:03 +01:00
Thomas Tanghus
9e83f0247f
Added sync path for iOS/OS X.
2012-03-13 14:28:38 +01:00
Thomas Tanghus
6b01d7be9a
Fixed NOTE property UI.
2012-03-13 02:55:17 +01:00
Thomas Tanghus
dd0daa6e33
Cleanup in Contacts.
2012-03-13 00:55:15 +01:00
Thomas Tanghus
551b4443e1
Force load profile pic after edit hack.
2012-03-12 21:56:28 +01:00
Thomas Tanghus
60fe9dda5d
Remember categories when they have changed.
2012-03-12 21:55:54 +01:00
Tom Needham
1cdb4396a4
Fix copyRows() return value. Generate app info and oc info on return
2012-03-12 18:40:14 +00:00
Thomas Tanghus
3efa5f17f2
Rename...
2012-03-12 16:47:29 +01:00
Thomas Tanghus
c55d2af6b3
More modifications for using jquery.multiple_autocomplete.
2012-03-12 16:44:16 +01:00
Thomas Tanghus
2b8125f4ba
Small fix to jquery.multiple_autocomplete.
2012-03-12 15:30:52 +01:00
Thomas Tanghus
d36d317bb2
Contacts: Modifications for using categories.
2012-03-12 14:13:03 +01:00
Tom Needham
9c032ecc33
Fix return value of export
2012-03-11 22:20:01 +00:00
Tom Needham
fa5a5649c6
Fix copyRows() and sqlite connection
2012-03-11 22:09:16 +00:00
Bartek Przybylski
618f92b3fb
fix thumbnail generation
2012-03-11 20:00:50 +01:00
Bartek Przybylski
d5959872e1
disabling file handlers in gallery for now
2012-03-11 19:17:51 +01:00
Bartek Przybylski
4b8ff4d910
media scanner fix
2012-03-11 17:29:21 +01:00
Bartek Przybylski
f6075cc1fe
gallery migration to events system
2012-03-11 16:49:42 +01:00
Tom Needham
92221e98de
spaces to tabs
2012-03-11 12:03:41 +00:00
Tom Needham
d712d7f52c
Lots of fixes, improve copyRows() method and update settings page.
2012-03-10 18:18:58 +00:00
Tom Needham
3ca76d24a9
Add OC_Migrate::copyRows() method
2012-03-10 15:52:38 +00:00
Tom Needham
dc3dd272f7
Text editor will now wrap text based on window size
2012-03-10 14:32:57 +00:00
Tom Needham
1aaf008020
fix character encoding bug oc-278
2012-03-10 14:06:30 +00:00
Tom Needham
3f507898d0
update file extensions in editor
2012-03-10 14:00:57 +00:00
Bartek Przybylski
84d6c53970
filecache search comparition fix
2012-03-09 16:28:26 +01:00
Thomas Tanghus
2582fe1c89
Yet a missing file :-P
2012-03-09 13:56:20 +01:00
Thomas Tanghus
98bf8cfeb6
Added missing template.
2012-03-09 12:11:52 +01:00
Thomas Tanghus
2cbd281637
Merge branch 'vcategories'
2012-03-09 10:29:58 +01:00
Thomas Tanghus
8228a554a4
Temporarily disabled multi_autoselect.
2012-03-09 10:29:00 +01:00
Thomas Tanghus
bc5d9f5868
Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-)
2012-03-09 07:39:35 +01:00
Thomas Tanghus
8495e1a63e
Add missing file.
2012-03-09 07:39:35 +01:00
Bart Visscher
f8b62d49ee
Tasks: Ordering of the task list
2012-03-08 22:27:29 +01:00
Bart Visscher
d1b2c10422
Tasks: Update task list when adding or updating tasks
2012-03-08 22:26:54 +01:00
Robin Appelman
700a120c22
fix write hook for gallery
2012-03-08 15:47:49 +01:00
Thomas Tanghus
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
Thomas Tanghus
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
Thomas Tanghus
91d85e9b16
Use OC.dialogs.
2012-03-07 22:57:37 +01:00
Bart Visscher
340320625e
Contacts: Add UI for categories
2012-03-07 21:50:55 +01:00
Bart Visscher
9908adb320
Merge branch 'master' into vcategories
...
Conflicts:
apps/contacts/lib/vcard.php
2012-03-07 21:49:46 +01:00
Bart Visscher
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
Bart Visscher
9599548203
Contacts: change card parameter type of VCard::edit and VCard::add
...
changed to OC_VObject
2012-03-07 21:46:42 +01:00
Bart Visscher
97ab706a6a
Contacts: No random token for contactphoto
2012-03-07 21:46:42 +01:00
Bart Visscher
46aa011ef9
Contacts: Add Organisation as Name property choice
2012-03-07 21:46:41 +01:00
Bart Visscher
9ccf46d350
Contacts: convert class attribute selectors to class selectors
2012-03-07 21:46:41 +01:00
Thomas Tanghus
57c4d39b1e
Fix conflict.
2012-03-07 20:57:05 +01:00
Robin Appelman
cf5d63f0ab
some js cleanup for gallary
...
also tabs no spaces
2012-03-07 18:58:10 +01:00
Robin Appelman
d8d2939668
dont use numRows and fix some of the gallary hooks
2012-03-07 17:31:01 +01:00
Thomas Tanghus
75323b86d1
Contacts: UI updates and ajax methods for categories.
2012-03-07 16:39:56 +01:00
Robin Appelman
1d88ab57ec
dont open the album when clicking the remove/rename button
2012-03-07 16:28:57 +01:00
Robin Appelman
41817db2e2
no rounded borders for album decoration
2012-03-07 16:27:51 +01:00
Robin Appelman
a4543175ce
make gallary work with archives
2012-03-07 16:24:49 +01:00
rok
fb88bdba69
Ability to save an arbitrary number of external sites
2012-03-07 14:59:19 +01:00
Bartek Przybylski
0a78849391
multilevel gallery
2012-03-04 18:28:41 +01:00
Georg Ehrke
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
Bartek Przybylski
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
Robin Appelman
af214d9dcd
change gallary scanning to support gallaries inside archives
2012-03-03 22:04:34 +01:00
Robin Appelman
a5df3f8ea7
allow transparent opening of zip files from the web interface
2012-03-03 21:23:35 +01:00
Tom Needham
691103acd5
Use json for migration data
2012-03-03 17:30:21 +00:00
Tom Needham
34f05ba180
Udpdate bookmarks migration provider. App version included in export.
2012-03-03 14:35:17 +00:00
Georg Ehrke
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
Georg Ehrke
4c45483ad3
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
2012-03-03 14:30:52 +01:00
Tom Needham
188a304625
Replace db on import. Update user_migration export function.
2012-03-03 13:26:01 +00:00
Tom Needham
6906988b4e
Update bookmarks migration provider.
2012-03-03 13:22:45 +00:00
Robin Appelman
23b64cd9ce
remove the archive after a testcase is done
2012-03-03 01:37:00 +01:00
Robin Appelman
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
Tom Needham
86fed4c226
Update database.xml locations. Fix dbexport.xml.
2012-03-02 22:19:06 +00:00
Tom Needham
8188a9f51b
change <create> value in db export
2012-03-02 21:54:44 +00:00
Tom Needham
45ef2ecf52
Fix merge conflict
2012-03-02 21:35:48 +00:00
Jakob Sack
1865659ce1
Fix missing bracket
2012-03-02 21:01:44 +01:00
Jakob Sack
503e5cada3
Add /dav.php, a single location bundling all *DAV-operations.
2012-03-02 20:25:20 +01:00
Bart Visscher
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
Michiel de Jong
1471d8f710
remoteStorage app version 0.5
2012-03-01 20:58:14 +00:00
Michiel de Jong
e10402c61b
remoteStorage app version 0.5
2012-03-01 20:55:20 +00:00
Michiel de Jong
5d8d7ef2a1
remoteStorage app version 0.5
2012-03-01 20:55:12 +00:00
Bart Visscher
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
Bart Visscher
ec2f49833d
Calendar: Don't request edit form for readonly events
2012-03-01 21:00:23 +01:00
Bart Visscher
f914cd0144
Implement showing Birthdays of contacts in the calendar
2012-03-01 21:00:22 +01:00
Bart Visscher
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
Bart Visscher
642ccd27ab
Bookmarks: fix loading and displaying of the bookmarks
2012-03-01 20:57:11 +01:00
Arthur Schiwon
fa6ad6ba68
LDAP: set also quota, when there is no explicit default value
2012-03-01 14:31:06 +01:00
Arthur Schiwon
b192f86d84
LDPA: fix setting variables and add missing ones to the array
2012-03-01 14:21:38 +01:00
Arthur Schiwon
eb8ffd9315
LDAP fix: set user quota, if attribute is provided
2012-03-01 14:18:28 +01:00
Robin Appelman
e76e4e7540
add touch() to all storage backands, and make parameter optional
2012-02-29 23:44:05 +01:00
Arthur Schiwon
f040ce044c
consider changed/new setting variables for user_ldap
2012-02-29 13:03:44 +01:00
Arthur Schiwon
3c72a7c934
make ldap settings a little bit less ugly
2012-02-29 12:57:11 +01:00
Bartek Przybylski
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
Arthur Schiwon
ea15c17149
typo in function call
2012-02-28 21:04:56 +01:00
Arthur Schiwon
de642697bb
make LDAP filter for user list configurable
2012-02-28 14:12:53 +01:00
Alessandro Cosentino
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
Georg Ehrke
aae0d990ca
fix baseUri of the Carddav server
2012-02-26 21:46:20 +01:00
Georg Ehrke
089c24e650
fix baseUri of the Caldav server
2012-02-26 21:44:35 +01:00
Georg Ehrke
8c09330959
add missing parameter to addEventListener function - bugfix for oc-225
2012-02-26 21:29:52 +01:00
Georg Ehrke
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
Frank Karlitschek
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
Robin Appelman
8148480cfe
dont enable encryption on default
2012-02-26 16:49:57 +01:00
Robin Appelman
01fcc080bb
dont set the encryption flag for existing non-encrypted files
2012-02-26 15:56:47 +01:00
Robin Appelman
ff0a542e48
always set encrypted flag when overwriting a file we should encrypt
2012-02-26 15:32:45 +01:00
Robin Appelman
d4d09b06f8
merge master into encryption
2012-02-26 14:21:06 +01:00
Georg Ehrke
89865cb8a0
stop using 3rdparty services for timezone detection
2012-02-26 13:45:51 +01:00
Robin Appelman
0af31a5328
missed one is_writeable
2012-02-26 03:56:45 +01:00
Robin Appelman
c8c3b8a63e
chunked implementation for readfile
...
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
Robin Appelman
0b19af5e10
application/ogg is music to
2012-02-26 03:42:48 +01:00
Michiel de Jong
a7d7597d55
fix type error in dir creation for categories
2012-02-25 23:15:31 +00:00
Michiel de Jong
42735429da
bump up version and update license
2012-02-25 22:03:14 +00:00
Michiel de Jong
28650191c3
bump up version and update license
2012-02-25 22:01:04 +00:00
Michiel de Jong
820f2f27f6
security hardening in remoteStorage app
2012-02-25 21:59:58 +00:00
Michiel de Jong
a1d03de666
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-02-25 21:58:59 +00:00
Bartek Przybylski
8fe5251029
unicode chars in gallery name fix
2012-02-25 20:38:22 +01:00
Georg Ehrke
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
Robin Appelman
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
Georg Ehrke
097ce76fc4
Merge branch 'master' into sabredav_1.6
2012-02-25 16:29:32 +01:00
Bartek Przybylski
3cf81cadd5
gallery thumbnail creation fix
2012-02-25 10:03:58 +01:00
Robin Appelman
7988541476
cleanup pdfviewer app name
2012-02-24 23:54:38 +01:00
Georg Ehrke
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
Marvin Thomas Rabe
9df193f051
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
Marvin Thomas Rabe
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
Georg Ehrke
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
Georg Ehrke
f285790fa1
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
Georg Ehrke
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
Georg Ehrke
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
Georg Ehrke
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
Georg Ehrke
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
Georg Ehrke
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
Bart Visscher
8f9c852325
Add filtering on category, priority and location
2012-02-23 21:11:31 +01:00
Marvin Thomas Rabe
ce4fe9e7cb
Editor fixed.
2012-02-23 20:36:20 +01:00
Frank Karlitschek
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
Marvin Thomas Rabe
196d619689
Little bookmark improvement
2012-02-22 23:58:38 +01:00
Marvin Thomas Rabe
358fd1c024
Changed text
2012-02-22 23:53:54 +01:00
Marvin Thomas Rabe
77493e8d70
Changed bookmarklet to read later widget
2012-02-22 23:52:56 +01:00
Marvin Thomas Rabe
996e6cf419
No bookmarks message will now show up if all bookmarks are delted
2012-02-22 23:28:36 +01:00
Marvin Thomas Rabe
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe
5387820a3b
changed look of bookmarklet
2012-02-22 23:08:50 +01:00
Alessandro Cosentino
70f9936651
sharing code between the two bookmarklets
2012-02-22 16:38:05 -05:00
Robin Appelman
814bc2fd2b
make encryption filetype blacklist configurable
2012-02-22 22:20:46 +01:00
Bart Visscher
c768751c23
Display more information in the task list
2012-02-22 22:06:06 +01:00
Bart Visscher
f3ebd29661
Fix updating task for new calendar API
2012-02-22 21:15:57 +01:00
Bart Visscher
18bac944b4
Change loading of tasks to ajax call
2012-02-22 20:21:27 +01:00
Bart Visscher
92db4f8be0
Update edittaskform for new calendar API
2012-02-22 20:12:54 +01:00
Bart Visscher
7f754c02f3
Change code from using OC_Tasks_VTodo to OC_Tasks_App
2012-02-22 20:11:38 +01:00
Michiel de Jong
3f87c2cedb
correct header Content-Type: application/xrd+xml
2012-02-22 19:05:41 +00:00
Michiel de Jong
9850820b42
BearerAuth and multiple tokens support in remoteStorage app
2012-02-22 18:05:52 +00:00
Michiel de Jong
6c6b570ff1
avoid notice in error log from user_webfinger app
2012-02-22 18:04:21 +00:00
Marvin Thomas Rabe
fd72f2bd29
Removed redundant code.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
e2d6bf4c63
Bookmarklet Window closes itself after submit.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Robin Appelman
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
Robin Appelman
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
Thomas Tanghus
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
Bart Visscher
499ec15c26
Add icon for tasks app
2012-02-22 13:32:04 +01:00
Bart Visscher
4af22bfb7a
Merge branch 'master' into tasks
2012-02-22 11:56:24 +01:00
Georg Ehrke
9460c9e907
remove old import.php
2012-02-22 11:53:28 +01:00
Thomas Tanghus
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
Georg Ehrke
cff0ac2bf9
better permission check in resize.php
2012-02-22 10:42:33 +01:00
Georg Ehrke
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
Georg Ehrke
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
Georg Ehrke
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
Thomas Tanghus
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
Thomas Tanghus
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
Thomas Tanghus
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
Robin Appelman
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00