Commit graph

2276 commits

Author SHA1 Message Date
Brice Maron
cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00: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
Arthur Schiwon
c2f557f1dd LDAP: cache the results, reduce LDAP searches 2012-06-07 18:55:32 +02:00
Arthur Schiwon
6626598435 ldap: enable the destructor 2012-06-07 18:13:41 +02:00
Bartek Przybylski
14e1be56a0 pictures: update script and removal some all stuff 2012-06-07 17:08:04 +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
Arthur Schiwon
44880ab3fa ldap: remove unused private functions 2012-06-07 13:39:42 +02:00
Arthur Schiwon
6894882ca9 ldap: correct query condition and determining of success 2012-06-07 13:39:42 +02:00
Arthur Schiwon
470cb17f90 ldap: check index carefully, can be 0 2012-06-07 13:39:42 +02:00
Thomas Tanghus
312536dbf9 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:08:42 +02:00
Thomas Tanghus
e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +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
Bartek Przybylski
8fd6cdf407 adding title when fancybox is displayed 2012-06-06 23:29:23 +02:00
Bartek Przybylski
5417d803c4 replace spaces with tabs, use const and linkTo instead of static path 2012-06-06 23:23:49 +02:00
Brice Maron
5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron
6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron
cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bartek Przybylski
a90089c792 hack for file download 2012-06-06 22:20:56 +02:00
Bartek Przybylski
7c88081acb removing test image 2012-06-06 22:13:49 +02:00
Bartek Przybylski
aa0fc3c69a aviod incorrect image size returning in gallery listing 2012-06-06 22:13:49 +02:00
Bartek Przybylski
671fe49809 use fancybox to display image preview 2012-06-06 22:13:49 +02:00
Bartek Przybylski
76e7e361ae navigate on galleries 2012-06-06 22:13:49 +02:00
Bartek Przybylski
34a21a63ce new db scheme 2012-06-06 22:13:49 +02:00
Bartek Przybylski
6d211155ab git status 2012-06-06 22:13:48 +02:00
Bjoern Schiessle
c960e42a17 fixed var name, $filename should be $foldername 2012-06-06 18:08:51 +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
Arthur Schiwon
190fca1121 LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914 2012-06-06 12:29:48 +02:00
Thomas Tanghus
ca0108aabf Corrected typos. 2012-06-06 11:50:49 +02:00
Bjoern Schiessle
6abe8f9e2e fixed wrong function call 2012-06-06 10:40:22 +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
Robin Appelman
a3c1f70be4 dont show config option for file upload size if we cant write the new value 2012-06-06 00:24:15 +02:00
Robin Appelman
e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +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
Bjoern Schiessle
0d1a07d4ae show pictures in folder with special characters, e.g. '+' 2012-06-05 16:36:05 +02:00
Bjoern Schiessle
d71c4db10a xss vulnerability fixed 2012-06-05 10:46:28 +02:00
Bjoern Schiessle
564b0358f9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Thomas Tanghus
d194132b6f Contacts: Cache standard photo less aggressively 2012-06-05 10:32:26 +02:00
Frank Karlitschek
7e931575b4 comment out non working code 2012-06-05 09:28:51 +02:00
Bart Visscher
64f6534f51 Tasks: styling fixes 2012-06-04 23:04:31 +02:00
Bart Visscher
4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +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