Commit graph

6893 commits

Author SHA1 Message Date
Bart Visscher
a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Robin Appelman
9f1c76beef fix running test cases in multiply app dirs 2012-09-05 19:42:26 +02:00
Robin Appelman
aa8cee1afa I don't think this file was meant to be commited 2012-09-05 19:42:26 +02:00
Brice Maron
5fc4c78106 Merge branch 'master' of git://github.com/owncloud/core 2012-09-05 16:16:36 +00:00
Brice Maron
a928b4cd66 Add more language name instead of codes for the setting choice 2012-09-05 16:16:19 +00:00
Thomas Tanghus
e2ead7db86 Changed oc_preferences configvalue back to clob as it will give us bug reports in calendar, contacts and tasks if less. 2012-09-05 17:22:03 +02:00
Thomas Tanghus
f2fd228801 Revert commit 8cf0e853686a5c4f9f082d8e47832277f50ea6c0. 2012-09-05 17:22:03 +02:00
Thomas Tanghus
1edab438d1 Added possibility to get permissions for shared item with ajax call. 2012-09-05 17:22:03 +02:00
Thomas Tanghus
a2b6a92107 Disable asking to save password when adding users. 2012-09-05 17:22:03 +02:00
Thomas Müller
24977d0fd0 Respect coding style 2012-09-05 15:49:42 +03:00
Thomas Müller
e5cb638c09 Respect coding style 2012-09-05 15:42:06 +03:00
Thomas Müller
d5fd5cd584 Respect coding style 2012-09-05 15:40:21 +03:00
Thomas Müller
9eccc0121a Respect coding style 2012-09-05 13:22:38 +03:00
Michael Gapczynski
a26ea6d65c Implement support for replacing files during upload with the actions: replace, suggest name, and cancel 2012-09-05 00:12:25 -04:00
Jenkins for ownCloud
e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Thomas Mueller
685f03edf6 fixing translation - thx eMerzh 2012-09-04 23:49:43 +02:00
Thomas Mueller
66c2a391cb underline link to the app store 2012-09-04 23:42:49 +02:00
Thomas Mueller
02f9de55a3 add translation string 2012-09-04 23:42:49 +02:00
Thomas Mueller
1e2d582123 fixing button to add additional site 2012-09-04 23:42:49 +02:00
Bart Visscher
f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Bart Visscher
41f135daee Remove () from return statement 2012-09-04 21:27:36 +02:00
Thomas Mueller
ae8d2d029f Adding missing translation 2012-09-04 20:48:10 +02:00
Thomas Müller
69ee842521 Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617 2012-09-04 17:13:34 +03:00
Georg Ehrke
745f279fbc make use of OC_User::getHome in files_external app 2012-09-04 15:56:00 +02:00
Thomas Müller
7901fc33a8 fixing syntax error 2012-09-04 15:54:38 +03:00
Thomas Müller
aff08925c1 fixing syntax error - sorry for that 2012-09-04 15:46:43 +03:00
Thomas Müller
2028500c0a fixing syntax error - sorry for that 2012-09-04 15:42:58 +03:00
Thomas Müller
e4e0b5a822 Respect coding style 2012-09-04 15:34:09 +03:00
Thomas Müller
d14f8fa681 Respect coding style 2012-09-04 15:21:52 +03:00
Jenkins for ownCloud
acb9682807 [tx-robot] updated from transifex 2012-09-04 12:43:53 +02:00
Thomas Müller
9760b5e153 Respect coding style 2012-09-04 13:32:27 +03:00
Thomas Müller
a3cda32392 Respect coding style 2012-09-04 13:26:13 +03:00
Thomas Müller
3d74c5b3ec Respect coding style 2012-09-04 13:25:53 +03:00
Thomas Müller
5868f834c8 Respect coding style 2012-09-04 13:21:36 +03:00
Thomas Müller
ae67841461 Respect coding style 2012-09-04 13:21:00 +03:00
Thomas Müller
ff8b8909c1 Respect coding style 2012-09-04 13:19:44 +03:00
Thomas Müller
f4cace6cc1 Respect coding style 2012-09-04 13:19:04 +03:00
Thomas Müller
6e76c59007 Remove closing php tag 2012-09-04 13:18:11 +03:00
Thomas Müller
5bd4d6b051 Respect coding style 2012-09-04 13:17:14 +03:00
Thomas Müller
9e5807d1f9 fixing syntax error - sorry for that 2012-09-04 13:13:18 +03:00
Thomas Müller
6d358c051f Update core/lostpassword/templates/email.php
respect coding style
2012-09-04 13:10:14 +03:00
Thomas Müller
97e4647ad5 Update core/lostpassword/resetpassword.php 2012-09-04 13:09:25 +03:00
Thomas Müller
395ea2a028 Update core/lostpassword/index.php
respect coding style
2012-09-04 13:08:55 +03:00
Thomas Müller
3ddd28b972 Update files/webdav.php 2012-09-04 13:06:55 +03:00
Thomas Müller
c252de56d0 Update search/index.php
respect coding style
2012-09-04 13:06:03 +03:00
Thomas Müller
409ede0975 Update settings/templates/users.php
respect coding style
2012-09-04 13:05:09 +03:00
Thomas Müller
f3e330ce64 Update settings/templates/help.php
respect coding style
2012-09-04 13:03:51 +03:00
Thomas Müller
b698fab109 Update settings/ajax/userlist.php
respect coding style
2012-09-04 13:00:56 +03:00
Thomas Müller
4b3fc27a22 Update settings/ajax/togglegroups.php
respect coding style
2012-09-04 12:58:07 +03:00