summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-291321-15741/+147757
|\
| * fix UI bug with subadminsGeorg Ehrke2012-08-251-2/+4
| * Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-25101-764/+1224
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-25101-764/+1224
| * | OC_Share no longer exists. remove hooks that would trigger require_once / aut...jfd2012-08-254-30/+41
| * | use limit parameter instead of LIMIT SQL for vcardjfd2012-08-251-13/+5
| * | remove superflous LIMITjfd2012-08-251-1/+1
| * | fix missing $jfd2012-08-251-1/+1
| * | remove duplicate methodjfd2012-08-251-14/+0
| * | fix typo in db_structurejfd2012-08-251-1/+1
| * | add backticks to SQL, use limit parameter instead of LIMIT SQLJörn Friedrich Dreyer2012-08-2527-137/+135
| * | Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-2512-148/+214
| |\|
| | * Dynamically update shared status iconMichael Gapczynski2012-08-241-3/+36
| | * Temporary fix to prevent rename action in root of Shared directoryMichael Gapczynski2012-08-241-0/+4
| | * Add padding to the reshared textMichael Gapczynski2012-08-242-3/+4
| | * Determine if reshare needs to be checkedMichael Gapczynski2012-08-242-4/+12
| | * Correct variable name.Thomas Tanghus2012-08-241-3/+3
| | * Switch to using file cache ids instead of paths for file sharingMichael Gapczynski2012-08-247-66/+69
| | * Prevent resharing in UI if share permission not grantedMichael Gapczynski2012-08-242-56/+62
| | * Fix shared storage rename. Note: You can only rename shared files/folders tha...Michael Gapczynski2012-08-241-15/+26
| * | Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-252465-47244/+184035
| |\|
| | * Implemented sharing api for CalDAV.Thomas Tanghus2012-08-247-7/+316
| | * White-space.Thomas Tanghus2012-08-241-29/+32
| | * Forgot to reenable the export plugin.Thomas Tanghus2012-08-242-2/+2
| | * Implemented sharing api for CardDAV. Next step CalDAV.Thomas Tanghus2012-08-249-11/+325
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-24256-3571/+4420
| | * Permission checking for shared addressbooks/contacts.Thomas Tanghus2012-08-238-39/+165
| | * Removed redundant __CLASS__ in logging.Thomas Tanghus2012-08-231-28/+28
| | * Fix for deleting queued contacts.Thomas Tanghus2012-08-231-8/+16
| | * Missing IM variable assignments.Thomas Tanghus2012-08-231-0/+8
| | * Use correct js class in first-run template.Thomas Tanghus2012-08-231-2/+1
| | * Used non-existing variable.Thomas Tanghus2012-08-231-2/+2
| | * Return newly created addressbook.Thomas Tanghus2012-08-231-3/+4
| | * LDAP: identify (map) users with their directory UUID. Fixes the issue, that u...Arthur Schiwon2012-08-235-26/+140
| | * Only load js and css once.Thomas Tanghus2012-08-231-11/+13
| | * Limit styles so they don't interfere with sharing dropdown.Thomas Tanghus2012-08-231-3/+3
| | * Use right variable name.Thomas Tanghus2012-08-231-10/+10
| | * Remove obsolete closure.Thomas Tanghus2012-08-231-13/+0
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-23223-7447/+9351
| | * Don't add empty property parameters.Thomas Tanghus2012-08-232-8/+16
| | * CSS fix for Windows.Thomas Tanghus2012-08-231-2/+2
| | * Moves the lastAction=null outside the if so it can include the undo requests ...Juan Carlos Cornejo2012-08-221-1/+1
| | * Fixes a bug where if one tries to delete a file, then clicks undo, and then t...Juan Carlos Cornejo2012-08-221-0/+1
| | * Add support for IMPP properties.Thomas Tanghus2012-08-228-23/+242
| | * Check if files_sharing app is enabled, move file specific javascript to files...Michael Gapczynski2012-08-224-63/+67
| | * Move share CSS to core, add script and style from inside Share APIMichael Gapczynski2012-08-222-0/+2
| | * Removing most of files_sharing, the Share API implemented the majority of itMichael Gapczynski2012-08-2218-1267/+1
| | * Revert using item name, no longer allowing the same item source exist for a userMichael Gapczynski2012-08-225-92/+118
| | * LDAP: fix potentially unavailable LDAP resource, which can prevent successful...Arthur Schiwon2012-08-221-0/+3
| | * LDAP: make refreshInterval for background jobs configurable in the DBArthur Schiwon2012-08-221-5/+6