Thomas Müller
|
88d5e8fbca
|
Merge pull request #5031 from zimba12/master
followup of #4032 - makes the settings-button bigger...
|
2013-09-29 09:26:47 -07:00 |
Alessandro Cosentino
|
710d3f139f
|
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
|
2013-09-29 01:46:23 -04:00 |
|
Jenkins for ownCloud
|
59e4ff7d24
|
[tx-robot] updated from transifex
|
2013-09-29 00:03:26 -04:00 |
|
Thomas Müller
|
adcb738e47
|
initialize $middleWares
|
2013-09-28 20:40:25 +02:00 |
|
Thomas Müller
|
6979fd343b
|
Merge branch 'master' into appframework-master
|
2013-09-28 20:39:19 +02:00 |
Morris Jobke
|
1097c3ce63
|
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Base defaultavatar text on displayname
|
2013-09-28 08:52:22 -07:00 |
kondou
|
24d092c4ba
|
Have uniform (wrong) indention
|
2013-09-28 17:49:07 +02:00 |
|
kondou
|
4907685405
|
Base defaultavatar text on displayname
Fix #4876
|
2013-09-28 16:46:53 +02:00 |
|
Morris Jobke
|
cb565a5f60
|
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
phpunit.xml: Port code coverage excludes from autotest to dist.
|
2013-09-28 06:50:34 -07:00 |
|
Thomas Müller
|
57f37c876b
|
delay middleware registrations
|
2013-09-27 17:15:26 +02:00 |
|
Thomas Müller
|
adff34cb8a
|
fixing error in initialization of TagManager
|
2013-09-27 17:08:48 +02:00 |
Georg Ehrke
|
c5bcefe4db
|
rename variable in testIsTransparent
|
2013-09-27 14:55:37 +02:00 |
|
Thomas Müller
|
687ba053b7
|
Merge branch 'master' into appframework-master
|
2013-09-27 14:25:47 +02:00 |
|
Thomas Müller
|
735608f513
|
Merge pull request #4207 from owncloud/search_shared_files
add initial search in shared files
|
2013-09-27 05:18:12 -07:00 |
|
Thomas Müller
|
79da35b698
|
code cleanup
|
2013-09-27 13:41:23 +02:00 |
Bjoern Schiessle
|
03d5ea6cec
|
check not only if the keyfile folder exists but also if it contains keyfiles
|
2013-09-27 13:34:48 +02:00 |
|
Morris Jobke
|
f47ff13abf
|
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
prelogin apps have to be loaded within setupBackend() otherwise required...
|
2013-09-27 02:34:59 -07:00 |
|
Georg Ehrke
|
4e9296a484
|
rename testTxtBlacklist to txtBlacklist
|
2013-09-27 11:33:37 +02:00 |
|
Georg Ehrke
|
1b13101096
|
move fileView object initialization to testIsTransparent
|
2013-09-27 11:01:47 +02:00 |
|
Georg Ehrke
|
aa8a145ba8
|
use dataProvider for txt blacklist test
|
2013-09-27 09:59:04 +02:00 |
|
Jenkins for ownCloud
|
f31d31844e
|
[tx-robot] updated from transifex
|
2013-09-27 00:02:30 -04:00 |
|
Bjoern Schiessle
|
7e54e8831e
|
set rememberlogin to false for the encryption app
|
2013-09-26 19:34:50 +02:00 |
|
Bjoern Schiessle
|
9bb244cc59
|
check every enabled app if the remember login feature needs to be disabled
|
2013-09-26 19:34:28 +02:00 |
Andreas Fischer
|
1a398fba67
|
phpunit.xml: Port code coverage excludes from autotest to dist.
|
2013-09-26 19:05:47 +02:00 |
|
Morris Jobke
|
3dd19c7758
|
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
|
2013-09-26 07:09:32 -07:00 |
|
Thomas Müller
|
f8933eaf92
|
Remove $RUNTIME_NOAPPS - setting to false was not enough
|
2013-09-26 14:03:04 +02:00 |
|
Thomas Müller
|
e515509a81
|
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
|
2013-09-26 13:34:47 +02:00 |
blizzz
|
b9d582caa2
|
Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
|
2013-09-26 04:03:20 -07:00 |
Björn Schießle
|
6b1d70f148
|
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
|
2013-09-26 03:16:15 -07:00 |
|
Thomas Müller
|
2334f96906
|
Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
|
2013-09-26 03:15:14 -07:00 |
|
Thomas Müller
|
d1b5d65622
|
run unit tests for apps as well
|
2013-09-26 12:02:06 +02:00 |
|
Thomas Müller
|
b11d8799c1
|
adding unit tests for ObjectTree::move()
|
2013-09-26 10:50:15 +02:00 |
|
Thomas Müller
|
469b309b21
|
Merge pull request #4892 from owncloud/vcategories_public
OC_VCategories => OC\Tags. Public interface and getter in server container
|
2013-09-25 14:24:37 -07:00 |
|
Bjoern Schiessle
|
0b98427536
|
fix check if app is enabled
|
2013-09-25 19:23:07 +02:00 |
|
Arthur Schiwon
|
b5ac672864
|
Missing Test for the previous commit
|
2013-09-25 19:15:27 +02:00 |
|
Morris Jobke
|
70dccd28ef
|
Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
|
2013-09-25 10:11:52 -07:00 |
|
Bjoern Schiessle
|
71bbb2ea8b
|
check if key exists before reading it
|
2013-09-25 17:44:05 +02:00 |
|
Thomas Müller
|
46e47be782
|
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
|
2013-09-25 17:43:25 +02:00 |
|
Thomas Müller
|
826c6bec8f
|
expect unlinkto be called
|
2013-09-25 17:41:16 +02:00 |
|
Thomas Müller
|
3fa5271f10
|
adding unit tests
|
2013-09-25 17:34:28 +02:00 |
|
Thomas Müller
|
0c44cdd4ea
|
remove unneccessary code
|
2013-09-25 17:28:45 +02:00 |
|
kondou
|
5e7a7b3f61
|
Shorten optional text-argument processing
|
2013-09-25 17:19:38 +02:00 |
|
Thomas Müller
|
5e27ac4b1a
|
$path already contains the full path to the file
|
2013-09-25 17:17:29 +02:00 |
|
Thomas Müller
|
09b64535a9
|
fixing copyright and add class documentation
|
2013-09-25 17:05:14 +02:00 |
|
Thomas Müller
|
2feb753b84
|
Merge pull request #4989 from owncloud/coverage-for-all-master
collect coverage for all databases again - ci.owncloud.org has more RAM ...
|
2013-09-25 07:46:49 -07:00 |
|
Arthur Schiwon
|
1c976a7c9b
|
manager checkPassword now returns User object, adjust internal user class accordingly.
|
2013-09-25 15:03:22 +02:00 |
|
Thomas Müller
|
0486dc24ad
|
collect coverage for all databases again - ci.owncloud.org has more RAM available
|
2013-09-25 14:41:13 +02:00 |
|
Thomas Müller
|
68bfcfbf77
|
Merge pull request #4968 from owncloud/user_checkpwd
User: move checkPassword from User to Manager to not break API
|
2013-09-25 05:28:42 -07:00 |
|
kondou
|
24eb41548e
|
Make it possible to have a different color than the username for placeholder
|
2013-09-25 12:57:41 +02:00 |
|
Thomas Müller
|
30286c06ab
|
stripos return value check
|
2013-09-25 11:05:59 +02:00 |