Florin Peter
|
3c100af132
|
revert changes to fbbc76f281 because master is very unstable right now
|
2013-05-01 01:38:06 +02:00 |
|
Florin Peter
|
b2da07fe95
|
Merge branch 'master' into files_encryption to get the latest files_trashbin app
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
|
2013-04-30 20:53:56 +02:00 |
Raghu Nayyar
|
2bcb64e781
|
Merge pull request #3114 from owncloud/update-notification
Add an update notification
|
2013-04-26 21:12:38 -07:00 |
Bart Visscher
|
b46f6e4f97
|
Simplify app js locating for layout pages
|
2013-04-26 14:21:51 +02:00 |
|
Bart Visscher
|
ea4ae857a1
|
Simplify app css locating for layout pages
|
2013-04-26 14:21:50 +02:00 |
Lukas Reschke
|
d41b600725
|
Add an update notification on every page for admin users
|
2013-04-24 18:47:38 +02:00 |
Bernhard Posselt
|
b98b56e4a8
|
check if there is a default/ folder in the theme directory if no theme exists
|
2013-04-24 13:45:40 +02:00 |
|
Bart Visscher
|
e1c5b31d65
|
Test if we want a 3rdparty style/script before checking the 3rdparty root
|
2013-04-19 16:09:39 +02:00 |
|
Lukas Reschke
|
f944ac9cba
|
Add a name to the version parameter
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
|
2013-04-05 00:33:05 +03:00 |
Thomas Tanghus
|
57f2884efa
|
Add hashed version parameter to js and css. Ref #1520 and many more ;)
|
2013-03-19 12:35:31 +01:00 |
Brice Maron
|
050de008b1
|
Avoid to display empty DisplayNames for menu and title
|
2013-03-02 16:09:36 +01:00 |
|
Lukas Reschke
|
229c907a57
|
[core] From echo to p
|
2013-02-27 22:55:39 +01:00 |
|
Bart Visscher
|
15f5325078
|
Don't use routes when displaying error page
|
2013-02-22 21:39:44 +01:00 |
|
Bart Visscher
|
ffae6f4b84
|
Style-fix: Breakup long lines
|
2013-02-14 08:38:37 +01:00 |
|
Lukas Reschke
|
217328e0e3
|
Merge pull request #1514 from owncloud/fix-setup
Fix setup
|
2013-02-07 13:48:44 -08:00 |
|
Bart Visscher
|
20b6cb28b1
|
Fix warning with displayname in user layout template
|
2013-02-07 18:07:27 +01:00 |
|
Bart Visscher
|
149d079fd4
|
Move loading of js_config to templatelayout
Also check for installed flag because this isn't available before setup
|
2013-02-07 08:09:53 +01:00 |
|
Lukas Reschke
|
7f0a3018b6
|
Fix undefined variable
|
2013-01-26 13:46:00 +01:00 |
Michael Gapczynski
|
d39655e126
|
Move template parameters around so database error page is properly rendered
|
2013-01-07 14:15:51 -05:00 |
|
Bart Visscher
|
85bd28c508
|
Fix some of "Closing brace must be on a line by itself"
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
f39454ed12
|
Fix "Line indented incorrectly"
|
2012-12-15 00:43:46 +01:00 |
Felix Moeller
|
30d7993e01
|
Checkstyle fixes: NoSpaceAfterComma
|
2012-11-04 11:10:46 +01:00 |
|
Felix Moeller
|
561cbb2de6
|
NoSpaceAfterComma II
|
2012-10-23 23:01:10 +02:00 |
|
Felix Moeller
|
e73b817a38
|
Checkstyle: NoSpaceAfterComma
|
2012-10-23 22:53:54 +02:00 |
|
Bart Visscher
|
04824162d9
|
core.js and core.css don't need to be absolute
|
2012-10-17 10:52:16 +02:00 |
|
Bart Visscher
|
d4feb77eaf
|
Remove unused search code
|
2012-10-10 21:06:15 +02:00 |
|
Bart Visscher
|
c5983d37ad
|
No need to use array_search
|
2012-10-10 21:06:15 +02:00 |
Jörn Friedrich Dreyer
|
bf2d1e78f2
|
don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again
|
2012-09-11 13:16:34 +02:00 |
|
Bart Visscher
|
edcd297476
|
Move handling of core remotes to OC_TemplateLayout
|
2012-09-07 16:42:46 +02:00 |
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
|
Michael Gapczynski
|
e5cbc532c3
|
Fix password authentication for links and fix template problems for links by creating a new base layout
|
2012-08-29 11:54:49 -04:00 |
Robin Appelman
|
48306a3c4f
|
fix unused variables
|
2012-07-20 17:58:05 +02:00 |
|
Thomas Mueller
|
ba2d203a54
|
some path fixes for multi-dir app
|
2012-06-22 09:56:54 +02:00 |
|
Brice Maron
|
d22f805b63
|
Correct inclusion paths
|
2012-06-21 19:19:39 +00:00 |
|
Bart Visscher
|
3000e8f9d5
|
Prepare template js and css functions for use in the js and css minimizers
|
2012-06-18 15:40:48 +02:00 |
|
Bart Visscher
|
180243d92a
|
Move page layout handling to its own class
|
2012-06-18 15:40:48 +02:00 |