wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4657 commits 157 branches 562 tags 714 MiB
Commit graph

485 commits

Author SHA1 Message Date
Thomas Tanghus
96a3e28c2e Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
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
Thomas Tanghus
47c03a0eff Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus
756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Thomas Tanghus
613a122437 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus
d33d599b1b Remove debug statements. 2012-06-13 18:57:12 +02:00
Thomas Tanghus
bc1e8cb0a2 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Thomas Tanghus
c44591e27a Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Thomas Tanghus
ac11647d7a Fix js for missing address fields. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
4b86cbcb6f Quick fix for index errors when not importing from files. 2012-06-11 22:14:21 +02:00
Thomas Tanghus
c75f9f9397 Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e 2012-06-11 22:14:21 +02:00
Thomas Tanghus
8af53829d5 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle
1d493a70e7 replace "=0D=0A" (\r\n) with a simple "\n" in vards during import 2012-06-11 18:13:12 +02:00
Bjoern Schiessle
739589f485 make sure that contact data are always utf8 encoded to avoid encoding problems 2012-06-11 16:26:21 +02:00
Lukas Reschke
c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Thomas Tanghus
6d9947b3ff Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:55:54 +02:00
Lukas Reschke
6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Thomas Tanghus
e79e18d866 Copy/paste error. 2012-06-11 02:40:55 +02:00
Thomas Tanghus
40f8419fdf Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Thomas Tanghus
f90c8738ab Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Thomas Tanghus
081e1874cb Contacts: Use POST instead of GET. 2012-06-09 15:00:44 +02:00
Thomas Tanghus
88341e5797 Code cleanup. 2012-06-09 15:00:44 +02:00
Thomas Tanghus
0a49bae87a Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 2012-06-08 20:39:54 +02:00
Thomas Tanghus
d4f6f3e935 Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00
Thomas Tanghus
33c802dcaa Break text to fit in dialog. 2012-06-07 20:29:15 +02:00
Thomas Tanghus
d2a8746c49 Edited combobox to adhere to coding standards and added a dblclick handler. 2012-06-07 16:44:54 +02:00
Thomas Tanghus
3804f68ff5 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus
9c84149119 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Thomas Tanghus
5c17338ac7 Contacts: Make js a tad DRYer. Added URL property. 2012-06-06 15:29:33 +02:00
Thomas Tanghus
ed950e3ba2 Correct mime type. 2012-06-06 15:29:33 +02:00
Thomas Tanghus
fce614b82c Less aggressive caching on thumbnails too. 2012-06-06 01:06:13 +02:00
Thomas Tanghus
68670bcc66 Cleanup. 2012-06-06 01:06:13 +02:00
Thomas Tanghus
624f8ae36d Also use OC_Cache here. 2012-06-06 01:06:13 +02:00
Thomas Tanghus
80de23d08b Contacts: Removed temp dir cleanup after using OC_Cache. 2012-06-06 01:06:12 +02:00
Robin Appelman
f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Thomas Tanghus
20aee83d07 Use UID for cache key. 2012-06-05 21:20:10 +02:00
Thomas Tanghus
cb941996c0 Contacts: Use OC_Cache for contact photo handling instead of temp dir. 2012-06-05 20:34:12 +02:00
Thomas Tanghus
d194132b6f Contacts: Cache standard photo less aggressively 2012-06-05 10:32:26 +02:00
Bart Visscher
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
Thomas Tanghus
3b9bf83fe7 Contacts: Make tmp file cleaup a bit safer. 2012-06-04 13:38:37 +02:00
Thomas Tanghus
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
Thomas Tanghus
855f404e5c Contacts: Temporary files weren't deleted if crop window was closed without saving. 2012-06-04 13:14:31 +02:00
Bart Visscher
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
Frank Karlitschek
22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Thomas Tanghus
dbcd26be68 Contacts: Rewrote import script. 2012-05-29 23:41:53 +02:00
Thomas Tanghus
c9df18ed8c Forgot a break. 2012-05-29 16:46:54 +02:00
Thomas Tanghus
51aa84e70a Contacts: NOTE wasn't saved properly. 2012-05-29 16:43:59 +02:00
Thomas Tanghus
dff16e70a9 Contacts: Improve loading and cleanup of dialogs. 2012-05-29 16:43:59 +02:00