summaryrefslogtreecommitdiffstats
path: root/core/js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-09-077-37/+76
|\
| * Fix name for OCCategoriesBart Visscher2012-09-051-1/+1
| * Add 'var' before some global js varsBart Visscher2012-09-052-2/+2
| * Add missing ; to js codeBart Visscher2012-09-055-10/+10
| * Fix some jslint warningsBart Visscher2012-09-041-0/+2
| * Fix check in Javascript for password protected linkMichael Gapczynski2012-09-011-1/+1
| * unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.ShareJörn Friedrich Dreyer2012-08-311-5/+0
| * unify permissions (2/3): change apps to use OC::PERMISSION_XJörn Friedrich Dreyer2012-08-311-18/+18
| * unify permissions (1/3): add permission conastants to javascript OCJörn Friedrich Dreyer2012-08-311-0/+5
| * add OC.get and OC.set to get/set variables by name in javascriptRobin Appelman2012-08-301-0/+37
* | Merge branch 'master' into routingBart Visscher2012-08-305-63/+265
|\|
| * 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 toggling of password protection in sharing dropdownMichael Gapczynski2012-08-291-5/+6
| * 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-271-56/+53
| * Initial previewer for public linksMichael Gapczynski2012-08-271-0/+10
| * Move additional jquery.inview filesMichael Gapczynski2012-08-262-0/+56
| * Move jquery.inview from contacts app to coreMichael Gapczynski2012-08-261-0/+134
* | Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-293-4/+443
|\|
| * Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-su...Jörn Friedrich Dreyer2012-08-251-57/+111
| |\
| | * Dynamically update shared status iconMichael Gapczynski2012-08-241-3/+36
| | * Add padding to the reshared textMichael Gapczynski2012-08-241-2/+2
| | * Determine if reshare needs to be checkedMichael Gapczynski2012-08-241-1/+5
| | * 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-254-31/+490
| |\|
| | * 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
| | * Revert using item name, no longer allowing the same item source exist for a userMichael Gapczynski2012-08-221-18/+27
| | * Fix share ajax calls to use itemName/itemSource, show who shared a file with youMichael Gapczynski2012-08-201-29/+39
| | * Merge branch 'share_api'Michael Gapczynski2012-08-191-0/+419
| | |\
| | | * File sharing cleanup, works perfectly I think :)Michael Gapczynski2012-08-161-1/+0
| | | * Merge branch 'master' into share_apiMichael Gapczynski2012-08-142-31/+58
| | | |\
| | | * | 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
| | | * | Somewhat fixes dropdown display issues in the contacts appMichael Gapczynski2012-08-061-1/+1
| | | * | Remove person from array after unshare, so name appears in autocomplete againMichael Gapczynski2012-08-061-1/+5
| | | * | Merge branch 'master' into share_apiMichael Gapczynski2012-08-061-27/+80
| | | |\ \
| | | * | | Don't load item if it doesn't have it status setMichael Gapczynski2012-08-061-2/+2
| | | * | | Lots of refactoring to share APIMichael Gapczynski2012-08-061-12/+13
| | | * | | Hide 'can edit' if not checkedMichael Gapczynski2012-08-011-1/+6
| | | * | | Throw exceptions in share API for UI to displayMichael Gapczynski2012-08-011-1/+1
| | | * | | Prevent up and down arrow from changing the share with input valueMichael Gapczynski2012-07-311-1/+5
| | | * | | Give share with search focus when sharing dropdown appearsMichael Gapczynski2012-07-311-1/+2
| | | * | | Don't show self or already shared with users and groups in the share with searchMichael Gapczynski2012-07-311-2/+7
| | | * | | Add suggestion to share with search for sharing via emailMichael Gapczynski2012-07-311-3/+9