e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
10a0d5a46c
More changes for updating the contacts list.
2012-06-20 21:00:49 +02:00
dc8c188ffe
Better error checking.
2012-06-20 21:00:49 +02:00
426ed27be2
Make sure address books are shown even if empty.
2012-06-20 21:00:49 +02:00
0f1fe0b505
Log error as ERROR.
2012-06-20 21:00:49 +02:00
0b9a48b4b6
Re-add missing loadhandlers() call.
2012-06-19 14:56:21 +02:00
33aec973df
Loading of contacts was placed outside of $(document).ready() function.
2012-06-19 14:55:14 +02:00
e5feb4e1aa
Remove obsolete js.
2012-06-18 02:22:22 +02:00
73fd4c979a
Update js after contactlist change.
2012-06-18 02:21:29 +02:00
a4f53922c2
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:36:25 +02:00
cab4a634df
Save addressbook id to be able to rearrange contacts properly.
2012-06-17 23:14:02 +02:00
3efec3fde9
Make contact list fit in viewport.
2012-06-17 23:12:48 +02:00
ea4d8ccf70
Rearrange markup.
2012-06-17 23:12:11 +02:00
8337b30e43
Add thumbnail links so they are loaded when addressbook is expanded.
2012-06-17 23:09:25 +02:00
7d84c4741c
Use uasort instead of usort.
2012-06-17 21:50:49 +02:00
46a771d2e6
Sort addressbooks.
2012-06-17 21:47:15 +02:00
fb700de4a4
Add effect on addressbook show/hide.
2012-06-17 21:37:13 +02:00
9e4a41e9cb
Add effect on addressbook show/hide.
2012-06-17 21:34:56 +02:00
5a8f4b8783
Adjustments for inview handler etc.
2012-06-17 20:25:32 +02:00
b6b6d69158
Moved parsing to the controller and js to contacts.js.
2012-06-17 20:25:32 +02:00
2875901fc7
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
91f5a1de39
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
b1cfc99f63
Styled address book entries.
2012-06-17 20:25:32 +02:00
56d25d4d1b
Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
2012-06-17 20:25:32 +02:00
92e35bd843
now a little less in template - more in ajax controller
2012-06-17 20:25:32 +02:00
7f485d1b20
contacts app now lists contacts sorted by expandable/collapsable addressbooks
2012-06-17 20:25:32 +02:00
4cbdd59859
Fix char encoding.
2012-06-16 18:38:20 +02:00
6642ef6a50
Fix string encoding probs.
2012-06-16 18:06:47 +02:00
effb6f1309
Update stylesheet for type=url.
2012-06-15 04:32:01 +02:00
8a68d09b0f
Use type=url for URL field.
2012-06-15 04:32:01 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
96a3e28c2e
Cleanup code.
2012-06-14 23:05:31 +02:00
27ab6daeb0
If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...
2012-06-14 23:05:31 +02:00
47c03a0eff
Contacts: Fixes for CSRF.
2012-06-14 18:13:01 +02:00
756eb3548f
Use the right csrf token.
2012-06-14 13:23:12 +02:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
613a122437
Remove check for encryption.
2012-06-13 19:03:34 +02:00
d33d599b1b
Remove debug statements.
2012-06-13 18:57:12 +02:00
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +02:00
ac11647d7a
Fix js for missing address fields.
2012-06-11 22:14:21 +02:00
4b86cbcb6f
Quick fix for index errors when not importing from files.
2012-06-11 22:14:21 +02:00
c75f9f9397
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
2012-06-11 22:14:21 +02:00
8af53829d5
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:14:21 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
1d493a70e7
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
2012-06-11 18:13:12 +02:00
739589f485
make sure that contact data are always utf8 encoded to avoid encoding problems
2012-06-11 16:26:21 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
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
Brice Maron
Thomas Tanghus
Stephan Bergemann
Michael Gapczynski
Lukas Reschke
Bjoern Schiessle
Robin Appelman
Bart Visscher
Frank Karlitschek
Georg Ehrke
Thomas Mueller
Florian Hülsmann