summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sync-masterMorris Jobke2016-07-07144-563/+707
|\
| * Merge pull request #323 from Faldon/database_portMorris Jobke2016-07-071-0/+3
| |\
| | * Changed the input option for database-port to required when parameter was pro...Thomas Pulzer2016-07-061-1/+1
| | * Added occ install option for database-port.Thomas Pulzer2016-07-061-0/+3
| * | [tx-robot] updated from transifexNextcloud bot2016-07-0672-266/+254
| |/
| * Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-042-2/+2
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0110-8/+512
| |\
| * \ Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2812-175/+27
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2712-175/+27
| | |\ \
| * | | | Migrate logic to dynamic controllerLukas Reschke2016-06-272-1/+2
| |/ / /
| * | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2611-4/+200
| |\ \ \
| * | | | to NextcloudJoachim Sokolowski2016-06-226-22/+22
| * | | | Fix translation stringsMorris Jobke2016-06-2288-88/+88
| * | | | Merge pull request #196 from JSoko/patch-2Morris Jobke2016-06-221-1/+1
| |\ \ \ \
| | * | | | singleuser.user.php -> nextcloudJoachim Sokolowski2016-06-221-1/+1
| * | | | | changed to nextcloudJoachim Sokolowski2016-06-221-1/+1
| * | | | | nextcloud serverJoachim Sokolowski2016-06-221-1/+1
| |/ / / /
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2114-16/+133
| |\ \ \ \
| * | | | | make loading spinner thicker and color lighterJan-Christoph Borchardt2016-06-201-4/+4
| * | | | | Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-151-0/+4
| |\ \ \ \ \
| | * | | | | store icons in classVincent Chan2016-06-151-0/+4
| * | | | | | fix setup page strengthifyMorris Jobke2016-06-154-10/+4
| * | | | | | Update strengthify to 0.5.1Morris Jobke2016-06-153-116/+205
| * | | | | | Change name of the product in update messageMorris Jobke2016-06-147-14/+14
| * | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-144-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-131-2/+2
| |\ \ \ \ \ \
| | * | | | | | smaller files drop fixesArthur Schiwon2016-06-111-2/+2
| * | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1120-5/+137
| |\ \ \ \ \ \ \
| * | | | | | | | Upload progress nextcloud blueWilliam Bargent2016-06-111-1/+1
| * | | | | | | | Sets notification background to whiteWilliam Bargent2016-06-111-1/+2
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-104-4/+59
| |\ \ \ \ \ \ \
| | * | | | | | | Fix indentationLukas Reschke2016-06-091-16/+16
| | * | | | | | | Add fancy layoutLukas Reschke2016-06-092-2/+2
| | * | | | | | | add hide file list optionBjoern Schiessle2016-06-092-5/+60
| * | | | | | | | invert colors of favicons to match header and log in site, white on blueJan-Christoph Borchardt2016-06-106-3/+3
| * | | | | | | | Single block for PHP Mod not installedWilliam Bargent2016-06-101-3/+2
| * | | | | | | | Downstream 2016-06-09Arthur Schiwon2016-06-0913-19/+65
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Downstream 2016-06-08"blizzz2016-06-098-60/+15
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Allow to cancel 2FA after loginJoas Schilling2016-06-095-1/+21
| * | | | | | | | Fixed reviewsSergio Bertolín2016-06-091-2/+2
| * | | | | | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-091-1/+2
| * | | | | | | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-092-12/+27
| * | | | | | | | Comments fixeddavitol2016-06-091-3/+2
| * | | | | | | | Fix Decrypt message via occdavitol2016-06-091-1/+11
| * | | | | | | | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-0839-47/+50
* | | | | | | | | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-0718-240/+20
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-078-2/+10
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-062-12/+12
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-052-2/+116
* | | | | | | | | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04116-163/+34
|\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 00:35:22 +0000