Commit Graph

44 Commits

Author SHA1 Message Date
Sam Georges 0185244710 Drop the file extension from the combiner URL
This causes too many issues with Nginx and php server instances.
2014-05-16 14:29:25 +10:00
alekseybobkov 64cfb7eb87 Merge branch 'master' of github.com:octobercms/october 2014-05-16 15:09:25 +11:00
alekseybobkov dac7c46be2 Minor styling fix 2014-05-16 15:09:16 +11:00
Sam Georges bcf6d1a2bc Add custom SQL for SQLite 2014-05-16 11:49:08 +10:00
Sam Georges 12a80cae9c Add new keys to other languages (needs further translation) 2014-05-16 11:29:44 +10:00
Samuel Georges eb3e8df7be Merge pull request #113 from marcus-herrmann/master
Added German language files
2014-05-16 11:14:42 +10:00
Sam Georges 0088804ee9 SQLite doesn't like this key name 2014-05-16 11:11:29 +10:00
Samuel Georges f02b541d2f Merge pull request #111 from erJasp/master
Moved hard-coded text to language file (backend)
2014-05-16 11:06:57 +10:00
Sam Georges f3827e230f Minor clean up 2014-05-16 11:04:46 +10:00
Samuel Georges 2915b7dd74 Merge pull request #98 from alxy/patch-1
Add $attributes param to asset function
2014-05-16 10:11:43 +10:00
Samuel Georges bd7eaf8f12 Merge pull request #96 from pariz/master
Swedish language files for backend, cms and system, as well as one typo if in an english language file
2014-05-16 10:07:06 +10:00
Samuel Georges 49321abdb8 Merge pull request #85 from emir/master
Added Turkish language files
2014-05-16 10:05:16 +10:00
Jasper 8d82727310 Updated CMS language support
Moved hard-coded text in "cms" to the language files (English and
Dutch). And some minor changes.
2014-05-16 01:04:40 +02:00
alxy 8cc375939f Minor fixes 2014-05-15 22:32:56 +02:00
Jasper ddcc63ef6c Updated Backend + System language support
Moved hard-coded text in "backend" and "system" to the language files
(English and Dutch). Affected pages: administrator management,
administrator group management, system updates, system settings, email
settings. Also made some strings more generic for general use (like
"Saving...." instead of "Saving administrator account...")
2014-05-15 22:23:29 +02:00
mhe 80d41c4e4d Add further translation files 2014-05-15 20:25:55 +02:00
Jasper 2e649d6b5f Moved hard-coded text to language file (backend)
Hard-coded text from the backend (user- and group management) moved to
the language file (English and Dutch).
2014-05-15 19:36:04 +02:00
mhe 23d98e5caf Added German language files 2014-05-15 17:27:47 +02:00
alxy ef2ea60061 Add $attributes param to asset function
This commit adds a second parameter $attributes to the following functions:

- AssetMaker::addJs
- AssetMaker::addCss
- AssetMaker::addRss

This is useful when dealing with javascript libraries like require.js, which depend on these HTML attributes to function properly.

It does not break the existing code!
2014-05-15 15:48:14 +02:00
Pär Karlsson 2883fa6b6a Fixed typo in english language file 2014-05-15 15:18:07 +02:00
Pär Karlsson f4bf9e192f Added swedish language support 2014-05-15 15:17:41 +02:00
Emir Karşıyakalı c6df6f897b Added Turkish language files 2014-05-15 13:31:17 +03:00
Sam Georges bdff075058 Improve event emitter trait 2014-05-15 17:23:46 +10:00
Sam Georges 5bf215e648 Fixes unit test (stat failure) 2014-05-15 16:53:06 +10:00
Sam Georges fd5d176f60 Tighten up events 2014-05-15 16:22:22 +10:00
Sam Georges efd9e5bb90 Minor rollback: We dont actually need to pass the context to beforeUpdate() 2014-05-15 14:21:40 +10:00
Sam Georges 8019cd7a85 Minor 2014-05-15 14:17:10 +10:00
Sam Georges f8294b8400 Add extra hooks for before ajax updates 2014-05-15 14:16:11 +10:00
Sam Georges 81042c85a8 Add nullables 2014-05-15 11:34:27 +10:00
Sam Georges 934d7d869f Use shorter index 2014-05-15 09:20:00 +10:00
Sam Georges 4b0eed62a6 Fixes form widget saveData bug
Where nested checkboxes values get set at root level
2014-05-15 09:05:04 +10:00
Samuel Georges 6b3f5512d0 Merge pull request #51 from erJasp/master
Added Dutch ("Nederlands") language files
2014-05-15 08:37:35 +10:00
Sam Georges f208e8d40d Fixes https://github.com/octobercms/install/issues/14 - clearing the cache softly now 2014-05-15 08:35:41 +10:00
Jasper b4ec8d2297 Added Dutch ("Nederlands") language files 2014-05-15 00:14:30 +02:00
Sam Georges 64f3a87e01 Fixes bug where invalid partial tag throws off the scent with its own problems 2014-05-15 01:31:41 +10:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00
Sam Georges 273d9a2865 Add branch aliases 2014-05-09 11:45:37 +10:00
Samuel Georges e3f175b08e Update composer.json 2014-05-08 22:28:37 +10:00
Samuel Georges bf64309000 Update composer.json 2014-05-08 22:28:15 +10:00
Samuel Georges 8f669ba548 Update composer.json 2014-05-08 22:27:56 +10:00
Samuel Georges 5f196ca69d Update composer.json 2014-05-08 21:28:03 +10:00
Samuel Georges 2fe103dca5 Update composer.json 2014-05-08 21:27:39 +10:00
Samuel Georges 30c53183e5 Update composer.json 2014-05-08 21:26:44 +10:00
Sam Georges 4bd853b2df Add stub files to prepare for composerfication 2014-05-07 17:52:13 +10:00