| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-08 | 18 | -42/+740 |
| | | |||||
| * | Merge pull request #5998 from nextcloud/drone_mysqlmb4_71 | Morris Jobke | 2017-08-07 | 1 | -0/+11 |
| |\ | | | | | Add mysqlmb4 php7.1 drone job | ||||
| | * | Add mysqlmb4 php7.1 drone job | Roeland Jago Douma | 2017-08-06 | 1 | -0/+11 |
| |/ | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Merge pull request #5997 from nextcloud/drone_mysqlmb4_70 | Morris Jobke | 2017-08-06 | 1 | -0/+11 |
| |\ | | | | | Add myslqmb4 php 7.0 drone | ||||
| | * | Add myslqmb4 php 7.0 drone | Roeland Jago Douma | 2017-08-06 | 1 | -0/+11 |
| |/ | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Merge pull request #5995 from nextcloud/drone_mysql_71 | Morris Jobke | 2017-08-06 | 1 | -0/+11 |
| |\ | | | | | Add PHP 7.1 mysql job to drone | ||||
| | * | Add PHP 7.1 mysql job to drone | Roeland Jago Douma | 2017-08-06 | 1 | -0/+11 |
| |/ | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Merge pull request #5990 from nextcloud/drone_mysql_70 | Roeland Jago Douma | 2017-08-06 | 1 | -0/+11 |
| |\ | | | | | Also run mysql test on php7.0 | ||||
| | * | Also run mysql test on php7.0 | Roeland Jago Douma | 2017-08-05 | 1 | -0/+11 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-06 | 8 | -4/+16 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-05 | 158 | -270/+350 |
| | | |||||
| * | Merge pull request #5550 from andreasjacobsen93/clean-settings-layout | Morris Jobke | 2017-08-04 | 3 | -240/+265 |
| |\ | | | | | Cleaned up personal settings page | ||||
| | * | Merge branch 'master' into clean-settings-layout | Morris Jobke | 2017-08-04 | 68 | -198/+261 |
| | |\ | |||||
| | * \ | Merge branch 'clean-settings-layout' of ↵ | Marin Treselj | 2017-08-04 | 1011 | -7186/+12366 |
| | |\ \ | | | | | | | | | | | | | github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout | ||||
| | | * \ | Merge branch 'master' into clean-settings-layout | Morris Jobke | 2017-08-03 | 1011 | -7186/+12366 |
| | | |\ \ | |||||
| | * | | | | Fix federation icon menu and container paddings. | Marin Treselj | 2017-08-04 | 2 | -48/+11 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Reintroduce a more compact grid. | Marin Treselj | 2017-08-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Overrides core `.section` values. Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Clean up HTML structure, fix labels. | Marin Treselj | 2017-08-03 | 2 | -60/+26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Merge branch 'clean-settings-layout' of ↵ | Andreas Jacobsen | 2017-07-24 | 672 | -8160/+15570 |
| | |\ \ \ | | | | | | | | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout | ||||
| | | * \ \ | Merge branch 'master' into clean-settings-layout | Andreas Jacobsen | 2017-07-15 | 672 | -8160/+15570 |
| | | |\ \ \ | |||||
| | * | | | | | Fixed bug with sharing-settings | Andreas Jacobsen | 2017-07-24 | 2 | -1/+6 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| | * | | | | Personal settings file changed | Andreas Jacobsen | 2017-07-15 | 2 | -422/+347 |
| | | | | | | |||||
| | * | | | | Updated layout | Andreas Jacobsen | 2017-07-14 | 2 | -17/+26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| | * | | | | Moved settings to left | Andreas Jacobsen | 2017-07-14 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| | * | | | | Update for settings | Andreas Jacobsen | 2017-06-29 | 2 | -16/+34 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| | * | | | | Added space between avatar and settings | Andreas Jacobsen | 2017-06-28 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| | * | | | | Fixed typos | Andreas Jacobsen | 2017-06-28 | 2 | -6/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'clean-settings-layout' of ↵ | Andreas Jacobsen | 2017-06-28 | 0 | -0/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout | ||||
| | | * | | | | Cleaned up personal settings page | Andreas Jacobsen | 2017-06-27 | 2 | -73/+106 |
| | | | | | | | |||||
| | * | | | | | Cleaned up personal settings page | Andreas Jacobsen | 2017-06-28 | 2 | -73/+106 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com> | ||||
| * | | | | | Merge pull request #5969 from ↵ | Morris Jobke | 2017-08-04 | 1 | -20/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app Fix vertical alignment of loading icon and status message in Theming app | ||||
| | * | | | | | Fix code style | Daniel Calviño Sánchez | 2017-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | | | Remove superfluous selector part | Daniel Calviño Sánchez | 2017-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | | | Align vertically loading icon and status message | Daniel Calviño Sánchez | 2017-08-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As both elements are inline/inline-block and belong to the same line they can be aligned vertically using "vertical-align: middle". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | | | Do not use the same rules for loading icon than for upload icon | Daniel Calviño Sánchez | 2017-08-03 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loading icon is used in a totally different way than the upload icon and thus it should not share its CSS rules. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | | | | | Remove ignored rules | Daniel Calviño Sánchez | 2017-08-03 | 1 | -11/+0 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removed rules were either always overriden by other rules or never used due to not matching any element. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| * | | | | | Merge pull request #5954 from nextcloud/textpreview_range | Lukas Reschke | 2017-08-04 | 1 | -1/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | Do not fetch the whole text file for the sidebar preview | ||||
| | * | | | | | Do not fetch the whole text file for the sidebar preview | Roeland Jago Douma | 2017-08-03 | 1 | -1/+6 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just fetch the first 10kb. This should be more than enough in 99% of the cases. And avoid downloading a 10mb text file just to display a tiny portion. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | Merge pull request #5963 from nextcloud/pre_post_share_events | Lukas Reschke | 2017-08-04 | 4 | -124/+302 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Move pre_shared and post_shared events to EventDispatcher | ||||
| | * | | | | Move pre_shared and post_shared events to EventDispatcher | Roeland Jago Douma | 2017-08-03 | 4 | -124/+302 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Now listeners for those events get proper share objects. * Legacy hooks still fired * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon | Morris Jobke | 2017-08-04 | 6 | -22/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" | ||||
| | * | | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" | Joas Schilling | 2017-08-03 | 6 | -22/+15 |
| | | |/ / / | |/| | | | |||||
| * / | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-04 | 62 | -176/+246 |
| |/ / / / | |||||
| * | | | | Merge pull request #5738 from nextcloud/comradekingu-patch-3 | Morris Jobke | 2017-08-03 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / |/| | | | Spelling: UID | ||||
| | * | | | Improve spelling in LDAP | Allan Nordhøy | 2017-08-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | Merge pull request #5959 from nextcloud/drop-logo-claim | Morris Jobke | 2017-08-03 | 6 | -11/+6 |
| |\ \ \ \ | | | | | | | | | | | Logo claim is not used anymore | ||||
| | * | | | | Logo claim is not used anymore | Morris Jobke | 2017-08-02 | 6 | -11/+6 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-03 | 40 | -6/+158 |
| | | | | | | |||||
| * | | | | | Merge pull request #5953 from nextcloud/theming-lightness-correction | Lukas Reschke | 2017-08-02 | 1 | -4/+7 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Use same lightness calculation as the SCSS compiler for theming | ||||
| | * | | | | Use same lightness calculation as the SCSS compiler for theming | Julius Härtl | 2017-08-01 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |