Morris Jobke
fa97e3a5a3
OC_TemplateLayout -> OC\TemplateLayout
2016-01-07 09:31:11 +01:00
Morris Jobke
c464b32738
OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager
2016-01-07 09:29:21 +01:00
Thomas Müller
336fe868b2
Merge pull request #21404 from owncloud/symfony_console_2.8.0
...
[3rdparty] Bump symfony/console to 2.8.0
2016-01-07 09:11:54 +01:00
Thomas Müller
470bf234c5
Merge pull request #21343 from owncloud/ldap-showremnants-json-output
...
Add an option to occ ldap:showremnants to output a json encoded array…
2016-01-07 08:45:06 +01:00
Jenkins for ownCloud
27dfa74d89
[tx-robot] updated from transifex
2016-01-07 01:55:48 -05:00
Thomas Müller
d3922510d0
Merge pull request #20994 from owncloud/personal-page
...
improve layout of personal settings page
2016-01-06 17:25:12 +01:00
Thomas Müller
b8ecf19650
Merge pull request #21349 from owncloud/web_use_sharee
...
Webinterface use sharee API
2016-01-06 17:24:52 +01:00
Thomas Müller
002161857c
Merge pull request #21398 from owncloud/sharing-disabled-cache
...
Cache isSharingDisabledForUser
2016-01-06 17:23:14 +01:00
Thomas Müller
b6bc17d014
Merge pull request #21443 from owncloud/fix-container-lookup
...
Lookup the App name instead of OCA
2016-01-06 17:22:41 +01:00
Thomas Müller
a2c19d3d1a
Merge pull request #21444 from owncloud/move-regenerate-below
...
Move regeneration of session ID into session classes
2016-01-06 17:21:43 +01:00
Thomas Müller
8b5315c90a
Merge pull request #21459 from owncloud/make-ldap-more-robust
...
Make LDAP more robust to exceptions and log them properly
2016-01-06 17:04:16 +01:00
Thomas Müller
6460448b10
Merge pull request #21469 from owncloud/drop-old-gallery-table
...
Drop oc_gallery_sharing which was removed in 8.0.0
2016-01-06 17:03:58 +01:00
Thomas Müller
0d33dc11ca
Merge pull request #21482 from owncloud/htaccess-ico-rule
...
Allow ico files to be served statically
2016-01-06 17:03:18 +01:00
Thomas Müller
d878002ee6
Merge pull request #21488 from th3fallen/patch-1
...
Blacklist myself
2016-01-06 16:57:43 +01:00
Clark Tomlinson
1215d76018
Blacklist myself
...
To stop being mentioned endlessly
2016-01-06 10:08:59 -05:00
Morris Jobke
553a981980
Make LDAP more robust to exceptions and log them properly
2016-01-06 13:46:55 +01:00
Morris Jobke
7b8b2c73c5
Drop oc_gallery_sharing which was removed in 8.0.0
...
See c080dfe87d
2016-01-06 13:45:59 +01:00
Morris Jobke
2f53866668
Allow ico files to be served statically
2016-01-06 13:45:11 +01:00
Jörn Friedrich Dreyer
12b0e9e3bd
Merge pull request #21473 from owncloud/fix-unit-tests-because-appstore
...
Inject OCSClient - Fixes master unit tests
2016-01-06 13:43:29 +01:00
Lukas Reschke
88c7face07
Inject OCSClient
...
Fixes https://github.com/owncloud/core/issues/21451
2016-01-06 11:40:22 +01:00
Jenkins for ownCloud
c77917f48c
[tx-robot] updated from transifex
2016-01-06 01:55:16 -05:00
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
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
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
Roeland Jago Douma
49031e0744
Fix unit tests
2015-12-30 08:58:04 +01:00