ac4927809c
Merge branch 'master' into clean-settings-layout
2017-08-03 15:07:42 +02:00
bb865a55fe
Merge pull request #5738 from nextcloud/comradekingu-patch-3
...
Spelling: UID
2017-08-03 14:28:41 +02:00
7de9eb16d8
Reintroduce a more compact grid.
...
Overrides core `.section` values.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 13:12:00 +02:00
7284458e24
Clean up HTML structure, fix labels.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +02:00
8fecc336ac
Merge pull request #5959 from nextcloud/drop-logo-claim
...
Logo claim is not used anymore
2017-08-03 08:20:56 +02:00
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
ea2e629c6c
Merge pull request #5953 from nextcloud/theming-lightness-correction
...
Use same lightness calculation as the SCSS compiler for theming
2017-08-02 23:17:19 +02:00
585e5c6ea5
Logo claim is not used anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
c40352c030
Merge pull request #5816 from nextcloud/fix-oracle
...
Fix oracle
2017-08-02 20:54:58 +02:00
a0939f78b3
Merge pull request #5682 from nextcloud/inline-svg-icon
...
Proof of concept #5593 - inline SVG icon for icon-contacts
2017-08-02 20:49:45 +02:00
c658862052
Replace `include` with `file_get_contents`
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
ffcdc96a0b
Proof of concept #5593 - inline SVG icon for icon-contacts
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
2fcf4f2f29
Improve spelling in LDAP
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 18:12:31 +02:00
6ca4b9eee9
Merge pull request #5920 from nextcloud/gallery-share-view-fix
...
Top bar buttons in share view are wrong positioned
2017-08-02 16:59:24 +02:00
6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
1a711b1e73
Merge pull request #5956 from nextcloud/proper-update-notification-layout
...
Improve update notification layout and show non-default update server
2017-08-02 16:26:57 +02:00
fbfd371493
Merge pull request #5923 from nextcloud/expire-federation-jobs
...
Expire federation jobs
2017-08-02 16:15:28 +02:00
d7d2d7c803
Merge pull request #5952 from nextcloud/appmanager-isshipped
...
Use public methods for OC_App::isShipped
2017-08-02 16:15:02 +02:00
717a44f161
Make sure this still works in other apps.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 15:57:53 +02:00
4ca4b270e7
Close all the cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:35:14 +02:00
81c54ea515
Use automatic injection whenever possible
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:34:51 +02:00
9391d8fc60
Improve update notification layout and show non-default update server
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 13:56:36 +02:00
a96c651935
Merge pull request #5949 from nextcloud/fix-broken-code
...
Use IUser
2017-08-02 13:54:45 +02:00
30a7030820
Merge pull request #5957 from nextcloud/updatenotification-show-status
...
Show correct status in update notification
2017-08-02 13:53:50 +02:00
bc9eb59384
Use IUser
...
This is broken and will never work as the phan CI step pointed out.
Pro-tip of the day: Check why CI fails before merging 🙈
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-02 13:25:22 +02:00
7f2e9d10a3
Show correct status in update notification
...
Sometimes it could be the case that after a channel change the last updated
timestamp is reset, but the check for updates is not yet completed. In this
case the update notification showed "You are up to date" and the date was
"1970-01-01 00:00:00". With this fix the state is properly shown.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 10:45:26 +02:00
78412fda9c
Add a method to compare empty strings with an expression
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:50:41 +02:00
100fe07f5d
Fix repair step for oracle...
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
2f8756754f
Fix last failures with oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
293dea0625
Fix querybuilder and functionbuilder tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
bb58667511
Fix ILIKE regex for oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
fc22a2cb07
Fix auth provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
a5b0308713
Use selectAlias()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
20f8d1094a
Can not insert auto increment on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
106df7bc33
Fix missing escape on column and table name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
a76d4ef04e
Fix clob comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
3b648645f4
Allow to specify the table space on occ
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
8ec6c1f259
Quote aliases as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
b29baababd
Oracle does not support PDO::FETCH_KEY_PAIR
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:12 +02:00
45d080d70e
Merge pull request #5951 from nextcloud/use-public-method
...
Use public API instead of private
2017-08-02 09:27:34 +02:00
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
3f0f18b4c4
Merge pull request #5948 from nextcloud/remove-explicit-declaration
...
Remove explicit type hints for Controller
2017-08-01 20:12:02 +02:00
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-01 18:09:07 +01:00
cd02b2205e
Use public methods for OC_App::isShipped
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 18:57:00 +02:00
21d1d05667
Use public API instead of private
...
The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work.
Fixes https://github.com/nextcloud/server/issues/5950
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 18:19:28 +02:00
f93a82b8b0
Remove explicit type hints for Controller
...
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
84c22fdeef
Merge pull request #5907 from nextcloud/add-metadata-to-throttle-call
...
Add metadata to \OCP\AppFramework\Http\Response::throttle
2017-08-01 14:43:47 +02:00
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
a20934227c
Remove undocumented config
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:59:10 +02:00
c23c05d4f6
Fix versions app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:57:08 +02:00
Morris Jobke
Marin Treselj
Nextcloud bot
Lukas Reschke
Allan Nordhøy
Roeland Jago Douma
Joas Schilling
Julius Härtl