Jörn Friedrich Dreyer
5e36adae57
Merge pull request #21409 from JohannesKleine/patch-1
...
Update config.sample.php
2016-01-05 15:13:52 +01:00
Jörn Friedrich Dreyer
d988685496
Merge pull request #21377 from owncloud/login-submit-button-border-2
...
Remove unnecessary border from login button
2016-01-05 15:13:06 +01:00
Jörn Friedrich Dreyer
d7a35357c0
Merge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-help
...
Feature/21413 better occ user help
2016-01-05 15:12:38 +01:00
Jörn Friedrich Dreyer
2b194d6f88
Merge pull request #21454 from owncloud/proper-style-sidebar-transparency
...
Use color instead of transparency for proper tooltip appearance
2016-01-05 14:50:16 +01:00
Jörn Friedrich Dreyer
a86e067154
Merge pull request #21442 from owncloud/annotate-type
...
Annotate type
2016-01-05 12:36:31 +01:00
Jan-Christoph Borchardt
8f7ee523fe
add back gradient for log in page in Firefox, fix accidental removal
2016-01-05 10:44:10 +01:00
Morris Jobke
80e75aae49
Use color instead of transparency for proper tooltip appearance
...
* fixes #21436
2016-01-05 09:39:24 +01:00
Jenkins for ownCloud
d4034ffca0
[tx-robot] updated from transifex
2016-01-05 01:57:14 -05:00
Jörn Friedrich Dreyer
3f101039b9
add isset for optional params
2016-01-04 16:38:45 +01:00
Joas Schilling
761000624d
Only enable apps that are not intentionally disabled
2016-01-04 16:24:52 +01:00
Edward Crompton
6d7a5e002c
Whitespace correction
2016-01-04 15:10:25 +00:00
Edward Crompton
6c096ec2b4
Removing the . from the end of the help response to match convention set by other messages
2016-01-04 15:02:24 +00:00
Edward Crompton
61a7728096
Adding a more helpful error message for when occ is run at the console as the wrong user
2016-01-04 14:58:11 +00:00
Lukas Reschke
836e96a95e
Assign DB group for unit tests
2016-01-04 15:09:01 +01:00
Lukas Reschke
fec41e7539
Move regeneration of session ID into session classes
...
There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.
2016-01-04 15:09:01 +01:00
Thomas Müller
70ff90b1ec
Merge pull request #21393 from owncloud/fix-urlgenerator-call
...
No more deprecation messages in error log
2016-01-04 15:00:06 +01:00
Joas Schilling
2cf4e144cc
Lookup the App name instead of OCA
2016-01-04 14:47:49 +01:00
Lukas Reschke
26c3fa7911
Annotate type
...
Otherwise static code scanners will complain about this.
2016-01-04 14:18:01 +01:00
Björn Schießle
ebc52300e7
Merge pull request #21435 from owncloud/improved_upgrade_messages
...
don't show previous log level in upgrade message
2016-01-04 13:40:52 +01:00
Björn Schießle
58b1221ad3
don't show previous log level in upgrade message
2016-01-04 11:50:07 +01:00
Jenkins for ownCloud
157bb50a39
[tx-robot] updated from transifex
2016-01-04 01:55:05 -05:00
JohannesKleine
792839b5c1
Merge branch 'master' into patch-1
2016-01-02 21:56:45 +01:00
Jenkins for ownCloud
6ca2da7d5c
[tx-robot] updated from transifex
2016-01-02 01:54:46 -05:00
Roeland Jago Douma
4c7a7c8edc
[3rdparty] Bump symfony/console to 2.8.0
2016-01-01 12:52:47 +01:00
Jenkins for ownCloud
dfec9f0c8a
[tx-robot] updated from transifex
2016-01-01 01:55:10 -05:00
JohannesKleine
c95d1b2625
Update config.sample.php
...
I corrected the word order.
2015-12-31 14:48:19 +01:00
Jenkins for ownCloud
970495a067
[tx-robot] updated from transifex
2015-12-31 01:55:16 -05:00
Thomas Müller
42897ac5cb
Merge pull request #21402 from owncloud/view-getuserobject-cache
...
Cache usermanager instance in view
2015-12-30 20:04:51 +01:00
Robin Appelman
45d0396404
Cache sharing disabled in the view
2015-12-30 14:42:22 +01:00
Robin Appelman
2d9d0aedf8
Cache usermanager instance in view
2015-12-30 14:28:53 +01:00
Roeland Jago Douma
6bd15856b2
Added js tests for the Sharee API usage
2015-12-30 10:46:19 +01:00
mbi
63974992f9
Merge branch 'master' into master
2015-12-30 10:34:42 +01:00
Roeland Jago Douma
49031e0744
Fix unit tests
2015-12-30 08:58:04 +01:00
Roeland Jago Douma
f99fcd5dd6
Filter out share owner in sharee suggestion list
2015-12-30 08:58:04 +01:00
Roeland Jago Douma
fa7996aa8a
Web sharing uses sharee endpoint
2015-12-30 08:58:04 +01:00
Jenkins for ownCloud
45c41e2b2c
[tx-robot] updated from transifex
2015-12-30 01:55:47 -05:00
Thomas Müller
9e39e8f1c7
No more deprecation messages in error log
2015-12-29 17:31:28 +01:00
Thomas Müller
f57e77fe05
Merge pull request #21149 from owncloud/quota-wording
...
shorten quota usage wording, fix overflow on mobile, fix #21129
2015-12-29 16:33:24 +01:00
Thomas Müller
9392a555ae
Merge pull request #21331 from switch-ch/fix_ms_log
...
Fix owncloud logging with ms precision
2015-12-29 16:32:52 +01:00
Christoph Wurst
598883ffa0
Remove unnecessary border from login button
2015-12-29 09:32:40 +01:00
Jan-Christoph Borchardt
e4cf53031b
fix overlap and functionality of cropper
2015-12-28 19:23:40 +01:00
Jan-Christoph Borchardt
640adde3b9
improve layout of personal settings page
2015-12-28 18:50:50 +01:00
Jan-Christoph Borchardt
6e60b6ee7c
shorten quota usage wording, fix overflow on mobile, fix #21129
2015-12-28 18:42:48 +01:00
Thomas Müller
9c4ab51735
Merge pull request #21364 from owncloud/bring_back_icons_filepicker
...
Get the icon in javascript for the filepicker
2015-12-28 10:21:58 +01:00
Thomas Müller
edd051dc02
Merge pull request #21291 from owncloud/refactor-call-check
...
Refactor OC_Util::callCheck
2015-12-28 10:21:44 +01:00
Thomas Müller
7693c6d84a
Merge pull request #21254 from owncloud/files-uploadcanceliconfix
...
Correctly render uploadtext indicator only on folders
2015-12-28 10:21:38 +01:00
Thomas Müller
24271cf953
Merge pull request #21216 from owncloud/fopen-statcache
...
Clear SMB statcache after fopen
2015-12-28 10:21:26 +01:00
Thomas Müller
eb509bcbe6
Merge pull request #17333 from owncloud/php7-scalar-types-controllers
...
Prefer scalar type hints over phpdoc annotation
2015-12-28 10:21:14 +01:00
Thomas Müller
245dac7e81
Merge pull request #20992 from owncloud/log-in-noselect
...
prevent selecting on log in page to solve ugliness on accidental selection
2015-12-28 10:18:30 +01:00
Jenkins for ownCloud
89584716f8
[tx-robot] updated from transifex
2015-12-28 01:55:10 -05:00