Commit graph

12966 commits

Author SHA1 Message Date
Myles McNamara
74a264e82e fix syntax error
accidentally had ; included, and changed concatenating
2013-08-03 18:47:27 -04:00
Thomas Müller
d97e3c3571 adding proper evaluation of plural form - uses LGPL licensed code of jsgettext 2013-08-03 23:31:49 +02:00
Thomas Müller
b229381dda initialize $plural_form_string with English default 2013-08-03 23:29:31 +02:00
Thomas Müller
2e5f1142be return plural form in ajax translations 2013-08-03 23:27:18 +02:00
Robin Appelman
3534c3b373 add reveal mimetype 2013-08-03 21:59:44 +02:00
Jenkins for ownCloud
17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Myles McNamara
8edc0f210b use theme name and title for password reset
password reset email uses owncloud, updated to use theme settings
2013-08-03 00:00:32 -04:00
Thomas Müller
e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
Thomas Müller
550b647d8a another new line 2013-08-02 23:07:53 +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
389d0824e8 add new line to generated php code 2013-08-02 21:45:36 +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
Thomas Müller
010c4e0b83 remove cli check 2013-08-02 21:28:04 +02:00
Thomas Müller
58f369d029 more verbose printouts - fixing execution 2013-08-02 21:23:50 +02:00
Thomas Müller
5e1a775016 adjust usage text 2013-08-02 21:23:26 +02:00
Alexander Bogdanov
72ad843203 Fixing owncloud/core#4301
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
Robin Appelman
ed054e67d6 DB: remove invalid asserts 2013-08-02 20:10:26 +02:00
Robin Appelman
2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher
43b31f2161 Merge pull request #4283 from owncloud/add_ocimage_unittest
Add ocimage unittest
2013-08-02 08:27:24 -07: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
Bart Visscher
a7a05b321a Use console.php entry point for file scanning from console 2013-08-02 15:36:54 +02:00
Robin Appelman
258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00
kondou
de0dc30d89 Update skipped tests messages 2013-08-02 15:00:12 +02:00
Jörn Friedrich Dreyer
90d718634b Merge pull request #4274 from owncloud/breadcrumbs_show
add OC.Breadcrumb.show(dir, filename, link)
2013-08-02 05:42:17 -07:00
kondou
12ee590b2c Merge branch 'master' into add_ocimage_unittest 2013-08-02 13:39:48 +02:00
Thomas Tanghus
c5c05b808c Merge pull request #4284 from owncloud/dont_fatal_on_is_file
Don't throw a fatal, if is_file() parameter isn't a 'valid path', but only a data/base64-string.
2013-08-02 04:38:26 -07: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
Jörn Friedrich Dreyer
895d9ba1b9 Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Jörn Friedrich Dreyer
f8bb4e10ae use fixed OC.Breadcrumb.push() 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer
b12c1cb325 add OC.Breadcrumb.show(dir, filename, link) 2013-08-02 11:46:44 +02:00
Jörn Friedrich Dreyer
41739ff83f Merge pull request #4278 from owncloud/breadcrumb-first
make sure the first breadcrumb item is inserted before any other elements in the topbar
2013-08-02 02:46:12 -07:00
Lennart Rosam
ad329f541b users's -> user's 2013-08-02 11:19:33 +02:00
Lennart Rosam
504beb6cfd Fix typo (again >.<).. gnah 2013-08-02 10:01:34 +02:00
Lennart Rosam
79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Jenkins for ownCloud
16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Thomas Müller
3500c39567 adding new cli script to rescan files 2013-08-01 22:49:43 +02:00
Jakob Sack
2f17dcdba8 Fix syntax error. 2013-08-01 21:46:52 +02:00
Jakob Sack
eee2c369d9 Fix copy and paste errors in l10n.php 2013-08-01 21:36:33 +02:00
Jakob Sack
9673a563b5 Create plural functions on the fly 2013-08-01 21:25:14 +02:00
kondou
1b567b2ad1 Don't throw a fatal, if is_file() parameter isn't
a 'valid path', but only a data/base64-string.

Related to #4283
2013-08-01 21:01:26 +02:00
kondou
20b688d4be Optimize image and skip mimetype test 2013-08-01 20:17:43 +02:00
kondou
415e38fc50 Cover more cases
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
2013-08-01 20:17:43 +02:00
kondou
71f43c5fa1 Add OC_Image Unit Test
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
2013-08-01 20:17:43 +02:00
Jakob Sack
495e44e76c Update l10n.php to read plural_forms string 2013-08-01 19:54:51 +02:00
Jakob Sack
e064e53aa3 Save the plural information given in po files 2013-08-01 19:13:52 +02:00
Victor Dubiniuk
0c1008bb69 Some styling to user list 2013-08-01 19:53:41 +03:00