Tom Needham
|
3c98f36121
|
Merge branch 'master' into ocs_api
|
2012-12-16 22:29:00 +00:00 |
Bart Visscher
|
df7d6cb26c
|
More style fixes
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
68562dafb4
|
More whitespace fixes
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
2ef2dc4dda
|
Fix "There must be a single space between the closing parenthesis and the opening brace"
|
2012-12-15 00:43:46 +01:00 |
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00:00 |
Jenkins for ownCloud
|
6d7ae463df
|
[tx-robot] updated from transifex
|
2012-12-14 00:17:42 +01:00 |
|
Jenkins for ownCloud
|
f7f462f273
|
[tx-robot] updated from transifex
|
2012-12-11 00:04:40 +01:00 |
|
Jenkins for ownCloud
|
a444999a8c
|
[tx-robot] updated from transifex
|
2012-12-10 00:12:32 +01:00 |
|
Jenkins for ownCloud
|
e3e4dcf77b
|
[tx-robot] updated from transifex
|
2012-12-09 00:12:41 +01:00 |
|
Jenkins for ownCloud
|
69a9fe75a0
|
[tx-robot] updated from transifex
|
2012-12-06 00:12:08 +01:00 |
|
Jenkins for ownCloud
|
524f3c3c0b
|
[tx-robot] updated from transifex
|
2012-12-05 00:04:55 +01:00 |
|
Jenkins for ownCloud
|
a53a946c20
|
[tx-robot] updated from transifex
|
2012-12-04 00:07:11 +01:00 |
|
Thomas Müller
|
cee92bde20
|
Merge pull request #682 from VicDeo/master
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
|
2012-12-03 02:18:04 -08:00 |
|
Jenkins for ownCloud
|
f4d7955fe6
|
[tx-robot] updated from transifex
|
2012-12-03 00:05:40 +01:00 |
Victor Dubiniuk
|
6a211f3fa1
|
Check if we have an array with data. Fix #487
|
2012-12-02 23:54:54 +03:00 |
|
Jenkins for ownCloud
|
401c56ce7b
|
[tx-robot] updated from transifex
|
2012-12-02 00:03:12 +01:00 |
|
Jenkins for ownCloud
|
c7c5e2a2e2
|
[tx-robot] updated from transifex
|
2012-12-01 00:03:27 +01:00 |
|
Bart Visscher
|
a3f18d4b5a
|
Merge pull request #603 from owncloud/store_plain_groupname
Group name doesn't need to be sanitized before storing it in the database
|
2012-11-30 04:13:36 -08:00 |
Georg Ehrke
|
e5af24d084
|
use attr instead of data
|
2012-11-29 13:56:07 +01:00 |
|
Georg Ehrke
|
1d1ab2a911
|
Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit a5774229a1.
|
2012-11-29 13:37:37 +01:00 |
|
Georg Ehrke
|
4c83a4c918
|
add a client side check
|
2012-11-28 18:40:58 +01:00 |
|
Georg Ehrke
|
a5774229a1
|
fix group and subadmin managing for 'ajax-loaded' users
|
2012-11-28 18:40:00 +01:00 |
|
Georg Ehrke
|
ab13702770
|
make some checks server-side
|
2012-11-28 18:15:40 +01:00 |
|
Jenkins for ownCloud
|
1d4d4fd678
|
[tx-robot] updated from transifex
|
2012-11-28 00:11:21 +01:00 |
|
Bart Visscher
|
80d1037e42
|
Group name does't need to be sanitized before storing it in the database
It should only be sanitized before display
|
2012-11-27 20:22:45 +01:00 |
|
Jenkins for ownCloud
|
d251f04b98
|
[tx-robot] updated from transifex
|
2012-11-27 00:10:47 +01:00 |
|
Jenkins for ownCloud
|
7892204077
|
[tx-robot] updated from transifex
|
2012-11-26 00:02:04 +01:00 |
|
Jenkins for ownCloud
|
3688376a6f
|
[tx-robot] updated from transifex
|
2012-11-23 00:03:17 +01:00 |
|
Jenkins for ownCloud
|
3a5f5e127c
|
[tx-robot] updated from transifex
|
2012-11-22 00:02:16 +01:00 |
|
Jenkins for ownCloud
|
9204be827b
|
[tx-robot] updated from transifex
|
2012-11-21 00:02:33 +01:00 |
|
Jenkins for ownCloud
|
568def2b61
|
[tx-robot] updated from transifex
|
2012-11-20 00:02:08 +01:00 |
|
Jenkins for ownCloud
|
e28d71bf55
|
[tx-robot] updated from transifex
|
2012-11-18 00:02:00 +01:00 |
|
Jenkins for ownCloud
|
61670184c4
|
[tx-robot] updated from transifex
|
2012-11-17 00:02:24 +01:00 |
|
Thomas Müller
|
36bf4e24f0
|
Merge pull request #433 from owncloud/user_setting_fixes
User setting fixes
|
2012-11-15 14:01:16 -08:00 |
|
Jenkins for ownCloud
|
a418a3ba65
|
[tx-robot] updated from transifex
|
2012-11-15 00:03:50 +01:00 |
|
Bart Visscher
|
343e9d8621
|
Better check and handing of user deletion
|
2012-11-14 21:52:28 +01:00 |
|
Bart Visscher
|
59627367ae
|
Better check and handling of user creation
|
2012-11-14 21:52:28 +01:00 |
|
Bart Visscher
|
4eff27ed42
|
Always have the username as string in user admin
|
2012-11-14 21:52:28 +01:00 |
|
Bart Visscher
|
85209a0a00
|
Cleanup user settings js
|
2012-11-14 21:52:28 +01:00 |
|
Jenkins for ownCloud
|
9c36326e47
|
[tx-robot] updated from transifex
|
2012-11-14 00:03:38 +01:00 |
|
Jenkins for ownCloud
|
ac22cd4ab0
|
[tx-robot] updated from transifex
|
2012-11-13 00:07:19 +01:00 |
Brice Maron
|
910a25adbd
|
Fix deleting multiple user w-o reloading V2
|
2012-11-12 20:29:06 +00:00 |
|
Jenkins for ownCloud
|
09d6d843f7
|
[tx-robot] updated from transifex
|
2012-11-12 00:02:24 +01:00 |
|
Jenkins for ownCloud
|
9f8cc09642
|
[tx-robot] updated from transifex
|
2012-11-11 00:02:42 +01:00 |
Diederik de Haas
|
eff13a28c1
|
Fixed new checkstyle issues in apps.php from build #1341.
|
2012-11-10 01:03:54 +01:00 |
|
Diederik de Haas
|
1b7c0c2b62
|
Fixed new checkstyle issues in ocs.php from build #1341.
|
2012-11-10 01:02:47 +01:00 |
|
Jenkins for ownCloud
|
7ec0efe5c2
|
[tx-robot] updated from transifex
|
2012-11-10 00:02:29 +01:00 |
|
Thomas Müller
|
c053863644
|
Merge pull request #330 from owncloud/check_connection
add a check and a warning if the ownCloud server is not able to establis...
|
2012-11-09 02:11:24 -08:00 |
|
Jenkins for ownCloud
|
b33a443088
|
[tx-robot] updated from transifex
|
2012-11-09 10:07:45 +01:00 |
|
Jenkins for ownCloud
|
cb57a20ec2
|
[tx-robot] updated from transifex
|
2012-11-09 00:03:49 +01:00 |