summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | add comment about ISO 8601 and PHP 🙈Morris Jobke2017-01-231-1/+3
| * | | | | | fix default value for logdateformat - fixes #3107Morris Jobke2017-01-193-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitiveLukas Reschke2017-01-271-1/+1
|\ \ \ \ \ \
| * | | | | | Make sure different webroots use different cached pathsJoas Schilling2017-01-121-1/+1
* | | | | | | Merge pull request #3284 from nextcloud/remove-avatar-fixupMorris Jobke2017-01-265-309/+0
|\ \ \ \ \ \ \
| * | | | | | | remote now unneeded AvatarPermissions repair stepRobin Appelman2017-01-265-309/+0
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2728-8/+370
* | | | | | | | Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bugMorris Jobke2017-01-262-6/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | fix shared-as-busy events for ownerGeorg Ehrke2017-01-262-6/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #3249 from nextcloud/add-clear-search-buttonMorris Jobke2017-01-265-20/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Js magic to reset searchJohn Molakvoæ (skjnldsv)2017-01-261-0/+4
| * | | | | | | | properly compress close-white.svgJan-Christoph Borchardt2017-01-251-12/+3
| * | | | | | | | Scour optJohn Molakvoæ (skjnldsv)2017-01-251-41/+12
| * | | | | | | | Add clear search buttonJohn Molakvoæ (skjnldsv)2017-01-254-20/+88
* | | | | | | | | Merge pull request #3246 from nextcloud/fix-sqlite-dependencyMorris Jobke2017-01-262-19/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove useless dependency on SQLite (non-PDO)Morris Jobke2017-01-252-19/+5
* | | | | | | | | | Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-no...Lukas Reschke2017-01-261-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use correct theming when returning the defaultsJoas Schilling2017-01-191-0/+21
* | | | | | | | | | | Merge pull request #3238 from nextcloud/dav-testLukas Reschke2017-01-262-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make DAV external storage test more reliableRobin Appelman2017-01-242-5/+9
* | | | | | | | | | | | Merge pull request #3272 from nextcloud/fix_user_controllerLukas Reschke2017-01-262-36/+83
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | make sure that 'getCurrentUser' gets an array in order to manipulate the data...Bjoern Schiessle2017-01-262-36/+83
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3160 from nextcloud/streams52Roeland Jago Douma2017-01-2611-57/+135
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update icewind/streams to 0.5.2Robin Appelman2017-01-2611-57/+135
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #3265 from nextcloud/brute-force-protection-public-link-authLukas Reschke2017-01-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | add brute force protection for public link authenticationBjoern Schiessle2017-01-251-0/+1
* | | | | | | | | | | Merge pull request #3264 from nextcloud/ldap-deny-long-dnsMorris Jobke2017-01-263-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Gracefully deny users or groups with too long DNsArthur Schiwon2017-01-253-1/+16
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |