aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make updatenotification settings appear as if it is part of the version part ...Arthur Schiwon2016-08-134-4/+11
* change casing in section display namesArthur Schiwon2016-08-133-5/+5
* mark current sectionArthur Schiwon2016-08-122-7/+13
* fix theming testsArthur Schiwon2016-08-122-5/+3
* added some missed diagnosis outputArthur Schiwon2016-08-123-10/+66
* rename remaining occurences of OCA/Theming/TemplateArthur Schiwon2016-08-123-6/+6
* rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy"Bjoern Schiessle2016-08-124-20/+16
* register app autoload instead of loading appsArthur Schiwon2016-08-123-12/+8
* Resolve conflictLukas Reschke2016-08-111-6/+6
* Merge branch 'master' into implement_712Lukas Reschke2016-08-11159-332/+896
|\
| * [tx-robot] updated from transifexNextcloud bot2016-08-1110-16/+36
| * [tx-robot] updated from transifexNextcloud bot2016-08-1178-10/+202
| * Merge pull request #807 from nextcloud/ocs_dataresponseRoeland Jago Douma2016-08-106-122/+67
| |\
| | * Fix Core's OCSController responseRoeland Jago Douma2016-08-101-2/+2
| | * Move the Share20OCS code over to use the proper DataResponseRoeland Jago Douma2016-08-103-57/+56
| | * OCSController requires DataResponseRoeland Jago Douma2016-08-102-63/+9
| * | Merge pull request #810 from nextcloud/shared-cachethepropagatorinstanceLukas Reschke2016-08-102-5/+12
| |\ \
| | * | Store the shared propagator instanceVincent Petry2016-08-102-5/+12
| * | | Merge pull request #808 from nextcloud/skip_expiry_for_users_that_never_logge...Lukas Reschke2016-08-102-2/+2
| |\ \ \
| | * | | Skip version and trash expiry for users that never logged inJörn Friedrich Dreyer2016-08-102-2/+2
| | |/ /
| * | | Merge pull request #819 from nextcloud/theming-support-for-appsLukas Reschke2016-08-104-0/+126
| |\ \ \
| | * | | Theming: Add OCA.Theming Js for app interactionJulius Haertl2016-08-104-0/+107
| | * | | Add css classes to allow app developers using the theming colorsJulius Haertl2016-08-092-0/+19
| * | | | Merge pull request #824 from nextcloud/add-warning-for-php7.1Lukas Reschke2016-08-101-0/+8
| |\ \ \ \
| | * | | | Nextcloud is not compatible with PHP 7.1Lukas Reschke2016-08-101-0/+8
| * | | | | Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-idBjörn Schießle2016-08-104-5/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | get shared storage storage id without setting up the storageRobin Appelman2016-08-094-5/+29
| * | | | | Merge pull request #814 from nextcloud/fix-undefined-offset-in-login-controllerBjörn Schießle2016-08-101-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add missing array element - fixes #25714Thomas Müller2016-08-101-1/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #806 from nextcloud/token_polishRoeland Jago Douma2016-08-103-3/+63
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | add more margin to right of the iconMorris Jobke2016-08-101-0/+1
| | * | | Add sliding animationRoeland Jago Douma2016-08-101-2/+7
| | * | | Add clipboardjs for tokenRoeland Jago Douma2016-08-103-0/+42
| | * | | Always show delete icon for new tokensRoeland Jago Douma2016-08-101-0/+9
| | * | | Add note password is only shown onceRoeland Jago Douma2016-08-101-1/+4
| |/ / /
| * | | [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
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |