summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix testsBernhard Posselt2014-12-171-4/+2
* use two tests instead of oneBernhard Posselt2014-12-171-4/+18
* add a isLoggedIn method to the usersession and deprecate the isLoggedIn metho...Bernhard Posselt2014-12-175-1/+49
* 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
* | Merge pull request #12889 from owncloud/deprecation-timeThomas Müller2014-12-174-0/+28
|\ \
| * | first round of deprecationBernhard Posselt2014-12-164-0/+28
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-17156-46/+600
| |/ |/|
* | Merge pull request #12881 from owncloud/issue/12874-interface-timezoneLukas Reschke2014-12-164-24/+104
|\ \
| * | Move timezone logic out of server.phpJoas Schilling2014-12-164-24/+104
| |/
* | Merge pull request #12890 from owncloud/add-fancy-translationThomas Müller2014-12-161-0/+2
|\ \ | |/ |/|
| * Add some fancy translation chartLukas Reschke2014-12-161-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1650-32/+78
* Merge pull request #12360 from owncloud/files-tagsLukas Reschke2014-12-1520-10/+1209
|\
| * 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
| * Load handlebars in coreVincent Petry2014-12-151-1/+2
| * Correctly replace favorites icon when re-rendering file actionsVincent Petry2014-12-151-1/+1
| * Added favorites feature to the files appVincent Petry2014-12-1518-8/+1146
| * Return file info from Node APIVincent Petry2014-12-151-1/+6
* | Merge pull request #11946 from owncloud/load-vendor-from-core-jsonLukas Reschke2014-12-151-6/+15
|\ \
| * | Implement method that reads vendor libs from core.jsonMorris Jobke2014-12-151-6/+15
* | | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-156-18/+69
|\ \ \ | |/ / |/| |
| * | introduce inApps[] filter for search via ajax query, make file results show u...Jörn Friedrich Dreyer2014-12-106-18/+69
* | | Merge pull request #12839 from oparoz/ControllerMethodReflectorMorris Jobke2014-12-152-1/+66
|\ \ \
| * | | Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflectorOlivier Paroz2014-12-142-1/+66
* | | | Merge pull request #12846 from owncloud/fix-searchbytags-testMorris Jobke2014-12-151-2/+6
|\ \ \ \
| * | | | Sort results to make sure assert work on consistent orderVincent Petry2014-12-151-2/+6
| | |_|/ | |/| |
* | | | Merge pull request #12625 from owncloud/app-dependencies-libs-and-commandsBernhard Posselt2014-12-1511-68/+705
|\ \ \ \
| * | | | fixing owncloud versionThomas Müller2014-12-151-1/+2
| * | | | adding unit tests for PlatformRepository::normalizeVersion()Thomas Müller2014-12-121-0/+65
| * | | | rework api of DependencyAnalyzerThomas Müller2014-12-124-99/+94
| * | | | check app dependencies on installation as wellThomas Müller2014-12-111-6/+21
| * | | | fix unit testsThomas Müller2014-12-111-1/+1
| * | | | single dependencies will not be represented as an array + fix unit testsThomas Müller2014-12-112-9/+24
| * | | | adjust styling of missing dependencies in apps managementThomas Müller2014-12-112-4/+9
| * | | | adding dependency to owncloud version - with fallback to requiremin and requi...Thomas Müller2014-12-115-1/+75
| * | | | adding dependencies for supported platformsThomas Müller2014-12-114-1/+52
| * | | | adding supported libraries - including min and max versionThomas Müller2014-12-116-8/+320
| * | | | adding dependencies for command line toolsThomas Müller2014-12-113-20/+124
* | | | | Merge pull request #11991 from owncloud/bower-jquery-uiMorris Jobke2014-12-1513-138/+353
|\ \ \ \ \ | |_|/ / / |/| | | |