summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add intergration testRoeland Jago Douma2016-08-021-0/+16
* Do not allow to delete/update group shares as a group memberJoas Schilling2016-08-021-4/+4
* [tx-robot] updated from transifexNextcloud bot2016-08-024-0/+20
* Merge pull request #695 from nextcloud/shake-wrong-passwordMorris Jobke2016-08-022-2/+16
|\
| * Shake the login fields if password is wrongMorris Jobke2016-08-012-2/+16
|/
* Merge pull request #682 from nextcloud/fix-theming-logoMorris Jobke2016-08-012-14/+14
|\
| * fix missing semicolon to fix themed logo on log in pageJan-Christoph Borchardt2016-08-012-14/+14
* | Merge pull request #653 from nextcloud/animate-sidebarMorris Jobke2016-08-013-5/+16
|\ \
| * | Fix javascript tests for sidebar animationJulius Haertl2016-07-302-0/+8
| * | Add animation to app-contentJulius Haertl2016-07-301-2/+2
| * | slight animation for the sidebar for better feedback what happensJan-Christoph Borchardt2016-07-291-3/+6
* | | Merge pull request #684 from nextcloud/fix_csrf_ocsLukas Reschke2016-08-012-2/+3
|\ \ \
| * | | We should properly check for 'true' instaed of the boolRoeland Jago Douma2016-08-012-2/+3
* | | | Merge pull request #685 from nextcloud/validate-theming-inputBjörn Schießle2016-08-013-30/+94
|\ \ \ \
| * | | | Validate the input of the theming optionsJoas Schilling2016-08-013-30/+94
| |/ / /
* | | | Merge pull request #672 from sndrr/occ-rebrand-to-nextcloudMorris Jobke2016-08-012-4/+4
|\ \ \ \
| * | | | Revert (c) back to ownCloud, Inc.Sander Ruitenbeek2016-07-301-1/+1
| * | | | Update Upgrade.phpsanderr2016-07-301-1/+1
| * | | | Rebranded to Nextcloud for the occ command line toolSander Ruitenbeek2016-07-302-5/+5
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-0112-8/+54
* | | | Merge pull request #674 from nextcloud/action-menu-positionLukas Reschke2016-08-011-7/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | remove extra file size padding to fix action menu positionJan-Christoph Borchardt2016-07-301-7/+0
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2016-08-0132-6/+226
* | | Merge pull request #595 from nextcloud/fix_slow_testblizzz2016-07-311-0/+7
|\ \ \
| * | | Close session fast when doing a test to prevent blocking the nextJuan Pablo Villafáñez2016-07-271-0/+7
* | | | Merge pull request #675 from nextcloud/enoch85-patch-1Roeland Jago Douma2016-07-311-1/+1
|\ \ \ \
| * | | | typoDaniel Hansson2016-07-301-1/+1
| | |/ / | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2016-07-3120-2/+162
|/ / /
* | | Merge pull request #664 from nextcloud/white-app-menu-fixMarius Blüm2016-07-301-2/+2
|\ \ \
| * | | Fix wrong preserveAspectRatio at app menu iconsJulius Haertl2016-07-291-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2016-07-30104-130/+794
* | | | Merge pull request #662 from thelinuxfr/patch-1Julius Härtl2016-07-291-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Transifex Owncloud > NextcloudFrédéric LIETART2016-07-291-1/+1
|/ / /
* | | Merge pull request #627 from nextcloud/white-app-menuBjörn Schießle2016-07-292-22/+37
|\ \ \
| * | | fix shading of apps icon in app menuJan-Christoph Borchardt2016-07-291-3/+12
| * | | Move to svg filter on app menu to support IE9+Julius Haertl2016-07-282-11/+12
| * | | adjust opacity of icons in apps and user menuJan-Christoph Borchardt2016-07-281-8/+8
| * | | Change app menu to whiteJulius Haertl2016-07-281-9/+14
* | | | Merge pull request #656 from nextcloud/ocs_controller_csrfRoeland Jago Douma2016-07-292-2/+65
|\ \ \ \
| * | | | Dark hackery to not always disable CSRF for OCS controllersRoeland Jago Douma2016-07-292-2/+65
* | | | | Merge pull request #625 from nextcloud/video-container-sizeJan-Christoph Borchardt2016-07-291-2/+7
|\ \ \ \ \
| * | | | | up the minimum size of the public share video a bit, use 16/9 ratio, fix #603Jan-Christoph Borchardt2016-07-291-2/+7
* | | | | | Merge pull request #651 from stweil/masterMorris Jobke2016-07-2933-34/+34
|\ \ \ \ \ \
| * | | | | | Fix misspelling of database "READ COMMITTED"Stefan Weil2016-07-2933-34/+34
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #648 from nextcloud/add-quotaplugin-v2-masterBjörn Schießle2016-07-293-2/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding quota plugin to new dav endpoint (#25615)Thomas Müller2016-07-293-2/+44
| | |/ / / | |/| | |
* | | | | Merge pull request #630 from nextcloud/enoch85-patch-1Roeland Jago Douma2016-07-295-23/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add some integration test fixesMorris Jobke2016-07-294-22/+21
| * | | | ownCloud --> Nextcloudenoch852016-07-282-12/+12
| * | | | ownCloud -> NextcloudDaniel Hansson2016-07-281-1/+1