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

4687 Commits

Author SHA1 Message Date
Bart Visscher 2ae58ee6c0 Calendar: small cleanup of import progress writing 2012-05-31 13:01:30 +02:00
Bart Visscher 0934a975b2 Remove unused L10N variable 2012-05-31 13:01:30 +02:00
Bart Visscher 4434016a8b Whitespace fixes 2012-05-31 13:01:30 +02:00
Georg Ehrke c5cc70c0e3 Merge branch 'master' into calendar_repeat 2012-05-31 12:20:56 +02:00
Robin Appelman d98a0a1bb9 fix for pgsql database migration 2012-05-31 00:01:49 +02:00
Arthur Schiwon 8b4e16ec77 LDAP: fix wrong value for input type 2012-05-30 22:34:51 +02:00
Frank Karlitschek 22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Thomas Tanghus dbcd26be68 Contacts: Rewrote import script. 2012-05-29 23:41:53 +02:00
Georg Ehrke f1a48aec73 Merge branch 'master' into calendar_repeat 2012-05-29 19:47:48 +02:00
Georg Ehrke 29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Michael Gapczynski fbe58755e5 Restrict requested app to apps directory 2012-05-29 12:31:47 -04:00
Michael Gapczynski d334f33eba Initial support for Amazon S3 storage backend 
Conflicts:

	apps/files_external/tests/config.php
 2012-05-29 12:19:29 -04:00
Thomas Tanghus c9df18ed8c Forgot a break. 2012-05-29 16:46:54 +02:00
Thomas Tanghus 51aa84e70a Contacts: NOTE wasn't saved properly. 2012-05-29 16:43:59 +02:00
Thomas Tanghus dff16e70a9 Contacts: Improve loading and cleanup of dialogs. 2012-05-29 16:43:59 +02:00
Georg Ehrke 29372677ae add lib collection and lib scanner to media's appinfo/app.php 2012-05-29 13:36:51 +02:00
Georg Ehrke 482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00
Georg Ehrke 75afc09b9d fix status 
of timezone detection
 2012-05-29 13:14:05 +02:00
Brice Maron 22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Thomas Tanghus 817f9ff57d Contacts: Fix XSS. 2012-05-28 14:42:57 +02:00
Frank Karlitschek 1eebbaebdb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-28 13:59:47 +02:00
Frank Karlitschek c79a529edd remove not needed includes 2012-05-28 13:57:45 +02:00
Thomas Tanghus df5bdc8e42 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +02:00
Georg Ehrke 5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke b14f2d0388 update When 2012-05-27 12:31:51 +02:00
Georg Ehrke 459114b994 Merge branch 'master' into calendar_repeat 2012-05-26 22:54:24 +02:00
Robin Appelman 143287738a allow longer paths for gallery 2012-05-26 21:50:54 +02:00
Frank Karlitschek 982cde0bb1 check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not 2012-05-26 20:37:10 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Arthur Schiwon d2369b6e96 LDAP: support for 'member' as group-member-association 2012-05-26 16:38:37 +02:00
Georg Ehrke a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Brice Maron 85dbfc8165 Correct small typo to Crypt_Blowfish 3drparty fix oc-810 2012-05-25 22:18:02 +00:00
Frank Karlitschek dfd5a9759c only enable compatible apps 2012-05-25 11:31:46 +02:00
Georg Ehrke bc9accd26e Merge branch 'master' into calendar_repeat 2012-05-25 10:30:00 +02:00
Brice Maron 9c2a6fb551 Add HEAD request management for files ajax/download.php 2012-05-24 22:48:10 +00:00
Brice Maron 5fa14806c8 Add translation for error message 2012-05-24 19:16:00 +00:00
Brice Maron 2c9311cf48 Add error message when uploading folder or null files. ref oc-739 2012-05-24 18:47:34 +00:00
Robin Appelman a1539dace7 share code between smb and ftp filestorage backends 2012-05-24 19:41:32 +02:00
Brice Maron f00a50c76a Add pending line in file list before trying to upload. Correct indentation 2012-05-24 16:56:19 +00:00
Robin Appelman 2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Michael Gapczynski bee724c53e Initial work on UI for mounting external storage 2012-05-24 11:06:03 -04:00
Michael Gapczynski 970124a90b Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:35:29 -04:00
Frank Karlitschek 24318354f2 changed the default from Berlin to UTC. 
Greetings form Berlin by the way ;-)
 2012-05-24 00:49:21 +02:00
Brice Maron 97d682dc13 Correct small style problem with task app fix #oc-689 2012-05-23 21:02:34 +00:00
Robin Appelman 60fdc13ae6 enable running unit tests from cli 2012-05-22 20:22:53 +02:00
Sam Tuke 3fee3a4633 Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable 2012-05-22 14:44:40 +01:00
Sam Tuke 27f7dae932 removed closing php tag 2012-05-22 13:42:55 +01:00
Florian Hülsmann d2e2a2b2c0 prevent apps from printing output from app.php 2012-05-22 13:10:42 +02:00
Frank Karlitschek 8cd7410447 encryption is not yet compatible with ldap 2012-05-22 12:15:51 +02:00