summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix whitespace issuesRobin McCorkell2014-05-1616-69/+69
* Reduce double-space with single-space.Andreas Fischer2014-05-161-1/+1
* Remove spaces around | operator in doc block.Andreas Fischer2014-05-161-1/+1
* Fix more missing or broken PHPDocRobin McCorkell2014-05-1610-22/+20
* PHPDoc fixes for user_ldapRobin McCorkell2014-05-167-29/+29
* Fix PHPDoc in /appsRobin McCorkell2014-05-1631-241/+239
* Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-163-8/+66
|\
| * use default expire date only for link sharesBjoern Schiessle2014-05-163-8/+66
* | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-169-29/+132
|\ \
| * | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-169-29/+132
* | | Merge pull request #8610 from owncloud/ie8-filesdndbugVincent Petry2014-05-161-1/+1
|\ \ \
| * | | Fix drag and drop in IE8Vincent Petry2014-05-161-1/+1
* | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-1646-3032/+4323
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed many issues, clean upVincent Petry2014-05-1529-276/+540
| * | | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-1537-2941/+3796
| * | | Files app navigation can now switchVincent Petry2014-05-159-7/+124
| * | | Added navigation manager in files app for the sidebarVincent Petry2014-05-157-60/+70
| * | | Added app navigation for files appVincent Petry2014-05-1510-14/+55
| * | | Now settings CSS class with appid in content DIVVincent Petry2014-05-153-3/+7
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-16365-2177/+2831
|/ / /
* | | Merge pull request #8603 from owncloud/trashbinfixVincent Petry2014-05-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixed trashbin to use correct classVincent Petry2014-05-151-1/+1
|/ /
* | Merge pull request #8140 from owncloud/login-valignJan-Christoph Borchardt2014-05-152-6/+28
|\ \
| * | Move vertical alignment of public layout to mobile. Refs #8140jbtbnl2014-05-042-16/+22
| * | Vertically align public layout to better fit small mobile screensjbtbnl2014-04-102-7/+23
* | | Merge pull request #8589 from fibsifan/files_external_sftp_portRobin McCorkell2014-05-151-4/+4
|\ \ \
| * | | changing label "URL" to "Host"fibsifan2014-05-151-4/+4
* | | | Merge pull request #8587 from Raydiation/masterThomas Müller2014-05-155-7/+38
|\ \ \ \
| * | | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
| * | | | use fetch method instead of fetchRow because fetchRow is only an owncloud int...Bernhard Posselt2014-05-142-6/+6
| * | | | provide a way to detect the language that is being used (e.g. for clientside ...Bernhard Posselt2014-05-142-0/+31
* | | | | Merge pull request #8597 from owncloud/l10n-fix-typoVincent Petry2014-05-151-2/+2
|\ \ \ \ \
| * | | | | fix typo encryptionVolkan Gezer2014-05-151-2/+2
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-15344-12260/+12326
* | | | | Merge pull request #8567 from owncloud/test-ocshareunittestsThomas Müller2014-05-143-0/+101
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added ground work for OC.Share unit testsVincent Petry2014-05-133-0/+101
* | | | | Merge pull request #8522 from owncloud/sharing_ux_improvementsBjörn Schießle2014-05-146-25/+69
|\ \ \ \ \
| * | | | | move expire message to the bottomBjoern Schiessle2014-05-131-1/+2
| * | | | | hide default expire message if user sets expire dateBjoern Schiessle2014-05-131-0/+7
| * | | | | increase width of share dialogBjoern Schiessle2014-05-131-1/+1
| * | | | | add information about default expire date to the share dialogBjoern Schiessle2014-05-133-2/+29
| * | | | | hide input field if default expire date isn't activatedBjoern Schiessle2014-05-133-23/+32
* | | | | | Merge pull request #8403 from owncloud/fix-oc-dialogicewind19912014-05-141-6/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use jquery to get the window widthRobin Appelman2014-05-131-2/+2
| * | | | | Don't set the dialog content height to a zero or negative valueRobin Appelman2014-05-131-4/+10
| * | | | | Dont use absolute positioning for buttonrowRobin Appelman2014-05-131-3/+4
| * | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymoreMorris Jobke2014-04-292-6/+5
* | | | | | Merge pull request #8584 from Bagera/masterjbtbnl2014-05-141-1/+1
|\ \ \ \ \ \
| * | | | | | Set row height in files tableBagera2014-05-141-2/+2
| * | | | | | fixes #7949Bagera2014-05-131-1/+1