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
|
d825669265
|
Merge pull request #3002 from owncloud/priorize_common_languages
Priorize common languages.
|
2013-04-26 06:30:59 -07:00 |
Morris Jobke
|
e6f84397aa
|
Merge pull request #3098 from jerrac/displaynamesaveontimeout
On the Personal Settings page, made the display name save like the email address saves
|
2013-04-25 14:10:16 -07:00 |
Lukas Reschke
|
d41b600725
|
Add an update notification on every page for admin users
|
2013-04-24 18:47:38 +02:00 |
kondou
|
e8bb998ecc
|
Fix #3095.
|
2013-04-24 11:13:12 +02:00 |
David Reagan
|
7312cbec91
|
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
|
2013-04-23 12:45:12 -07:00 |
|
kondou
|
7a2be0c5dc
|
Make divider not selectable
Very hacky
|
2013-04-19 00:39:42 +02:00 |
|
kondou
|
79218be1d2
|
Priorize common languages.
|
2013-04-18 15:14:42 +02:00 |
Bernhard Posselt
|
4679e789e1
|
also adjust template properly for log date fix
|
2013-04-17 15:31:05 +02:00 |
|
Bernhard Posselt
|
18c873d1e5
|
Merge pull request #2554 from owncloud/hide-toggle-checkbox
Implements Hide / Display for the Password Toggle Button
|
2013-04-11 01:18:40 -07:00 |
|
raghunayyar
|
3d008b2ff3
|
New Password in Personal Password Page loads fine.
|
2013-04-11 12:34:46 +05:30 |
Robin Appelman
|
27f710d860
|
Users: fix "Other.." quota option for the default quota
|
2013-04-09 12:47:08 +02:00 |
|
Lukas Reschke
|
8000f9db74
|
Unescape the update hint
Fixes #2647
|
2013-04-02 16:39:21 +03:00 |
|
Morris Jobke
|
df74c0e43a
|
apply code review hints
|
2013-03-28 15:02:31 +01:00 |
|
Morris Jobke
|
d3ca97dd2f
|
Make it possible to show less log entries again - fix owncloud/core#1593
* show "less" button only if there are more than 3 entries
* only "remove" logs till last 3 entries
|
2013-03-27 15:14:09 +01:00 |
|
Lukas Reschke
|
fadb11253b
|
Merge branch 'master' into fixing-bugtracker-link-master
Conflicts:
core/templates/exception.php
settings/templates/help.php
|
2013-03-01 23:41:23 +01:00 |
Thomas Mueller
|
f9b454dab1
|
change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
|
2013-03-01 23:32:43 +01:00 |
|
Lukas Reschke
|
7311c2bb5d
|
Remove uneeded OAuth files
|
2013-02-27 23:26:00 +01:00 |
|
Lukas Reschke
|
229c907a57
|
[core] From echo to p
|
2013-02-27 22:55:39 +01:00 |
|
Thomas Mueller
|
c71fdf04d7
|
fixes 1933 - the locale name is no longer part of the translation string
|
2013-02-27 11:41:50 +01:00 |
|
Bart Visscher
|
19c5213b53
|
Join split translated strings
|
2013-02-21 23:47:56 +01:00 |
|
Bart Visscher
|
83f161d3f9
|
Style cleanup settings
|
2013-02-21 23:47:56 +01:00 |
Victor Dubiniuk
|
c5f6a77dbd
|
Correct new password input name
|
2013-02-18 21:15:32 +03:00 |
Jan-Christoph Borchardt
|
e8190c6511
|
fix user delete button not showing in IE, another SVG replacement issue
|
2013-02-14 13:01:51 +01:00 |
Frank Karlitschek
|
316807e0d3
|
Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
|
2013-02-12 11:05:07 -08:00 |
|
Robin Appelman
|
e68e5cc849
|
Split editable select code used for quota selection into a jquery plugin
|
2013-02-11 15:18:14 +01:00 |
|
Jan-Christoph Borchardt
|
40d8a2531d
|
move CSS to correct location, move and format php
|
2013-02-11 12:49:52 +01:00 |
|
Jan-Christoph Borchardt
|
47341eb4bd
|
spaces to tabs
|
2013-02-11 12:41:14 +01:00 |
|
Jan-Christoph Borchardt
|
2b586eb91c
|
correct target blank from image to link
|
2013-02-11 12:40:17 +01:00 |
Björn Schießle
|
45a4016878
|
Merge pull request #1552 from raghunayyar/personalpage-style-fix
Personal Page Password Toggle Loads Fine.
|
2013-02-10 07:31:05 -08:00 |
|
Thomas Müller
|
e68cf72458
|
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-09 09:58:05 -08:00 |
Jörn Friedrich Dreyer
|
bb656ca2fb
|
Merge pull request #1561 from Raydiation/master
Moved the iframe height and width fix from js to css
|
2013-02-09 08:56:12 -08:00 |
|
Bernhard Posselt
|
62122148bf
|
Revert "moved iframe height and width fix from js to css"
This reverts commit 842fc85b9a.
|
2013-02-09 17:46:23 +01:00 |
|
Bernhard Posselt
|
842fc85b9a
|
moved iframe height and width fix from js to css
|
2013-02-09 17:41:17 +01:00 |
|
Bernhard Posselt
|
f8335c4815
|
moved iframe height and width fix from js to css
|
2013-02-09 11:34:25 +01:00 |
|
Frank Karlitschek
|
c14f0b5637
|
add in new window
|
2013-02-09 09:30:59 +01:00 |
|
Frank Karlitschek
|
9bd45b26a5
|
add the buttons for the clients to the personal page.
Useful and prettier
|
2013-02-09 09:13:11 +01:00 |
|
raghunayyar
|
e8d17e4e8e
|
Personal Page Password Toggle Also Loads Well.
|
2013-02-09 11:40:07 +05:30 |
|
Thomas Müller
|
232a98524c
|
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-08 17:49:54 +01:00 |
|
Thomas Mueller
|
5788d36c8d
|
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
|
2013-02-07 10:44:28 +01:00 |
|
Thomas Mueller
|
84f3c8b6cc
|
show webdav test results in admin section as well
|
2013-02-07 00:49:39 +01:00 |
|
Lukas Reschke
|
e969a78cf9
|
Merge pull request #1443 from owncloud/use-module-file-info-master
we get best results regarding mime type detection if we use fileinfo - l...
|
2013-02-06 11:53:13 -08:00 |
Thomas Tanghus
|
3879e5d9c5
|
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
|
2013-02-06 08:13:45 -08:00 |
Georg Ehrke
|
0a16d25724
|
make it possible to modify the links to the clients
|
2013-02-06 15:20:43 +01:00 |
Björn Schießle
|
9d73e7eb1e
|
let the user change his display name, if supported by the back-end
|
2013-02-06 11:38:03 +01:00 |
Arthur Schiwon
|
5221ee0c5a
|
offer change password only when the action is supported by the user backend
|
2013-02-05 19:26:00 +01:00 |
|
Thomas Tanghus
|
b06ac67e07
|
Add 'hascontrols' class for content with fixed topbar.
|
2013-02-04 18:30:49 +01:00 |
|
Thomas Mueller
|
6058c2f734
|
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
|
2013-02-04 15:04:26 +01:00 |