summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* improve update error page: adjust line height of h2Jan-Christoph Borchardt2014-12-101-0/+1
* improve update error page: remove box, make link visible, insert missing spac...Jan-Christoph Borchardt2014-12-102-3/+7
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1084-0/+84
* Merge pull request #12664 from owncloud/fix-12164Thomas Müller2014-12-102-2/+6
|\
| * Inject configVictor Dubiniuk2014-12-102-2/+3
| * Use httphelper and cache response even when it emptyVictor Dubiniuk2014-12-062-2/+5
* | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-5/+20
|\ \
| * | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-5/+20
* | | Merge pull request #12651 from owncloud/add-requesttoken-to-base-templateThomas Müller2014-12-091-1/+1
|\ \ \ | |/ / |/| |
| * | Add requesttoken to base templateLukas Reschke2014-12-051-1/+1
| |/
* / Check for working .htaccess via AJAXLukas Reschke2014-12-061-1/+6
|/
* Merge pull request #12561 from oparoz/vectoriconMorris Jobke2014-12-054-42/+24
|\
| * PNG and SVG have been compressedOlivier Paroz2014-12-052-167/+37
| * Improve the bitmap and vector mime iconsOlivier Paroz2014-12-024-55/+167
* | Forward port of #12493Arthur Schiwon2014-12-041-1/+1
* | Merge pull request #12522 from owncloud/bower-jstzMorris Jobke2014-12-0416-360/+669
|\ \
| * | move jstz to bower managementMorris Jobke2014-12-016-359/+408
| * | include lock files of bower to be able to use "bower install"Morris Jobke2014-12-0111-1/+261
| |/
* | Merge pull request #12563 from owncloud/usermenu-remove-borderVolkan Gezer2014-12-031-2/+2
|\ \ | |/ |/|
| * remove border from user menu, adjust to apps menuJan-Christoph Borchardt2014-11-281-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-292-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-282-14/+14
|/
* Merge pull request #12414 from owncloud/delay-autoconfig-kill-2Morris Jobke2014-11-261-7/+14
|\
| * autoconfig.php only to be deleted on successful installationThomas Müller2014-11-251-7/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-262-2/+2
|/
* Merge pull request #12359 from owncloud/fix-redirect-url-for-password-changeThomas Müller2014-11-241-1/+5
|\
| * Use `/` as redirect location if webroot is set to an empty valueLukas Reschke2014-11-211-1/+5
* | Merge pull request #12362 from owncloud/add-ocs-header-per-defaultVincent Petry2014-11-241-1/+2
|\ \
| * | Add OCS API header per defaultLukas Reschke2014-11-211-1/+2
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-242-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-224-8/+204
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-2110-2/+296
* Merge pull request #12330 from owncloud/jenkins-eat-thatMorris Jobke2014-11-204-27/+30
|\
| * drop dependency of some commands on old config objectMorris Jobke2014-11-204-27/+30
* | cleanup languages. closes #11274Volkan Gezer2014-11-2011-335/+0
|/
* Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjsVincent Petry2014-11-203-2/+106
|\
| * Fix l10n promisesVincent Petry2014-11-192-6/+11
| * Better use of promise in OC.L10N.load()Vincent Petry2014-11-191-13/+8
| * Remove stray generateUrlVincent Petry2014-11-191-5/+0
| * Added function to load translations from JSVincent Petry2014-11-183-2/+111
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-20146-724/+328
* | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-198-149/+163
|\ \
| * | center spinnerMorris Jobke2014-11-182-1/+7
| * | Show spinnerLukas Reschke2014-11-172-0/+2
| * | fix unreadable label in warning boxMorris Jobke2014-11-171-0/+6
| * | Hide submit button after password changeLukas Reschke2014-11-171-0/+3
| * | add password as parameter to the signal so that the encryption can create a n...Bjoern Schiessle2014-11-171-1/+1
| * | Add "postPasswordReset" hookLukas Reschke2014-11-171-4/+8
| * | Use correct route insteadLukas Reschke2014-11-171-1/+1
| * | Remove uneeded importLukas Reschke2014-11-171-1/+0