mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,114 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

40114 Commits

Author SHA1 Message Date
Morris Jobke de911f6e5c Merge pull request #5998 from nextcloud/drone_mysqlmb4_71 
Add mysqlmb4 php7.1 drone job
 2017-08-07 08:48:23 +02:00
Roeland Jago Douma e64ba1d343
Add mysqlmb4 php7.1 drone job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 20:13:04 +02:00
Morris Jobke 7a3d746d0d Merge pull request #5997 from nextcloud/drone_mysqlmb4_70 
Add myslqmb4 php 7.0 drone
 2017-08-06 14:44:28 +02:00
Roeland Jago Douma 68d6e788e4
Add myslqmb4 php 7.0 drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 13:07:34 +02:00
Morris Jobke 1247bd8755 Merge pull request #5995 from nextcloud/drone_mysql_71 
Add PHP 7.1 mysql job to drone
 2017-08-06 12:32:59 +02:00
Roeland Jago Douma 5164f25a54
Add PHP 7.1 mysql job to drone 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-06 10:45:10 +02:00
Roeland Jago Douma 2d7e7212fa Merge pull request #5990 from nextcloud/drone_mysql_70 
Also run mysql test on php7.0
 2017-08-06 10:35:57 +02:00
Nextcloud bot eb2442b871
[tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Roeland Jago Douma c0f9a397d7
Also run mysql test on php7.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-05 19:59:37 +02:00
Nextcloud bot 21f2fe5cb9
[tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00
Morris Jobke 3e091b5294 Merge pull request #5550 from andreasjacobsen93/clean-settings-layout 
Cleaned up personal settings page
 2017-08-04 23:30:52 +02:00
Morris Jobke de94eefe97 Merge pull request #5969 from 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
 2017-08-04 12:08:16 +02:00
Lukas Reschke 3266e81577 Merge pull request #5954 from nextcloud/textpreview_range 
Do not fetch the whole text file for the sidebar preview
 2017-08-04 11:23:42 +02:00
Lukas Reschke a1d44a7206 Merge pull request #5963 from nextcloud/pre_post_share_events 
Move pre_shared and post_shared events to EventDispatcher
 2017-08-04 11:18:53 +02:00
Morris Jobke 90d8070da3 Merge branch 'master' into clean-settings-layout 2017-08-04 11:11:33 +02:00
Morris Jobke d63beffe9e Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon 
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
 2017-08-04 10:53:21 +02:00
Marin Treselj 54444110d9 Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout 2017-08-04 10:23:52 +02:00
Marin Treselj a4d9845326 Fix federation icon menu and container paddings. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-04 10:22:03 +02:00
Nextcloud bot 1f8a45bbd7
[tx-robot] updated from transifex 2017-08-04 00:08:18 +00:00
Daniel Calviño Sánchez 09a8c4a5d4 Fix code style 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez c723d093a8 Remove superfluous selector part 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez 4fbcbd3e6d Align vertically loading icon and status message 
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>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez fa7f4e5cae Do not use the same rules for loading icon than for upload icon 
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>
 2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez 33c4a674a2 Remove ignored rules 
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>
 2017-08-03 21:09:25 +02:00
Roeland Jago Douma 3aa819c62c
Do not fetch the whole text file for the sidebar preview 
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>
 2017-08-03 20:32:59 +02:00
Joas Schilling 9abbd6ab13 Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" 2017-08-03 17:27:24 +02:00
Roeland Jago Douma 4633717f04
Move pre_shared and post_shared events to EventDispatcher 
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-03 15:14:29 +02:00
Morris Jobke ac4927809c Merge branch 'master' into clean-settings-layout 2017-08-03 15:07:42 +02:00
Morris Jobke bb865a55fe Merge pull request #5738 from nextcloud/comradekingu-patch-3 
Spelling: UID
 2017-08-03 14:28:41 +02:00
Marin Treselj 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
Marin Treselj 7284458e24 Clean up HTML structure, fix labels. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-03 12:51:27 +02:00
Morris Jobke 8fecc336ac Merge pull request #5959 from nextcloud/drop-logo-claim 
Logo claim is not used anymore
 2017-08-03 08:20:56 +02:00
Nextcloud bot 21dd85678f
[tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Lukas Reschke 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
Morris Jobke 585e5c6ea5
Logo claim is not used anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 23:08:45 +02:00
Morris Jobke c40352c030 Merge pull request #5816 from nextcloud/fix-oracle 
Fix oracle
 2017-08-02 20:54:58 +02:00
Morris Jobke 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
Marin Treselj c658862052 Replace `include` with `file_get_contents` 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-08-02 18:27:24 +02:00
Marin Treselj 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
Allan Nordhøy 2fcf4f2f29 Improve spelling in LDAP 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-02 18:12:31 +02:00
Morris Jobke 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
Morris Jobke 6290ba8299 Merge pull request #4790 from nextcloud/fix-comparisons-in-apps 
Fix comparisons in apps
 2017-08-02 16:28:33 +02:00
Morris Jobke 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
Roeland Jago Douma fbfd371493 Merge pull request #5923 from nextcloud/expire-federation-jobs 
Expire federation jobs
 2017-08-02 16:15:28 +02:00
Morris Jobke d7d2d7c803 Merge pull request #5952 from nextcloud/appmanager-isshipped 
Use public methods for OC_App::isShipped
 2017-08-02 16:15:02 +02:00
Marin Treselj 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
Joas Schilling 4ca4b270e7
Close all the cursors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 14:35:14 +02:00
Joas Schilling 81c54ea515
Use automatic injection whenever possible 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 14:34:51 +02:00
Morris Jobke 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
Morris Jobke a96c651935 Merge pull request #5949 from nextcloud/fix-broken-code 
Use IUser
 2017-08-02 13:54:45 +02:00