summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'master' into issue_20427Jesus Macias Portela2015-12-03740-7186/+15695
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Delete js unit test. Another issue has been created to create js testJesús Macias2015-12-011-205/+0
| * | | | | Fix css selector and bug checking personal mounts statusJesús Macias2015-11-242-5/+5
| * | | | | Add css to manage row status colorJesús Macias2015-11-243-4/+12
| * | | | | Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427Jesús Macias2015-11-241-0/+205
| |\ \ \ \ \
| | * | | | | Added some unit tests for the status managerVincent Petry2015-11-201-0/+205
| * | | | | | Fix code from PR commentsJesús Macias2015-11-244-236/+208
| |/ / / / /
| * | | | | Adding logic to show custom icon for current backends, waiting for icon filesJesús Macias2015-11-201-0/+24
| * | | | | Fix code from PR commentsJesús Macias2015-11-182-615/+525
| * | | | | Add method to show custom icon and icon-error for each storage backendJesús Macias2015-11-183-211/+200
| * | | | | Add icon management capabilities (error icon)Jesús Macias2015-11-132-17/+18
| * | | | | First working approach to show mount statusJesús Macias2015-11-126-50/+874
* | | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-codeThomas Müller2015-12-071-15/+6
|\ \ \ \ \ \
| * | | | | | Cleanup trashbin expire codeMorris Jobke2015-11-301-15/+6
* | | | | | | Merge pull request #20581 from owncloud/public-page-preview-hidpi-scaleThomas Müller2015-12-071-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix hidpi previews on public pageRobin Appelman2015-11-181-4/+8
* | | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-072-4/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-232-4/+3
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-064-0/+6
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0510-8/+20
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | db config backend for files_externalRobin Appelman2015-12-0418-951/+1614
* | | | | | | Delete no longer existing users from system addressbookThomas Müller2015-12-041-0/+12
* | | | | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | More cleanups of OC_Config usageMorris Jobke2015-12-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20931 from owncloud/dav-fixnamespaceoutputThomas Müller2015-12-042-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix namespace XML output of files and tags davVincent Petry2015-12-032-2/+2
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0410-0/+50
* | | | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-038-145/+280
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-288-145/+280
* | | | | | | Fix duplicate use in storage controllerJesús Macias2015-12-031-1/+0
* | | | | | | Migrate storate status code to storagenotavailablexceptionJesús Macias2015-12-033-11/+9
* | | | | | | Fix code from PR commentsJesús Macias2015-12-031-21/+1
* | | | | | | Change exception catch orderJesús Macias2015-12-031-5/+5
* | | | | | | Delete unnecessary storage status constansJesús Macias2015-12-031-4/+0
* | | | | | | Add new external storage exceptions for different errorsJesús Macias2015-12-031-38/+24
* | | | | | | Add different storage status codes managed by StoragedNotAvailableExceptionJesús Macias2015-12-032-4/+42
* | | | | | | Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-033-36/+35
|\ \ \ \ \ \ \
| * | | | | | | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-023-36/+35
* | | | | | | | Merge pull request #20900 from owncloud/share-group-only-with-exact-matchThomas Müller2015-12-032-12/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Only return the exact match, when it's allowedJoas Schilling2015-12-022-12/+41
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-032-0/+2
* | | | | | | | | Merge pull request #20905 from owncloud/allow-framing-itselfThomas Müller2015-12-022-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow framing 'self'Lukas Reschke2015-12-022-1/+10
| |/ / / / / / / /
* | | | | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuffThomas Müller2015-12-021-3/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Replace old config code with usage of proper APIsMorris Jobke2015-12-021-3/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-0217-42/+779
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix endless recursionThomas Müller2015-12-021-3/+15
| * | | | | | | Fix update of avatar imageThomas Müller2015-12-022-33/+49
| * | | | | | | Fix commentsThomas Müller2015-12-022-4/+4
| * | | | | | | Proposal: add enumeration function to IUserManager which simply calls a callb...Thomas Müller2015-12-021-20/+17