summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-0310-14/+30
* Merge pull request #3359 from nextcloud/fix-sharing-app-descriptionMorris Jobke2017-02-021-2/+2
|\
| * Fix Sharing app descriptionJoas Schilling2017-02-021-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-02-0242-60/+274
* [tx-robot] updated from transifexNextcloud bot2017-02-0136-88/+1104
* Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-ti...Morris Jobke2017-01-313-6/+5
|\
| * Fix config.sample.phpMorris Jobke2017-01-301-3/+2
| * Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3022-80/+637
|\ \
| * | minor version bumpChristoph Wurst2017-01-172-2/+2
| * | always allow remembered loginChristoph Wurst2017-01-119-32/+0
| * | fix constructor params in failing testChristoph Wurst2017-01-111-6/+9
| * | do not hard-require the token providerChristoph Wurst2017-01-113-9/+25
| * | use login hook credentials as fallbackChristoph Wurst2017-01-113-19/+77
| * | migrate 'password::sessioncredentials' extern storage auth to credential storeChristoph Wurst2017-01-111-32/+24
| * | fix @since annotations (9.1->12)Christoph Wurst2017-01-114-8/+8
| * | replace session implementation if it changes at runtimeChristoph Wurst2017-01-112-1/+11
| * | add @since annotations and document methodsChristoph Wurst2017-01-112-0/+14
| * | add login credential storeChristoph Wurst2017-01-1111-0/+496
* | | Merge pull request #3169 from nextcloud/update-doctrineMorris Jobke2017-01-301-0/+0
|\ \ \
| * | | Update doctrineJoas Schilling2017-01-301-0/+0
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-3116-82/+244
* | | | Merge pull request #3282 from nextcloud/header-menu-arrow-upMorris Jobke2017-01-301-23/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Merge similar properties and apply arrow to menu classJohn Molakvoæ (skjnldsv)2017-01-261-23/+15
* | | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-3019-49/+749
|\ \ \ \
| * | | | update autoloaderRobin Appelman2017-01-274-0/+18
| * | | | Add sinceRobin Appelman2017-01-273-0/+28
| * | | | add unit tests for smb notify backendRobin Appelman2017-01-272-0/+48
| * | | | add notify self testRobin Appelman2017-01-271-1/+36
| * | | | switch occ files_external:notify to new notify mechanismRobin Appelman2017-01-271-10/+12
| * | | | Add a more powerful notify mechanismRobin Appelman2017-01-278-39/+423
| * | | | Add missing smb filesRobin Appelman2017-01-275-0/+185
* | | | | Merge pull request #3298 from nextcloud/downstream-26928blizzz2017-01-301-12/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | remove obsolete hack (#26928)Jörn Friedrich Dreyer2017-01-271-12/+1
* | | | | Merge pull request #3176 from nextcloud/default-value-datadirblizzz2017-01-306-6/+6
|\ \ \ \ \
| * | | | | Add proper default value for datadirMorris Jobke2017-01-196-6/+6
* | | | | | Merge pull request #3260 from nextcloud/various-scss-fixesChristoph Wurst2017-01-301-20/+22
|\ \ \ \ \ \
| * | | | | | Blue shadow fix 2John Molakvoæ (skjnldsv)2017-01-261-9/+12
| * | | | | | Blue left shadow fix #3288John Molakvoæ (skjnldsv)2017-01-261-5/+4
| * | | | | | No more height css calc for app-navigation childrenJohn Molakvoæ (skjnldsv)2017-01-251-0/+2
| * | | | | | Fix popover conflicts with app-navigation li (color & opacity)John Molakvoæ (skjnldsv)2017-01-251-6/+8
| * | | | | | Border radius fix on popoverJohn Molakvoæ (skjnldsv)2017-01-251-4/+0
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-3014-62/+202
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2910-16/+452
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2884-286/+550
* | | | | | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-276-20/+188
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Force to specify the nameJoas Schilling2017-01-273-8/+14
| * | | | | | remove unused parameters and add viewBoxMorris Jobke2017-01-021-1/+1
| * | | | | | Add navigation via info.xml (#26785)Thomas Müller2016-12-226-20/+182
* | | | | | | Merge pull request #3178 from nextcloud/default-value-logdateformatJoas Schilling2017-01-273-4/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |