summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwresetLukas Reschke2014-08-251-0/+10
|\
| * Warn user on resetting passwords via occ when encryption is enabledkondou2014-08-221-0/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-252-1/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2430-2/+90
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-232-14/+17
* | Merge pull request #10584 from owncloud/simple-wizard-trusted-domainsThomas Müller2014-08-222-0/+23
|\ \
| * | Add a trusted domain wizardLukas Reschke2014-08-212-0/+23
* | | Add require_once to update.php due to routingLukas Reschke2014-08-221-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-222-1/+7
|/ /
* | Merge pull request #10522 from owncloud/removeLoadAppScriptblizzz2014-08-212-12/+2
|\ \
| * | Add update route to coreLukas Reschke2014-08-192-2/+2
| * | Remove loadAppScriptFile from the default routesLukas Reschke2014-08-191-10/+0
* | | Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowedVincent Petry2014-08-212-11/+17
|\ \ \
| * | | Fix share dropdown when links are not allowedVincent Petry2014-08-212-11/+17
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2112-8/+34
* | | | Removing `x-webkit-speech` attribute #10561Volker E.2014-08-201-1/+1
* | | | Merge pull request #10557 from owncloud/better-hover-appsMorris Jobke2014-08-201-7/+2
|\ \ \ \ | |/ / / |/| | |
| * | | full opacity for the hovered/focused app as well for better contrastJan-Christoph Borchardt2014-08-201-7/+2
* | | | Add note about the term "Cheers" at end of mailMorris Jobke2014-08-202-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-2016-5/+22
* | | Merge pull request #9866 from owncloud/app-upgradeRobin Appelman2014-08-191-0/+6
|\ \ \
| * | | Send feedback from upgrading apps to the upgrade uiRobin Appelman2014-08-041-0/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-192-1/+11
* | | | Merge pull request #10339 from owncloud/users-defaultquotafixVincent Petry2014-08-182-65/+84
|\ \ \ \
| * | | | Do not close container/slider when clicking on single select fieldVincent Petry2014-08-151-0/+4
| * | | | it does not affect gravity on planet earth, but only for tipsyArthur Schiwon2014-08-131-1/+1
| * | | | make singleselect check for gravity wish, and make it south for default quotaArthur Schiwon2014-08-121-1/+5
| * | | | Replaced spaces with tabs in apps.jsVincent Petry2014-08-121-54/+54
| * | | | Trigger events when app-settings visibility changesVincent Petry2014-08-121-4/+15
* | | | | fix color of links in warnings, fix #10480Jan-Christoph Borchardt2014-08-181-0/+1
* | | | | Added upgrade notice to avoid timeoutsVincent Petry2014-08-181-0/+4
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-184-4/+19
* | | | Merge pull request #10407 from owncloud/rm-obsolete-japaneseLukas Reschke2014-08-171-184/+0
|\ \ \ \
| * | | | remove obsolete japanese lang codeVolkan Gezer2014-08-131-184/+0
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-173-1/+27
* | | | Merge pull request #10447 from owncloud/share-foldericonfixMorris Jobke2014-08-163-2/+71
|\ \ \ \
| * | | | Fixed folder icon update routine when share owner existsVincent Petry2014-08-153-2/+71
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-161-0/+3
* | | | | Merge pull request #10413 from owncloud/adding-handlebarsLukas Reschke2014-08-151-0/+2746
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding handlebars.jsThomas Müller2014-08-141-0/+2746
* | | | | change error text color to white for better contrast, fix #10424Jan-Christoph Borchardt2014-08-151-3/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-151-4/+4
* | | | | Merge pull request #10399 from owncloud/fix_setSendMailStatusBjörn Schießle2014-08-141-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | we need the recipient as a additional parameter to know for which share the n...Bjoern Schiessle2014-08-131-2/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-08-141-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1266-129/+0
* | | Merge pull request #10336 from owncloud/fix_share_drop_downBjörn Schießle2014-08-111-12/+1
|\ \ \ | |_|/ |/| |
| * | remove 'no people found' entryBjoern Schiessle2014-08-111-12/+1
* | | Merge pull request #10096 from owncloud/fix-6971-masterJörn Friedrich Dreyer2014-08-111-1/+2
|\ \ \ | |/ / |/| |
| * | in case $_POST['itemSourceName'] does not exist we simply default it to nullThomas Müller2014-08-011-1/+2