mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,292 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

2292 Commits

Author SHA1 Message Date
Tom Needham 8efec8e900 Remove repeated code 2011-12-31 12:23:08 +00:00
Tom Needham 215cb1e6e0 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +00:00
Daniel Köb eb4cd86910 Include PostgreSQL when checking for available database drivers. 
Signed-off-by: Brice Maron <brice@bmaron.net>
 2011-12-30 21:09:29 +01:00
Bartek Przybylski 31663cfff5 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Bartek Przybylski 96dc279e8e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-30 17:06:48 +01:00
Bartek Przybylski 2ea20862fc gallery fixes 2011-12-30 17:06:29 +01:00
Bart Visscher ed2ba4e8e4 Merge branch 'contact_thumbnails' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 2011-12-29 00:21:34 +01:00
Michael Gapczynski 86b65c269a Keep the urls pretty, decode forward slashes for newly added directories 2011-12-28 13:01:36 -05:00
Michael Gapczynski 349923c5b8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-28 12:48:08 -05:00
Michael Gapczynski 9b59bf40df Fix encoding again and update the link after renaming files 2011-12-28 12:47:27 -05:00
Tom Needham 8afb2e98fa Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
 2011-12-28 10:14:59 +01:00
Bart Visscher 16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher 3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
 2011-12-27 22:18:01 +01:00
Bart Visscher 5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Michael Gapczynski 1cddfe8820 Keep the urls pretty, decode forward slashes 2011-12-27 12:43:58 -05:00
Michael Gapczynski 95b9f4ed23 Fix folder names with + characters in it 2011-12-27 12:35:29 -05:00
Robin Appelman 5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman 1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Bartek Przybylski 524aaf0e5e Merge branch 'gallery' 2011-12-27 12:34:32 +01:00
Thomas Tanghus 16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
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
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
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
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
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