Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into clean-settings-layout | Morris Jobke | 2017-08-04 | 68 | -198/+261 |
|\ | |||||
| * | 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 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 |
| |\| | |||||
| | * | 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> | ||||
| | * | | | Merge pull request #5816 from nextcloud/fix-oracle | Morris Jobke | 2017-08-02 | 20 | -98/+215 |
| | |\ \ \ | | | | | | | | | | | | | Fix oracle | ||||
| | | * | | | Add a method to compare empty strings with an expression | Joas Schilling | 2017-08-02 | 4 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix repair step for oracle... | Joas Schilling | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix last failures with oracle | Joas Schilling | 2017-08-02 | 3 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix querybuilder and functionbuilder tests | Joas Schilling | 2017-08-02 | 2 | -25/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix ILIKE regex for oracle | Joas Schilling | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix auth provider | Joas Schilling | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Use selectAlias() | Joas Schilling | 2017-08-02 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Can not insert auto increment on oracle | Joas Schilling | 2017-08-02 | 5 | -46/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix missing escape on column and table name | Joas Schilling | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Fix clob comparison | Joas Schilling | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Allow to specify the table space on occ | Joas Schilling | 2017-08-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Quote aliases as well | Joas Schilling | 2017-08-02 | 2 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | Oracle does not support PDO::FETCH_KEY_PAIR | Joas Schilling | 2017-08-02 | 2 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | Merge pull request #5682 from nextcloud/inline-svg-icon | Morris Jobke | 2017-08-02 | 6 | -15/+22 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | Proof of concept #5593 - inline SVG icon for icon-contacts | ||||
| | | * | | | Replace `include` with `file_get_contents` | Marin Treselj | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | | * | | | Proof of concept #5593 - inline SVG icon for icon-contacts | Marin Treselj | 2017-08-02 | 6 | -15/+22 |
| | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Merge pull request #5920 from nextcloud/gallery-share-view-fix | Morris Jobke | 2017-08-02 | 4 | -10/+10 |
| | |\ \ \ | | | | | | | | | | | | | Top bar buttons in share view are wrong positioned | ||||
| | | * | | | Make sure this still works in other apps. | Marin Treselj | 2017-08-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | | * | | | Change id to class in the main share template | Marin Treselj | 2017-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | | * | | | Fixes nextcloud/gallery#269 | Marin Treselj | 2017-07-28 | 3 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | | Merge pull request #4790 from nextcloud/fix-comparisons-in-apps | Morris Jobke | 2017-08-02 | 31 | -143/+139 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fix comparisons in apps | ||||
| | | * | | | | Remove undocumented config | Joas Schilling | 2017-08-01 | 1 | -77/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix versions app | Joas Schilling | 2017-08-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix file size comparison | Joas Schilling | 2017-08-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisions in the trashbin app | Joas Schilling | 2017-08-01 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in the sharing app | Joas Schilling | 2017-08-01 | 5 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in the files external app | Joas Schilling | 2017-08-01 | 9 | -26/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in the files app | Joas Schilling | 2017-08-01 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparison in the ldap app | Joas Schilling | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in the versions app | Joas Schilling | 2017-08-01 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in the dav app | Joas Schilling | 2017-08-01 | 7 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | | * | | | | Fix comparisons in encryption app | Joas Schilling | 2017-08-01 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Merge pull request #5956 from nextcloud/proper-update-notification-layout | Morris Jobke | 2017-08-02 | 4 | -20/+52 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Improve update notification layout and show non-default update server | ||||
| | | * | | | | | Improve update notification layout and show non-default update server | Morris Jobke | 2017-08-02 | 4 | -20/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | | | | Merge pull request #5923 from nextcloud/expire-federation-jobs | Roeland Jago Douma | 2017-08-02 | 15 | -219/+400 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Expire federation jobs | ||||
| | | * | | | | | | Close all the cursors | Joas Schilling | 2017-08-02 | 1 | -12/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> |