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
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +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
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00: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
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
f7d221f5f0
update translations
2012-06-06 00:29:28 +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
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +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
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +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
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
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
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +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
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +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
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
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02: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
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
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02: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
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
40f91d9f7c
Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated.
2012-05-14 10:13:45 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +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
ee0294bbb1
update translations
2012-05-13 20:00:34 +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
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
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
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
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
7bc6e86969
Contacts: Fix some regressions from last commit.
2012-05-10 20:44:12 +02: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
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
6bdbcc1f49
fix path of carddav in addressbook management
2012-05-07 12:18:58 +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
65b9850e53
Code cleanup.
2012-05-07 04:46:09 +02:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
5bf69cace1
Contacts: Re-added some styling that got lost in a revert.
2012-05-06 19:19:15 +02: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
c996600786
push changes
2012-05-05 22:54:14 +02:00
aa4f01fbcc
fix pathes for cal andcarddav
2012-05-05 18:58:58 +02:00
101406eba7
fix writing in remote folder
2012-05-05 18:29:26 +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
76b8d06284
Add missing file.
2012-05-04 20:17:15 +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
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
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
f7e410147f
Contacts: check for malformed VCards in calendar hook
2012-05-02 21:36:33 +02:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
eec7c3833c
fix install
2012-05-02 19:02:41 +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
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
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
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +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
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02: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
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
2c92a79b5d
fixes for contacts app
2012-04-26 15:20:01 +02: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
4795295fb1
Contacts: Fixed some file paths.
2012-04-25 10:44:27 +02:00
20f1c1e6ca
Forgot to fix one file...
2012-05-06 00:39:01 +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
323b19a4a0
some fixes in contacts javascript files
2012-04-25 10:17:54 +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
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
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +02:00
1b084cc120
Merge branch 'master' into movable_apps
2012-04-23 13:03:50 +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
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
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +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
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
1a49497899
structure the information a bit more so that is easier readable
2012-04-21 22:55:18 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02: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
3b71e46cf7
Contact: Don't use non core class in appinfo/app.php
2012-04-14 18:34:59 +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
9b1c881ca8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 11:18:25 +00:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02: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
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
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
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
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
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
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
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
daf742c086
Fix owncloud log
2012-03-31 23:55:41 +00: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
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
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
6ff89dcf72
Removed obsolete code.
2012-03-26 19:13:48 +02:00
102cf150b3
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
2012-03-26 02:04:34 +02:00
194211500b
register text/x-vcard as a fileaction for vcard import
2012-03-19 09:58:44 +01: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
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
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
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
75323b86d1
Contacts: UI updates and ajax methods for categories.
2012-03-07 16:39:56 +01: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
5dcd9e20d0
Small cleanups
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
aae0d990ca
fix baseUri of the Carddav server
2012-02-26 21:46: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
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +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
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
Thomas Tanghus
Brice Maron
Robin Appelman
Bart Visscher
Frank Karlitschek
Georg Ehrke
Thomas Mueller
Florian Hülsmann
Frank Karlitschek
Jakob Sack
Tom Needham
Marvin Thomas Rabe
VicDeo