Jan-Christoph Borchardt
|
4c0ec974b9
|
Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
|
2013-08-09 08:49:41 -07:00 |
Bjoern Schiessle
|
44d201a526
|
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
|
2013-08-09 15:57:07 +02:00 |
Bjoern Schiessle
|
5ba8d38b7f
|
remove old comments, TODos, etc.
|
2013-08-09 15:55:17 +02:00 |
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
Jörn Friedrich Dreyer
|
9334974a92
|
allow empty configvalue in appconfig
|
2013-08-09 11:27:21 +02:00 |
Myles McNamara
|
f5d23c469d
|
use getName instead of getTitle
|
2013-08-08 16:21:47 -04:00 |
Andreas Fischer
|
beb27168de
|
Use multiple lines for the JSON data array.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
0ab8850478
|
Adjust JSON code to stable5.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
1ed049a682
|
Do not repeat JSON success code.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
0718c92dc8
|
Do not repeat definition of $target.
|
2013-08-08 22:13:53 +02:00 |
Owen Winkler
|
a2ac5e0163
|
Merge pull request #4271 from owncloud/plural_translations
Plural translations
|
2013-08-08 10:34:28 -07:00 |
Jörn Friedrich Dreyer
|
e38025ba67
|
Merge pull request #4151 from owncloud/doctrine-object
Move dbtype depending logic into object per type
|
2013-08-08 08:46:30 -07:00 |
Björn Schießle
|
c24bf47db8
|
Merge pull request #4349 from owncloud/oc_cache_fix
oc_cache needs to disable file proxys for read/write operation.
|
2013-08-08 08:19:14 -07:00 |
Morris Jobke
|
062769ab61
|
Remove noisy Log/Debug message
|
2013-08-08 16:39:33 +02:00 |
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
icewind1991
|
118c3d8a38
|
Merge pull request #4353 from owncloud/fix_search_user
fix function call for searchUsers()
|
2013-08-08 06:23:53 -07:00 |
Thomas Müller
|
c458e785a1
|
fixing typos and PHPDoc
|
2013-08-08 15:08:58 +02:00 |
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +02:00 |
Bjoern Schiessle
|
df358dfef5
|
fix function call for searUsers()
|
2013-08-08 13:41:04 +02:00 |
Bjoern Schiessle
|
512f98cac9
|
remove todo item
|
2013-08-08 13:38:15 +02:00 |
Bjoern Schiessle
|
023121aed0
|
adapt tests to the changes in crypt.php
|
2013-08-08 13:35:01 +02:00 |
Björn Schießle
|
c2f40d2495
|
Merge pull request #4243 from owncloud/no_empty_versions
don't create empty versions
|
2013-08-08 03:57:43 -07:00 |
Morris Jobke
|
35e1d8b265
|
Merge pull request #4328 from owncloud/cleanupdb_kondou
Clean up DB, after we're done with testing Preferences
|
2013-08-08 01:36:10 -07:00 |
Bjoern Schiessle
|
ab6e47b44a
|
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
|
2013-08-08 09:44:19 +02:00 |
Thomas Müller
|
f7915d745a
|
Merge pull request #4340 from owncloud/true-false-as-filename
Allow true and false as filenames.
|
2013-08-08 00:03:50 -07:00 |
Bjoern Schiessle
|
b39d2d1938
|
more error messages which might be useful for the user to debug his server config
|
2013-08-08 08:39:11 +02:00 |
Bjoern Schiessle
|
7ce03ba37c
|
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
|
2013-08-08 08:39:01 +02:00 |
Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
Bjoern Schiessle
|
97e910e087
|
make methods private which are not used from outside
|
2013-08-08 08:37:39 +02:00 |
Robin Appelman
|
d91104e120
|
actually register html template
|
2013-08-07 23:48:44 +02:00 |
Bart Visscher
|
d563367b0f
|
More style fixes
|
2013-08-07 22:22:33 +02:00 |
Jan-Christoph Borchardt
|
31d50288a5
|
draw attention to the newly added app entry by flashing it twice
|
2013-08-07 21:54:28 +02:00 |
Jan-Christoph Borchardt
|
7a9daa99d1
|
scroll the app navigation down so the newly added app is seen
|
2013-08-07 21:53:53 +02:00 |
Jan-Christoph Borchardt
|
775f33cc1b
|
prepend the new app before the 'More apps' function
|
2013-08-07 21:53:25 +02:00 |
Bart Visscher
|
83988a5906
|
Fix stupid bug
|
2013-08-07 21:01:31 +02:00 |
Bart Visscher
|
0783267e2c
|
Move query processing after the check for prepared statement cache
|
2013-08-07 18:21:49 +02:00 |
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
Bart Visscher
|
2cc94cbc73
|
Style fixes
|
2013-08-07 18:17:37 +02:00 |
Robin Appelman
|
a0243e03ef
|
use ===
|
2013-08-07 17:17:30 +02:00 |
Andreas Fischer
|
67df0a60fb
|
Check expected type after JSON decode instead of checking what is not expected.
This will also allow "true" and "false" as filenames instead of only "null".
|
2013-08-07 17:01:14 +02:00 |
Robin Appelman
|
1c1ede5703
|
add template for html files
|
2013-08-07 16:53:33 +02:00 |
Robin Appelman
|
9321eceed6
|
add the option to have templates for newly created files
|
2013-08-07 16:53:09 +02:00 |
Robin Appelman
|
fc332acf8a
|
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
|
2013-08-07 16:38:57 +02:00 |
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
kondou
|
6c78152564
|
Proper WHERE – the table is called userid not user
|
2013-08-06 17:31:50 +02:00 |
kondou
|
b8bfebe51e
|
Use setUpBeforeClass() and tearDownAfterClass()
|
2013-08-06 17:26:12 +02:00 |
kondou
|
1a4465f41d
|
Improve app-management
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
|
2013-08-06 17:19:18 +02:00 |
kondou
|
b560bb21f0
|
Clean up DB, after we're done with testing
|
2013-08-06 17:01:01 +02:00 |
Robin Appelman
|
95a959b10b
|
merge master into doctrine-object
|
2013-08-06 15:43:58 +02:00 |