summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12902 from owncloud/fix-filelist-thumbnailsMorris Jobke2014-12-173-13/+59
|\
| * Propertly restore thumbnail on cancel/rename/moveVincent Petry2014-12-173-13/+59
* | Merge pull request #12895 from owncloud/favorites-polishJan-Christoph Borchardt2014-12-174-3/+12
|\ \ | |/ |/|
| * fix favorite star flickering on empty state pageJan-Christoph Borchardt2014-12-171-1/+3
| * fix file list summary left alignmentJan-Christoph Borchardt2014-12-171-1/+1
| * fix empty state for FavoritesJan-Christoph Borchardt2014-12-172-1/+8
| * put Favorites second in list, after 'All files'Jan-Christoph Borchardt2014-12-171-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-17106-4/+246
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-166-0/+6
* Merge pull request #12360 from owncloud/files-tagsLukas Reschke2014-12-1517-8/+1182
|\
| * Fixed small code style issuesVincent Petry2014-12-155-12/+16
| * Remove spinner when toggling file favoriteVincent Petry2014-12-151-9/+14
| * Fixed has-favorites CSSVincent Petry2014-12-153-2/+5
| * shift actions to the left a bit to account for right shift due to favorites a...Jan-Christoph Borchardt2014-12-151-0/+1
| * add CSS to shift header to account for when favorites are presentJan-Christoph Borchardt2014-12-151-0/+8
| * Use star icon for favoritesVincent Petry2014-12-152-10/+44
| * Correctly replace favorites icon when re-rendering file actionsVincent Petry2014-12-151-1/+1
| * Added favorites feature to the files appVincent Petry2014-12-1517-8/+1127
* | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-151-1/+1
|\ \ | |/ |/|
| * introduce inApps[] filter for search via ajax query, make file results show u...Jörn Friedrich Dreyer2014-12-101-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1518-0/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-14128-128/+128
* | Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-132-3/+29
|\ \
| * | Return ? if mtime is 0 or -1Robin McCorkell2014-12-122-3/+29
* | | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-133-39/+59
|\ \ \
| * | | Replace input checkbox CSS selector with .electCheckBoxVincent Petry2014-12-112-22/+18
| * | | Move file thumbnail into the label elementVincent Petry2014-12-113-18/+42
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-132-2/+2
* | | | Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-121-0/+6
|\ \ \ \
| * | | | Simple Plugin system for JavascriptVincent Petry2014-12-011-0/+6
| | |_|/ | |/| |
* | | | Merge pull request #12698 from owncloud/handle_readonly_shared_filesMorris Jobke2014-12-124-8/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | show readonly message in file conflict dialog, make it always selectedJörn Friedrich Dreyer2014-12-114-8/+54
| | |/ | |/|
* | | Merge pull request #11892 from owncloud/remove_triggerupdateThomas Müller2014-12-102-34/+32
|\ \ \
| * | | make path absoluteJörn Friedrich Dreyer2014-12-101-7/+11
| * | | add quiet option, ref #8794Jörn Friedrich Dreyer2014-12-041-9/+18
| * | | remove triggerupdate, ref #11872Jörn Friedrich Dreyer2014-12-042-26/+11
| |/ /
* | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-0/+2
|\ \ \
| * | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-0/+2
* | | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-091-1/+1
|\ \ \ \
| * | | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-091-1/+1
| |/ / /
* | | | Merge pull request #12688 from owncloud/rename-altLukas Reschke2014-12-091-0/+1
|\ \ \ \
| * | | | introduce alt text for rename icon - fixes #12067Morris Jobke2014-12-081-0/+1
* | | | | Merge pull request #12709 from owncloud/fix-11955Morris Jobke2014-12-091-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Skip headers that can not be splitVictor Dubiniuk2014-12-081-0/+3
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-09148-254/+0
|/ / /
* | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-082-113/+286
|\ \ \
| * | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-242-113/+286
* | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| * | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-03385-5520/+11283
| |\ \ \