summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-08-1064-56/+182
* Merge pull request #777 from nextcloud/ocs_capabilitiesMorris Jobke2016-08-107-98/+100
|\
| * Remove OC_OCS_Cloud and OC\OCS\CloudRoeland Jago Douma2016-08-092-67/+0
| * Move /cloud/user to Core appRoeland Jago Douma2016-08-093-9/+23
| * Move getCapabilities over to CoreRoeland Jago Douma2016-08-095-25/+31
| * Allow OCS routes in Core and SettingsRoeland Jago Douma2016-08-092-0/+49
* | Merge pull request #677 from nextcloud/app-menu-fixLukas Reschke2016-08-101-0/+4
|\ \
| * | Fix closing app menu on mobileJulius Haertl2016-07-311-0/+4
* | | Merge pull request #529 from nextcloud/vendor-maintenance-downgradeLukas Reschke2016-08-104-3/+43
|\ \ \
| * | | Allow downgrades of maintenance accross vendorsJoas Schilling2016-07-224-3/+43
* | | | Merge pull request #783 from nextcloud/app-disable-yellowLukas Reschke2016-08-101-2/+2
|\ \ \ \
| * | | | make disabled apps more clear during upgradeRobin Appelman2016-08-091-2/+2
* | | | | Merge pull request #784 from nextcloud/admin_php_smtp_casingLukas Reschke2016-08-091-6/+6
|\ \ \ \ \
| * | | | | Admin setting PHP and SMTP casingRoeland Jago Douma2016-08-091-6/+6
* | | | | | Merge pull request #799 from nextcloud/open_date_picker_on_toggleMorris Jobke2016-08-091-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Open exiration date picker directly on toggleRoeland Jago Douma2016-08-091-0/+2
* | | | | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routesLukas Reschke2016-08-093-9/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow ocs/v2.php/cloud/... routesRoeland Jago Douma2016-08-083-9/+15
* | | | | | Merge pull request #781 from nextcloud/personal_licence_titleBjörn Schießle2016-08-091-2/+4
|\ \ \ \ \ \
| * | | | | | Remove AGPL titleRoeland Jago Douma2016-08-091-2/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #780 from nextcloud/copy_fed_cloud_idRoeland Jago Douma2016-08-093-1/+41
|\ \ \ \ \ \
| * | | | | | Add clipboard action to Personal Settings Fed Cloud IdRoeland Jago Douma2016-08-093-1/+41
| |/ / / / /
* | | | | | Merge pull request #789 from nextcloud/padding_federationMarius Blüm2016-08-091-1/+0
|\ \ \ \ \ \
| * | | | | | Padding of federated serverRoeland Jago Douma2016-08-091-1/+0
* | | | | | | Merge pull request #786 from nextcloud/fix-backgroundjob-logsRoeland Jago Douma2016-08-091-2/+2
|\ \ \ \ \ \ \
| * | | | | | | log class name, ID only is hard to debugJörn Friedrich Dreyer2016-08-091-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #767 from nextcloud/federation-error-messagesMarius Blüm2016-08-094-15/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | improve federation error messagesBjoern Schiessle2016-08-094-15/+20
* | | | | | | Merge pull request #779 from nextcloud/slideup_addtowebsiteBjörn Schießle2016-08-091-1/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Make 'Add to your website' toggleableRoeland Jago Douma2016-08-091-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #750 from nextcloud/workflow-cleanupLukas Reschke2016-08-092-3/+14
|\ \ \ \ \ \
| * | | | | | Allow a description for workflow sectionsJoas Schilling2016-08-051-0/+5
| * | | | | | Add placeholder to the name fieldJoas Schilling2016-08-051-1/+1
| * | | | | | Rename operations and checksJoas Schilling2016-08-051-2/+2
| * | | | | | Highlight the check row on hoverJoas Schilling2016-08-051-0/+4
| * | | | | | Add some space between the rule groupsJoas Schilling2016-08-051-0/+2
* | | | | | | Merge pull request #746 from nextcloud/jail-rootLukas Reschke2016-08-092-2/+14
|\ \ \ \ \ \ \
| * | | | | | | Adding test case for getPathById including a jailed cache where root is just ...Thomas Müller2016-08-052-3/+14
| * | | | | | | getJailedPath expects $path to have a trailing / - fixes #25464Thomas Müller2016-08-051-0/+1
* | | | | | | | Merge pull request #660 from gdamjan/custom-config-dirMorris Jobke2016-08-094-4/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | SetupController should use \OC::$configDir tooDamjan Georgievski2016-08-021-1/+1
| * | | | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)Damjan Georgievski2016-07-293-3/+5
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-08-09174-526/+150
* | | | | | | | Merge pull request #774 from nextcloud/di_core_settingsLukas Reschke2016-08-082-1/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Hanlde Core and Settings app in AppFrameworkRoeland Jago Douma2016-08-082-1/+58
* | | | | | | | | Merge pull request #764 from nextcloud/fix-tags-iconMarius Blüm2016-08-082-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add black version of system tags iconBugsbane2016-08-082-1/+1
* | | | | | | | | Merge pull request #769 from nextcloud/also-cache-fonts-svg-and-gifLukas Reschke2016-08-081-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Also cache WOFF, SVG and GIFLukas Reschke2016-08-081-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #739 from nextcloud/increment-versions-masterMorris Jobke2016-08-0819-24/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |