summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-08-3013-70/+352
|\
| * Remove old Javascript codeMichael Gapczynski2012-08-291-4/+0
| * Fix displaying if a link is password protectedMichael Gapczynski2012-08-291-1/+8
| * Hide link password controls if link is removedMichael Gapczynski2012-08-291-0/+2
| * Delete old link if user sets a passwordMichael Gapczynski2012-08-291-2/+0
| * Fix password authentication for links and fix template problems for links by ...Michael Gapczynski2012-08-291-0/+37
| * Fix toggling of password protection in sharing dropdownMichael Gapczynski2012-08-292-6/+9
| * [tx-robot] updated from transifexv4.5.0beta1Jenkins for ownCloud2012-08-293-2/+33
| * return the jQuery deferred object when using OC.loadScriptRobin Appelman2012-08-291-4/+5
| * Reimplement links support for sharing and add password protection optionMichael Gapczynski2012-08-273-60/+66
| * Initial previewer for public linksMichael Gapczynski2012-08-271-0/+10
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-287-7/+0
| * remove background fade from navigation, fix flickering icon issue and make it...Jan-Christoph Borchardt2012-08-271-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-275-0/+5
| * Move additional jquery.inview filesMichael Gapczynski2012-08-262-0/+56
| * Move jquery.inview from contacts app to coreMichael Gapczynski2012-08-261-0/+134
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-263-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-261-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-08-261-0/+2
* | Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2972-25/+631
|\|
| * Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-253-61/+120
| |\
| | * Dynamically update shared status iconMichael Gapczynski2012-08-241-3/+36
| | * Add padding to the reshared textMichael Gapczynski2012-08-242-3/+4
| | * Determine if reshare needs to be checkedMichael Gapczynski2012-08-242-4/+12
| | * Switch to using file cache ids instead of paths for file sharingMichael Gapczynski2012-08-241-1/+12
| | * Prevent resharing in UI if share permission not grantedMichael Gapczynski2012-08-241-52/+58
| * | Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-25133-189/+1655
| |\|
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-242-10/+10
| | * Use right variable name.Thomas Tanghus2012-08-231-10/+10
| | * Check if files_sharing app is enabled, move file specific javascript to files...Michael Gapczynski2012-08-221-61/+0
| | * Move share CSS to core, add script and style from inside Share APIMichael Gapczynski2012-08-221-0/+17
| | * Revert using item name, no longer allowing the same item source exist for a userMichael Gapczynski2012-08-222-23/+32
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-08-221-8/+8
| | * Fix share ajax calls to use itemName/itemSource, show who shared a file with youMichael Gapczynski2012-08-202-38/+52
| | * Remove setTarget from ajaxMichael Gapczynski2012-08-201-6/+0
| | * Merge branch 'share_api'Michael Gapczynski2012-08-192-0/+547
| | |\
| | | * Refactor again so we can tell what item is being reshared in case the same so...Michael Gapczynski2012-08-191-1/+1
| | | * File sharing cleanup, works perfectly I think :)Michael Gapczynski2012-08-161-1/+0
| | | * Merge branch 'master' into share_apiMichael Gapczynski2012-08-147-84/+129
| | | |\
| | | * | Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a ...Michael Gapczynski2012-08-121-1/+1
| | | * | Merge branch 'master' into share_apiMichael Gapczynski2012-08-091-3/+3
| | | |\ \
| | | * | | Fix issues with hiding and showing dropdownMichael Gapczynski2012-08-081-14/+33
| | | * | | Reset item shares variable, fixes autocomplete not showing peopleMichael Gapczynski2012-08-081-1/+2
| | | * | | Actually change background image of shared itemsMichael Gapczynski2012-08-071-2/+3
| | | * | | Fix warnings and better stylingBart Visscher2012-08-071-2/+10
| | | * | | Don't return error when just no sharing foundBart Visscher2012-08-071-1/+1
| | | * | | Try to fix last commitMichael Gapczynski2012-08-071-3/+3
| | | * | | Check if itemShares share type is an array instead of set, javascript likes t...Michael Gapczynski2012-08-071-3/+3
| | | * | | Only show the user's groups in the share with autocompleteMichael Gapczynski2012-08-061-9/+6
| | | * | | Somewhat fixes dropdown display issues in the contacts appMichael Gapczynski2012-08-061-1/+1