summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-1940-90/+121
* Merge pull request #7363 from owncloud/optimize-startup-queriesMorris Jobke2014-05-193-13/+133
|\
| * Merge branch 'master' into optimize-startup-queriesBart Visscher2014-05-072215-83919/+193118
| |\
| * | Use limit=1 so the db can stop searching on the first hitBart Visscher2014-02-281-2/+9
| * | Add unit tests for getUserGroups with addUser and removeUserBart Visscher2014-02-271-0/+94
| * | Also clear cached UserGroup when a user is added/removedBart Visscher2014-02-271-0/+12
| * | Clear the cached user groups when a group is deletedBart Visscher2014-02-271-3/+5
| * | Only check for existence of shared files when doing shared storage setupBart Visscher2014-02-212-1/+24
| * | Delay fetching the display name until it is requestedBart Visscher2014-02-211-5/+7
| * | Add more caching in the group managerBart Visscher2014-02-211-5/+15
* | | 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-18169-394/+578
* | | | 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-17967-19151/+24007
* | | | | 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