Commit Graph

2847 Commits

Author SHA1 Message Date
Thomas Tanghus a7b048dc05 Added thumbnails to contact list. The contacts have a default thumbnail when the page is
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
Georg Ehrke f6ed7a19be Merge branch 'master' into calendar 2011-12-16 21:21:34 +01:00
Thomas Tanghus f3e8776dc6 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-16 17:43:06 +01:00
Thomas Tanghus feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Robin Appelman dc641943d9 fix some display issues for readonly folders 2011-12-16 17:39:15 +01:00
Robin Appelman 65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Tom Needham 6cef214b66 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-15 10:23:32 +00:00
Robin Appelman a862fec9a3 make remember login token also dependent on password to protect against some brute force attacks on this token 2011-12-14 13:26:34 +01:00
Robin Appelman 3844fb0e4c also use fscache when getting used space for webdav 2011-12-14 01:19:23 +01:00
Robin Appelman 835d6a9b6e save quota in human readable format (42 MB), should prevent some of the overflow related problems 2011-12-14 01:16:14 +01:00
Robin Appelman a9e94a34c9 use fscache for getting used space 2011-12-14 01:15:07 +01:00
Thomas Tanghus 59ad0a6c9c Update README 2011-12-13 10:39:31 +01:00
Thomas Tanghus ec12dec106 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-13 10:35:10 +01:00
Georg Ehrke 1ab0adec46 Merge branch 'master' into calendar 2011-12-12 14:21:51 +01:00
Robin Appelman c67c933d3f Merge branch 'database' into filesystem 2011-12-11 23:57:53 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Robin Appelman 5e711f37ca make filesize parsing case insensitive 2011-12-11 23:34:27 +01:00
Robin Appelman 9c6d3a83fd also update the data attribute holding the quota 2011-12-11 23:34:20 +01:00
Robin Appelman ccd9b56609 after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
2011-12-11 23:34:13 +01:00
Robin Appelman efecb694ef make filesize parsing case insensitive 2011-12-11 23:33:24 +01:00
Robin Appelman bd65c18f21 also update the data attribute holding the quota 2011-12-11 23:32:57 +01:00
Robin Appelman b41ca8bacb after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
this way the user can see when an invalid input is given
2011-12-11 23:23:59 +01:00
Robin Appelman a8148fa94a update apps when their version number increases 2011-12-11 22:08:01 +01:00
Robin Appelman 7f1bb5fd78 Merge branch 'master' into database 2011-12-11 22:00:17 +01:00
Thomas Tanghus d55e689261 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Tom Needham 3f44a28e28 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-11 18:16:14 +00:00
Thomas Tanghus 39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Thomas Tanghus c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Georg Ehrke 56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke 33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher 2e951c0ce5 Gallary: Fix alignment of album thumbnails 2011-12-09 21:44:13 +01:00
Thomas Tanghus 5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus 7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
2011-12-09 15:25:26 +01:00
Thomas Tanghus b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Georg Ehrke ac8177d83e Merge branch 'master' into calendar 2011-12-09 14:45:41 +01:00
Georg Ehrke bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Bart Visscher eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Georg Ehrke 2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Michiel de Jong d4546cdf37 bump version number to force db rebuild 2011-12-08 17:19:38 +07:00
Bart Visscher 9ba59aee36 Sort apps on name and enabled status 2011-12-07 20:41:00 +01:00
Bart Visscher 0342b5fc43 Fix filename of log icon 2011-12-07 20:41:00 +01:00
Bart Visscher a389d94e2b Imageviewer: fix fancybox.png image url in fancybox css 2011-12-07 20:41:00 +01:00
Bart Visscher 546b7279a3 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00
Bart Visscher 1220edd4df Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher 36abf22a48 Contacts: Fix postname var spelling 2011-12-07 20:40:59 +01:00
Bart Visscher 7e990a8e5c Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00