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
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +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
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +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
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +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
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +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
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +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
9295f49553
Contacts: Add error checking and reporting to import from files app.
2012-05-13 23:27:14 +02:00
7bc6e86969
Contacts: Fix some regressions from last commit.
2012-05-10 20:44:12 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +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
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
bede32be24
Contacts: Fix for Android browser again, again.
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
93ae945414
Contacts: Fix for leftcontent positioning in Android browser.
2012-05-06 00:34:08 +02:00
aa4f01fbcc
fix pathes for cal andcarddav
2012-05-05 18:58:58 +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
a89231ac1d
Contacts: Clean up tipsies.
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
15be032740
Contacts: Improve loading contact.
2012-05-03 11:15:44 +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
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +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
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +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
0aaf6d16a5
Merge branch 'master' into movable_apps_2
2012-04-27 14:22:12 +02:00
1384fdfe01
Contacts: Updated first run page.
2012-04-27 10:35:31 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
5dbf362623
Contacts: Added import with with file picker.
2012-04-26 03:21:52 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +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
fd47fbe176
fix contacts app a bit
2012-04-23 20:42:52 +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
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
Michael Gapczynski
Thomas Tanghus
Lukas Reschke
Bart Visscher
Thomas Mueller
Georg Ehrke
Frank Karlitschek