summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-08212-1192/+1148
|
* Merge pull request #18876 from owncloud/missing-context-on-update-file-targetMorris Jobke2015-09-071-1/+1
|\ | | | | Use context function call instead of static
| * Use context function call instead of staticJoas Schilling2015-09-071-1/+1
| |
* | Merge pull request #18630 from owncloud/files-combineuploadbuttonJan-Christoph Borchardt2015-09-0714-320/+792
|\ \ | | | | | | Combine upload action into the "New" menu
| * | Added unit tests for "new" file menu and small fixesVincent Petry2015-09-035-54/+247
| | | | | | | | | | | | | | | | | | - added unit tests for NewFileMenu - use generateUrl for FileList.createFile and FileList.createDirectory - added unit tests for FileList.createFile and FileList.createDirectory
| * | Remove ellipsis on new file menu itemsVincent Petry2015-09-031-1/+0
| | |
| * | fix icon and layout details for new menuJan-Christoph Borchardt2015-09-033-13/+12
| | |
| * | Combine upload action into the "New" menuVincent Petry2015-08-2811-270/+551
| | | | | | | | | | | | Refactored the new menu to be encapsulated in the NewFileMenu JS class
* | | Merge pull request #18872 from owncloud/settings_users_ldapMorris Jobke2015-09-071-1/+1
|\ \ \ | |_|/ |/| | Check if app is enabled instead of if class exists
| * | Check if app is enabled instead of if class existsRobin McCorkell2015-09-071-1/+1
| | |
* | | Merge pull request #18868 from owncloud/fix-files_version-js-loadJoas Schilling2015-09-071-1/+0
|\ \ \ | |/ / |/| | Remove unneeded include
| * | Remove unneeded includeMorris Jobke2015-09-071-1/+0
| | | | | | | | | | | | | | | * fixes #18867 * ref #18748
* | | Merge pull request #18866 from tflidd/doc_link_phpfpmRobin McCorkell2015-09-071-1/+1
|\ \ \ | |/ / |/| | Doc link phpfpm
| * | remove spaces and empty linetflidd2015-09-071-2/+1
| | |
| * | Add documentation link php-fpmtflidd2015-09-071-1/+2
|/ / | | | | | | Admin-Page warning didn't have a direct link to the documentation.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-09-074-0/+30
| |
* | Merge pull request #18748 from owncloud/files-versions-tabMorris Jobke2015-09-0718-221/+976
|\ \ | | | | | | Add versions tab to files sidebar
| * | Add versions tab to files sidebarVincent Petry2015-09-0318-221/+976
| | | | | | | | | | | | | | | | | | | | | - move versions to a tab in the files sidebar - added mechanism to auto-update the row in the FileList whenever values are set to the FileInfoModel given to the sidebar - updated tags/favorite action to make use of that new mechanism
* | | Merge pull request #18839 from owncloud/autoloader-supersecureMorris Jobke2015-09-075-15/+56
|\ \ \ | | | | | | | | Restrict autoloaded paths to loaded apps (and other enhancements)
| * | | Unique exception for invalid autoload paths, better handlingRobin McCorkell2015-09-053-9/+53
| | | | | | | | | | | | | | | | | | | | Background jobs are tolerant of stale entries left by disabled apps, which will cause an autoload exception.
| * | | Resolve autoloader valid roots before checkingRobin McCorkell2015-09-051-1/+1
| | | | | | | | | | | | | | | | Allows symlinked app directories to work properly
| * | | Only add valid root for enabled appsRobin McCorkell2015-09-052-5/+2
| | | |
* | | | Merge pull request #18742 from owncloud/mimetype-updatedbRoeland Douma2015-09-0613-124/+702
|\ \ \ \ | | | | | | | | | | Introduce mimetype DB update occ command
| * | | | Unit tests for mimetype loaderRobin McCorkell2015-09-042-0/+277
| | | | |
| * | | | Introduce mimetype DB update occ commandRobin McCorkell2015-09-042-1/+98
| | | | |
| * | | | Split mimetype handling to new classRobin McCorkell2015-09-047-97/+280
| | | | |
| * | | | Move maintenance:mimetypesjs to sublocation, cleanup codeRobin McCorkell2015-09-012-19/+26
| | | | |
| * | | | Allow access to full alias and mapping arraysRobin McCorkell2015-09-011-8/+22
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0612-0/+14
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0520-0/+52
| |/ / / |/| | |
* | | | Merge pull request #18833 from owncloud/share-prevent-twiceMorris Jobke2015-09-041-0/+12
|\ \ \ \ | | | | | | | | | | Prevent sharing twice with user when already a group
| * | | | Prevent sharing twice with user when already a groupVincent Petry2015-09-041-0/+12
| | |/ / | |/| |
* | | | Merge pull request #18832 from owncloud/fix-infinite-loop-share-propagationRobin Appelman2015-09-041-0/+8
|\ \ \ \ | | | | | | | | | | Avoid re-propagation of shares during one propagation run
| * | | | Avoid re-propagation of shares during one propagation runMorris Jobke2015-09-041-0/+8
|/ / / / | | | | | | | | | | | | * fix was proposed by @nickvergessen
* | | | Merge pull request #18823 from owncloud/filetype-pngsMorris Jobke2015-09-0423-4/+3
|\ \ \ \ | | | | | | | | | | export correct 48px png fallbacks for filetype icons
| * | | | also modify other places icons to fit new styleJan-Christoph Borchardt2015-09-034-4/+3
| | | | |
| * | | | export correct 48px png fallbacks for filetype iconsJan-Christoph Borchardt2015-09-0320-0/+0
| | | | |
* | | | | Merge pull request #18762 from owncloud/use-json-instead-of-unserializeMorris Jobke2015-09-042-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Use "json_encode" and "json_decode" instead of unserialize
| * | | | | Use "json_encode" and "json_decode" instead of unserializeLukas Reschke2015-09-022-4/+4
| | | | | |
* | | | | | Merge pull request #18794 from individual-it/reuse_systemConfigIndividual IT Services2015-09-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | reuse existing $systemConfig variable
| * | | | | | reuse existing $systemConfig variableIndividual IT Services2015-09-031-1/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-04130-46/+128
| | | | | | |
* | | | | | | Merge pull request #18815 from owncloud/ext-updateRobin McCorkell2015-09-031-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set default mount options for external storages
| * | | | | | | Set default mount options for external storagesRobin McCorkell2015-09-031-0/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #18799 from owncloud/appconfig-with-one-requestMorris Jobke2015-09-032-314/+356
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Only query the appconfig once per request
| * | | | | | | Make sure the array existsJoas Schilling2015-09-031-0/+8
| | | | | | | |
| * | | | | | | Only query the appconfig onceJoas Schilling2015-09-032-315/+349
| | | | | | | |
* | | | | | | | Merge pull request #18810 from owncloud/shared-mount-delay-setupVincent Petry2015-09-033-7/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Delay setting up the filesystem for a share owner untill the share is used
| * | | | | | | | setup owner when getting users for shareRobin Appelman2015-09-031-0/+2
| | | | | | | | |
| * | | | | | | | Delay setting up the filesystem for a share owner untill the share is usedRobin Appelman2015-09-032-7/+6
| | | | | | | | |