Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-14 | 128 | -932/+1574 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php | ||||
| * | LDAP: adjust usersInGroup to updated interface | Arthur Schiwon | 2012-08-14 | 1 | -3/+12 |
| | | |||||
| * | LDAP: adjust getGroups to updated interface | Arthur Schiwon | 2012-08-14 | 1 | -6/+15 |
| | | |||||
| * | adjust LDAP to updated interface | Arthur Schiwon | 2012-08-14 | 1 | -2/+10 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-13 | 29 | -0/+326 |
| | | |||||
| * | Improve usability for configuring Dropbox and Google Drive external storage | Michael Gapczynski | 2012-08-13 | 4 | -304/+350 |
| | | |||||
| * | Suggest mount point name, don't reload custom javascript file | Michael Gapczynski | 2012-08-13 | 1 | -2/+29 |
| | | |||||
| * | Throw exception in Dropbox and Google Drive storage constructors if ↵ | Michael Gapczynski | 2012-08-13 | 2 | -11/+27 |
| | | | | | | | | parameters are not correct | ||||
| * | Show access granted label immediately after granting access | Michael Gapczynski | 2012-08-13 | 2 | -5/+11 |
| | | |||||
| * | Prevent editing Dropbox configuration input after access granted | Michael Gapczynski | 2012-08-13 | 1 | -0/+1 |
| | | |||||
| * | Show access granted label next to Google Drive and Dropbox storage in ↵ | Michael Gapczynski | 2012-08-13 | 2 | -0/+4 |
| | | | | | | | | configuration | ||||
| * | Fix remove button display for external storage | Michael Gapczynski | 2012-08-13 | 1 | -0/+2 |
| | | |||||
| * | l10n directories have been missing | Thomas Mueller | 2012-08-13 | 10 | -0/+0 |
| | | |||||
| * | Automatically check radio when new addressbook fields get focus. | Thomas Tanghus | 2012-08-13 | 1 | -0/+7 |
| | | |||||
| * | Calendar: remove not used style rules | Bart Visscher | 2012-08-12 | 1 | -2/+0 |
| | | |||||
| * | Rewrite remoteStorage settings, remove block echo | Bart Visscher | 2012-08-12 | 1 | -17/+11 |
| | | |||||
| * | Remove unused gallery template | Bart Visscher | 2012-08-12 | 1 | -47/+0 |
| | | |||||
| * | Change image links to use imagePath function | Bart Visscher | 2012-08-12 | 7 | -12/+12 |
| | | |||||
| * | Commented out unused(?) class that interfered with appsettings. | Thomas Tanghus | 2012-08-12 | 1 | -1/+1 |
| | | |||||
| * | Readded refresh param. 304 and ETag is still sent so shouldn't matter. | Thomas Tanghus | 2012-08-12 | 1 | -1/+1 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-12 | 7 | -0/+201 |
| | | |||||
| * | This is unnessecary because we already run htmlentities() over the template ↵ | Lukas Reschke | 2012-08-11 | 1 | -1/+1 |
| | | | | | | | | engine | ||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-11 | 55 | -518/+539 |
| | | |||||
| * | Following the code guidelines makes Michael happy :-) | Lukas Reschke | 2012-08-10 | 2 | -2/+6 |
| | | |||||
| * | Disable listening, instead checking the ACL to prevent DoS | Lukas Reschke | 2012-08-10 | 2 | -13/+9 |
| | | |||||
| * | Activate ACLs | Lukas Reschke | 2012-08-10 | 2 | -0/+7 |
| | | |||||
| * | Check if webfinger is enabled | Lukas Reschke | 2012-08-10 | 2 | -1/+8 |
| | | |||||
| * | Used wrong class. | Thomas Tanghus | 2012-08-10 | 2 | -2/+2 |
| | | |||||
| * | XSRF checks | Lukas Reschke | 2012-08-10 | 1 | -0/+2 |
| | | |||||
| * | Fixed 3 - THREE - errors in one method call :-P | Thomas Tanghus | 2012-08-09 | 1 | -3/+3 |
| | | |||||
| * | Sanitzing user input | Lukas Reschke | 2012-08-09 | 1 | -1/+1 |
| | | |||||
| * | LDAP: don't give Test Connection button red background on fail, it is ↵ | Arthur Schiwon | 2012-08-09 | 1 | -1/+0 |
| | | | | | | | | becoming unreadable | ||||
| * | remove debug code from calendar - thanks michael for pointing that out :) | Georg Ehrke | 2012-08-09 | 1 | -1/+0 |
| | | |||||
* | | Calendar: update share backend using contacts backend as template | Bart Visscher | 2012-08-10 | 1 | -11/+58 |
| | | |||||
* | | Contacts: Check format parameter | Bart Visscher | 2012-08-10 | 1 | -6/+8 |
| | | |||||
* | | Contacts: Better parameter names in addressbook share backend | Bart Visscher | 2012-08-10 | 1 | -7/+8 |
| | | |||||
* | | Additional permission checks for editing and deleting contacts | Michael Gapczynski | 2012-08-09 | 1 | -3/+76 |
| | | |||||
* | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-09 | 43 | -307/+401 |
|\| | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php | ||||
| * | Change parameter name and update docs. | Thomas Tanghus | 2012-08-09 | 1 | -5/+6 |
| | | |||||
| * | Another take at profile photo/thumbnail caching. oc-839. | Thomas Tanghus | 2012-08-09 | 10 | -47/+96 |
| | | |||||
| * | move calendar settings from personal settings to in app settings | Georg Ehrke | 2012-08-09 | 11 | -123/+178 |
| | | |||||
| * | Fix require statements. Fix for oc-1460. | Thomas Tanghus | 2012-08-09 | 4 | -10/+14 |
| | | |||||
| * | Remove useless setting of RUNTIME_NOAPPS | Bart Visscher | 2012-08-08 | 2 | -10/+0 |
| | | |||||
| * | Remove unused RUNTIME_NOSETUPFS var | Bart Visscher | 2012-08-08 | 9 | -37/+2 |
| | | |||||
| * | Don't return file handle if the mode supports writing and the file is not ↵ | Michael Gapczynski | 2012-08-08 | 1 | -0/+19 |
| | | | | | | | | writable | ||||
| * | remoteStorage: Use OCP\\Util for redirecting for login and generating link | Bart Visscher | 2012-08-07 | 1 | -2/+3 |
| | | |||||
| * | remoteStorage: split auth allow template | Bart Visscher | 2012-08-07 | 2 | -51/+37 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-07 | 5 | -4/+27 |
| | | |||||
| * | Some UI improvements on the addressbooks settings. | Thomas Tanghus | 2012-08-07 | 3 | -9/+19 |
| | | |||||
| * | Check if New and Upload buttons exist before adding their width to the total ↵ | Michael Gapczynski | 2012-08-06 | 1 | -1/+5 |
| | | | | | | | | breadcrumbs width |