Tom Needham
|
227ada3257
|
Fix merge conflicts
|
2012-09-13 10:23:41 +00:00 |
Jenkins for ownCloud
|
bb0b438ace
|
[tx-robot] updated from transifex
|
2012-09-13 02:03:54 +02:00 |
Frank Karlitschek
|
54eae53206
|
Merge branch 'master' of https://github.com/owncloud/core
|
2012-09-12 12:10:57 +02:00 |
|
Frank Karlitschek
|
c0a3bdb757
|
improve the documentation for the cron config a bit
|
2012-09-12 12:09:46 +02:00 |
Jörn Friedrich Dreyer
|
62d8202d59
|
return a message when app could not be enabled
|
2012-09-12 12:02:39 +02:00 |
|
Jenkins for ownCloud
|
8c9c095d48
|
[tx-robot] updated from transifex
|
2012-09-12 02:02:58 +02:00 |
|
Jenkins for ownCloud
|
6a29bbda7a
|
[tx-robot] updated from transifex
|
2012-09-11 02:03:53 +02:00 |
|
Jenkins for ownCloud
|
5e790368bc
|
[tx-robot] updated from transifex
|
2012-09-09 02:03:35 +02:00 |
|
Jenkins for ownCloud
|
d5d2e89622
|
[tx-robot] updated from transifex
|
2012-09-08 02:05:41 +02:00 |
|
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
|
Jenkins for ownCloud
|
a94b56b57b
|
[tx-robot] updated from transifex
|
2012-09-07 02:07:22 +02:00 |
|
Jenkins for ownCloud
|
af3e767489
|
[tx-robot] updated from transifex
|
2012-09-06 02:06:37 +02:00 |
|
Thomas Mueller
|
ebb28412ca
|
no more require_once()
|
2012-09-05 23:28:59 +02:00 |
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 |
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
|
a2b6a92107
|
Disable asking to save password when adding users.
|
2012-09-05 17:22:03 +02: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
|
ae8d2d029f
|
Adding missing translation
|
2012-09-04 20:48:10 +02:00 |
|
Tom Needham
|
37bb16becb
|
API: Add callback_fail, add OC_OAuth::init and bespoke request token method
|
2012-09-04 11:10:42 +00:00 |
|
Jenkins for ownCloud
|
acb9682807
|
[tx-robot] updated from transifex
|
2012-09-04 12:43:53 +02: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 |
|
Thomas Müller
|
9a8a101756
|
Update settings/ajax/setloglevel.php
respect coding style
|
2012-09-04 12:55:20 +03:00 |
|
Thomas Müller
|
dafe28e079
|
Update settings/ajax/setlanguage.php
respect coding style
|
2012-09-04 12:54:36 +03:00 |
|
Thomas Müller
|
93496a32cc
|
Update settings/ajax/removeuser.php
$l->t added for error message
|
2012-09-04 12:54:04 +03:00 |
|
Thomas Müller
|
de987b475d
|
Update settings/ajax/removeuser.php
respect coding style
|
2012-09-04 12:51:04 +03:00 |
|
Thomas Müller
|
04aea1eb2e
|
Update settings/ajax/removegroup.php
$l->t added for error message
|
2012-09-04 12:50:16 +03:00 |
|
Thomas Müller
|
b49e8cd04d
|
Update settings/ajax/removegroup.php
respect coding style
|
2012-09-04 12:49:50 +03:00 |
|
Thomas Müller
|
16b3ffb588
|
Update settings/ajax/openid.php
respect coding style
|
2012-09-04 12:49:21 +03:00 |
|
Thomas Müller
|
83575a4436
|
Update settings/ajax/creategroup.php
$l->t added to error messages
|
2012-09-04 12:48:42 +03:00 |
|
Thomas Müller
|
04033585b0
|
Update settings/ajax/lostpassword.php
respect coding style
|
2012-09-04 12:47:35 +03:00 |
|
Thomas Müller
|
6308f80329
|
Update settings/ajax/getlog.php
respect coding style
|
2012-09-04 12:46:56 +03:00 |
|
Thomas Müller
|
caaaf7a7bf
|
Update settings/ajax/creategroup.php
respect coding style
|
2012-09-04 12:45:54 +03:00 |
|
Thomas Müller
|
a570cc7b60
|
Update settings/ajax/setquota.php
respect coding style
|
2012-09-04 12:36:21 +03:00 |
|
Thomas Müller
|
e10f46d978
|
Update settings/ajax/createuser.php
respect coding style
|
2012-09-04 12:34:52 +03:00 |
|
Thomas Müller
|
69240afd7a
|
Update settings/ajax/changepassword.php
respect coding style
|
2012-09-04 12:32:27 +03:00 |
|
Thomas Müller
|
8bea9f34e6
|
Update settings/ajax/apps/ocs.php
respect coding style
|
2012-09-04 12:31:28 +03:00 |
|
Thomas Müller
|
7ab5256922
|
Update settings/personal.php
respect coding style
|
2012-09-04 12:29:41 +03:00 |
|
Thomas Müller
|
1063034e93
|
Update settings/apps.php
respect coding style
|
2012-09-04 12:28:49 +03:00 |
|
Thomas Müller
|
e87387c956
|
Update settings/users.php
respect coding style
|
2012-09-04 12:19:01 +03:00 |
|
Thomas Müller
|
01f5aa1b2d
|
Update settings/settings.php
respect coding style
|
2012-09-04 12:17:02 +03:00 |
|
Thomas Müller
|
dc2648b14c
|
Update settings/personal.php
respect coding style
|
2012-09-04 12:16:24 +03:00 |
|
Thomas Müller
|
0fe0bd86b8
|
Update settings/help.php
respect coding style
|
2012-09-04 12:14:43 +03:00 |
|
Thomas Müller
|
cfd62d422b
|
Update settings/apps.php
respect coding style
|
2012-09-04 12:14:09 +03:00 |