Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 93 | -834/+589 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-14 | 2 | -0/+2 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-11 | 1 | -1/+2 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-10 | 1 | -22/+22 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-09 | 2 | -0/+2 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-06 | 1 | -0/+1 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-05 | 4 | -1/+40 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-04 | 4 | -0/+4 |
| * | Merge pull request #682 from VicDeo/master | Thomas Müller | 2012-12-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Check if we have an array with data. Fix #487 | Victor Dubiniuk | 2012-12-02 | 1 | -1/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-03 | 7 | -0/+10 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-02 | 4 | -0/+19 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-01 | 9 | -0/+9 |
| * | Merge pull request #603 from owncloud/store_plain_groupname | Bart Visscher | 2012-11-30 | 2 | -2/+2 |
| |\ | |||||
| | * | Group name does't need to be sanitized before storing it in the database | Bart Visscher | 2012-11-27 | 2 | -2/+2 |
| * | | use attr instead of data | Georg Ehrke | 2012-11-29 | 1 | -7/+2 |
| * | | Revert "fix group and subadmin managing for 'ajax-loaded' users" | Georg Ehrke | 2012-11-29 | 1 | -2/+7 |
| * | | add a client side check | Georg Ehrke | 2012-11-28 | 1 | -0/+3 |
| * | | fix group and subadmin managing for 'ajax-loaded' users | Georg Ehrke | 2012-11-28 | 1 | -7/+2 |
| * | | make some checks server-side | Georg Ehrke | 2012-11-28 | 2 | -3/+6 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-28 | 1 | -0/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-27 | 1 | -0/+1 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-26 | 1 | -0/+2 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-23 | 1 | -0/+1 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-22 | 1 | -0/+30 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-21 | 2 | -5/+6 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-20 | 4 | -5/+30 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-18 | 2 | -0/+47 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-17 | 2 | -0/+2 |
| * | Merge pull request #433 from owncloud/user_setting_fixes | Thomas Müller | 2012-11-15 | 2 | -16/+14 |
| |\ | |||||
| | * | Better check and handing of user deletion | Bart Visscher | 2012-11-14 | 1 | -0/+2 |
| | * | Better check and handling of user creation | Bart Visscher | 2012-11-14 | 1 | -2/+5 |
| | * | Always have the username as string in user admin | Bart Visscher | 2012-11-14 | 1 | -6/+6 |
| | * | Cleanup user settings js | Bart Visscher | 2012-11-14 | 1 | -8/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-15 | 1 | -0/+2 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-14 | 2 | -0/+2 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-13 | 3 | -0/+14 |
| * | Fix deleting multiple user w-o reloading V2 | Brice Maron | 2012-11-12 | 1 | -1/+4 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-12 | 5 | -4/+12 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-11 | 1 | -0/+1 |
| * | Fixed new checkstyle issues in apps.php from build #1341. | Diederik de Haas | 2012-11-10 | 1 | -1/+1 |
| * | Fixed new checkstyle issues in ocs.php from build #1341. | Diederik de Haas | 2012-11-10 | 1 | -1/+1 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-10 | 49 | -620/+34 |
| * | Merge pull request #330 from owncloud/check_connection | Thomas Müller | 2012-11-09 | 3 | -0/+16 |
| |\ | |||||
| | * | add a check and a warning if the ownClodu server is not able to establish htt... | Frank Karlitschek | 2012-11-08 | 3 | -0/+16 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-09 | 15 | -0/+57 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-11-09 | 44 | -59/+25 |
| * | | Fix delete link when new user is added | Brice Maron | 2012-11-08 | 1 | -1/+8 |
| * | | Merge pull request #326 from owncloud/add_credits | Thomas Müller | 2012-11-08 | 1 | -1/+6 |
| |\ \ | |||||
| | * | | add credits to personal page too so that non admins can see what they run. | Frank Karlitschek | 2012-11-08 | 1 | -1/+6 |
| | |/ |