Commit graph

2864 commits

Author SHA1 Message Date
Robin Appelman
1fe55b6656 fix upload error reporting 2011-12-23 19:49:02 +01:00
Michael Gapczynski
9bb004963b Fix whitespace folder name 2011-12-23 12:28:44 -05:00
Georg Ehrke
5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke
469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bartek Przybylski
1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bartek Przybylski
6a1a7fcd26 merged with stash 2011-12-21 18:40:43 +01:00
Bartek Przybylski
25fa9bf8ec merged with stash 2011-12-21 18:37:17 +01:00
Bartek Przybylski
3c42867109 merged 2011-12-21 18:35:29 +01:00
Bart Visscher
e1b9b65e41 Use correct appid for lostpassword email preference 2011-12-18 23:10:43 +01:00
Bart Visscher
d5e9c7d572 Gallery: fix calculation of folder thumbnail selection 2011-12-18 23:10:43 +01:00
Bart Visscher
fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher
dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Bart Visscher
ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher
4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Robin Appelman
3d1accab70 add licence file for sabredav 2011-12-18 03:45:13 +01:00
Michael Gapczynski
9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Thomas Tanghus
092c41f375 Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js 2011-12-17 20:38:52 +01:00
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