wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12922 commits 157 branches 562 tags 714 MiB
Commit graph

4400 commits

Author SHA1 Message Date
Georg Ehrke
623f9ec817 don't generate previews of empty txt files 2013-08-14 21:20:31 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Georg Ehrke
e5761d90ef fix deleting old previews after file changed 2013-08-14 20:49:47 +02:00
Jörn Friedrich Dreyer
8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Georg Ehrke
f9b2815767 remove \OC\Preview::showErrorPreview 2013-08-14 12:21:27 +02:00
Robin Appelman
f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Jenkins for ownCloud
5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Andreas Fischer
43be3eb4d0 Changing elseif statement to what the PEAR coding guidelines say. 2013-08-09 22:32:38 +02:00
Andreas Fischer
9c22046bff Do not pass numeric strings to strtotime() when formatting dates. 
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
 2013-08-09 22:32:38 +02:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
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
Jenkins for ownCloud
98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Georg Ehrke
1c9d52774e update indexes of oc_permissions 2013-08-09 09:31: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
Bjoern Schiessle
df358dfef5 fix function call for searUsers() 2013-08-08 13:41:04 +02: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
Bart Visscher
d563367b0f More style fixes 2013-08-07 22:22:33 +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
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Georg Ehrke
dcc92445a0 allow permissions.user to be null as suggested by @butonic 2013-08-07 11:51:08 +02:00
Robin Appelman
95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Bart Visscher
9b6357e6aa Merge pull request #4291 from owncloud/schema 
update DB Schema class
 2013-08-05 11:29:52 -07:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Georg Ehrke
554b1990e2 suppress is_file error msg 2013-08-05 14:23:30 +02:00
Thomas Müller
464afb5eca use isset to prevent undefined index 2013-08-05 13:51:45 +02:00
Thomas Müller
d1a39ab01c Merge pull request #4293 from owncloud/config-date 
make log date configurable, default to iso 8601
 2013-08-04 15:18:05 -07:00
Thomas Müller
b5f18111f4 Merge pull request #4308 from owncloud/fix-4194 
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
 2013-08-04 15:16:32 -07:00
Thomas Müller
0ae2bb77ba Merge pull request #4228 from owncloud/fix-3836 
app migrate: Use = instead of LIKE as described in the comment above.
 2013-08-04 15:00:24 -07:00
Thomas Müller
33d78ab9c7 fixing PHPDoc 2013-08-04 23:13:34 +02:00
Thomas Müller
b716d035c3 fixing PHPDoc 2013-08-04 22:58:40 +02:00
Andreas Fischer
e03d9e3aa0 Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. 2013-08-04 02:48:00 +02:00
Thomas Müller
b229381dda initialize $plural_form_string with English default 2013-08-03 23:29:31 +02:00
Robin Appelman
3534c3b373 add reveal mimetype 2013-08-03 21:59:44 +02:00
Thomas Müller
e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
Thomas Müller
35a42da3ca PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction 2013-08-02 21:46:25 +02:00
Thomas Müller
afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction 
Simplify OC_DB transaction functions
 2013-08-02 12:32:41 -07:00
Robin Appelman
2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher
fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24 Use function to create schema manager 2013-08-02 16:02:33 +02:00
Thomas Müller
821a99b937 Merge pull request #4287 from Takuto88/language-config 
Make default language configurable via config.php
 2013-08-02 06:49:54 -07:00
Robin Appelman
258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00
Bernhard Posselt
f5c3a346b0 make log date configurable, default to iso 8601 2013-08-02 13:34:20 +02:00
Bart Visscher
59c5529a2b Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager 2013-08-02 13:19:27 +02:00
Bart Visscher
9432885428 Change OC_DB_Schema to use DI for db connection object 2013-08-02 13:14:18 +02:00