summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Add generic 'share by link' URL generator in share.jslibasys2014-05-191-1/+13
* Merge pull request #7286 from owncloud/issue/4823Morris Jobke2014-05-192-6/+34
|\
| * fix wrong conflict resolutionMorris Jobke2014-05-191-1/+1
| * Correctly set expiration dates when adding additional sharesJoas Schilling2014-05-191-4/+31
| * Automatically copy the share expiration date when new shares are createdJoas Schilling2014-05-191-1/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-193-0/+5
* | Merge pull request #8592 from owncloud/login-timezoneMorris Jobke2014-05-192-1/+7
|\ \ | |/ |/|
| * Disable login button until the timezone is setVincent Petry2014-05-142-1/+7
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-187-3/+50
* | Merge pull request #8609 from owncloud/ie8-svgfallbackforiconsVincent Petry2014-05-171-0/+15
|\ \
| * | SVG fallback for settings iconVincent Petry2014-05-161-0/+5
| * | Fallback for triangle iconsVincent Petry2014-05-161-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1774-88/+117
* | | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-162-19/+34
|\ \ \
| * | | allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-162-19/+34
* | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-163-1/+117
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed many issues, clean upVincent Petry2014-05-151-0/+5
| * | | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-151-0/+108
| * | | Files app navigation can now switchVincent Petry2014-05-151-0/+5
| * | | Added app navigation for files appVincent Petry2014-05-152-5/+3
| * | | Now settings CSS class with appid in content DIVVincent Petry2014-05-151-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1614-6/+63
|/ / /
* | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1566-103/+104
* | | | 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-143-2/+37
|\ \ \ \
| * | | | 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
* | | | | 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
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-141-1/+40
* | | | | Merge pull request #8524 from owncloud/prompt-dialogThomas Müller2014-05-131-1/+60
|\ \ \ \ \
| * | | | | Fix Typo, define $ as globalLukas Reschke2014-05-111-2/+2
| * | | | | Add prompt dialog to OC.dialogsRobin Appelman2014-05-091-0/+59
* | | | | | Merge pull request #8550 from owncloud/fix-sticky-footerMorris Jobke2014-05-131-2/+2
|\ \ \ \ \ \
| * | | | | | fix sticky footer on log in pageJan-Christoph Borchardt2014-05-121-2/+2
* | | | | | | Merge pull request #8526 from owncloud/escape-share-emails-masterVincent Petry2014-05-131-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fix styleThomas Müller2014-05-121-2/+2
| * | | | | | escape display name and emailThomas Müller2014-05-091-1/+1
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-131-0/+3
* | | | | | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-121-4/+4
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-123-17/+30