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

397 commits

Author SHA1 Message Date
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
67b6ee661d Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen 
Improve the password reset screen.
 2013-04-26 05:33:09 -07:00
raghunayyar
175fc0c737 Clubbing Exact styles together. 2013-04-24 23:47:39 +05:30
Lukas Reschke
d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
kondou
e15afcb011 Add space around checkboxes. 2013-04-24 11:58:12 +02:00
kondou
e8bb998ecc Fix #3095. 2013-04-24 11:13:12 +02:00
kondou
f1bcf6ef02 Improve the password reset screen. 
Fixing #2752
 2013-04-23 12:31:13 +02:00
Jan-Christoph Borchardt
c7a17efc01 Merge pull request #2983 from owncloud/style-details 
Style details
 2013-04-22 07:12:19 -07:00
Raghu Nayyar
a3e5da834b Merge pull request #2925 from owncloud/navigation-icon-fix 
fix navigation hover effect, documentation
 2013-04-17 10:20:36 -07:00
Jan-Christoph Borchardt
d83adb8b84 remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px 2013-04-17 17:36:30 +02:00
Jan-Christoph Borchardt
3d47c62a20 apply navigation hover effect directly to img and span, cleaner code 2013-04-17 17:23:12 +02:00
Jan-Christoph Borchardt
21bcb95e2a move warning and error states together in CSS, to be cleaned up 2013-04-17 17:15:34 +02:00
Jan-Christoph Borchardt
9f58166339 make textarea inherit ownCloud font instead of using monospace 2013-04-17 16:30:42 +02:00
Jan-Christoph Borchardt
ca323e56c2 correct primary color to #1d2d44 where slightly wrong 2013-04-17 11:55:27 +02:00
kondou
0f86ed3ad5 Shorten CSS colorcodes 
Only need to be three digits.
 2013-04-15 21:07:45 +02:00
Bernhard Posselt
19526c9cf6 also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly 2013-04-15 20:29:45 +02:00
Jan-Christoph Borchardt
846f77ed92 additional comments 2013-04-14 19:30:16 +02:00
Jan-Christoph Borchardt
694c080dd2 fix navigation hover effect, documentation 2013-04-14 19:25:46 +02:00
Bernhard Posselt
210bec0d31 Merge pull request #2910 from owncloud/password-toggle-db-2 
Implements Toggle for Database Password.
 2013-04-13 06:10:41 -07:00
raghunayyar
59be6a910c Implements Toggle for Database Password. 2013-04-13 09:45:30 +05:30
Jan-Christoph Borchardt
c9c83c6185 add .disabled class so it can be used for simple a buttons as well 2013-04-12 19:18:11 +02:00
Bernhard Posselt
a56dc4bc94 dont overwrite background image when hovering over button 2013-04-12 14:30:16 +02:00
Jan-Christoph Borchardt
2e04a35277 use proper sans-serif font-stack 2013-04-11 17:20:24 +02:00
Bernhard Posselt
a028ba930a Merge pull request #2853 from owncloud/long-file-names 
Application Names Ellipsise when the name length exceeds the width of the navigation.
 2013-04-10 15:02:37 -07:00
raghunayyar
da882b1320 The Opacity for the navigation loads fine for icon and App name. 2013-04-10 19:30:28 +05:30
raghunayyar
000a568b4a Long Application Names are ellipsis correctly. 2013-04-10 19:14:50 +05:30
Bart Visscher
51e07a90b7 Merge pull request #2758 from Kondou-ger/refactor_OCdialogs 
Refactor OCdialogs.
 2013-04-09 13:24:04 -07:00
Bernhard Posselt
27d8337728 Merge pull request #2697 from owncloud/button-css-fixes 
Button css fixes
 2013-04-09 03:04:34 -07:00
kondou
3e185911f1 Fix repeating directory names. 
Also fix some CSS for Firefox.
 2013-04-06 16:46:40 +02:00
kondou
1919acd68f Small fixes 
* escapeHTML(everything)
 * curly braces for if
 * camelcase function_to_call
 * add missing semicolae (?)
 2013-04-06 12:16:55 +02:00
kondou
0be80abe70 Refactor OCdialogs. 
Fix #2557 and make the whole code more usable.
 2013-04-06 10:07:12 +02:00
root
69105fce00 Proper CSS comment 
CSS comments don't work like that.
 2013-04-05 01:17:52 +02:00
Jan-Christoph Borchardt
cd079e3421 group some selectors again 2013-04-03 20:06:26 +02:00
Jan-Christoph Borchardt
a35d869e15 add styles for disabled input fields 2013-04-03 18:45:03 +02:00
Jan-Christoph Borchardt
1c55b3a969 button selector cleanup 2013-04-03 17:55:31 +02:00
Jan-Christoph Borchardt
c94580ba29 revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal 2013-04-02 11:52:57 +02:00
Jan-Christoph Borchardt
994a8797e4 remove extra type selector qualification for ID and class names 2013-03-27 17:39:09 +01:00
Jan-Christoph Borchardt
0b1dc7b0cc also use SVG for settings cog 2013-03-27 17:33:25 +01:00
Jan-Christoph Borchardt
5aa1ca5882 use SVG for folder image 2013-03-27 17:32:37 +01:00
Jan-Christoph Borchardt
bcf1b6f9f8 soften highlight for navigation entries 2013-03-27 17:11:40 +01:00
Jan-Christoph Borchardt
e167ccc5c6 modify app styles to adhere to coming CSS coding guidelines 2013-03-27 16:14:17 +01:00
Bernhard Posselt
c022dbe5c8 added %webroot% instead of relative path 2013-03-23 00:37:31 +01:00
Bernhard Posselt
bee9f7ebc6 also make bottom border grey on first level hover 2013-03-23 00:35:18 +01:00
Bernhard Posselt
adaf1d1959 small fixes 2013-03-23 00:35:18 +01:00
Bernhard Posselt
5d3e3a0a75 added app stylings to core 2013-03-23 00:35:18 +01:00
yannickoo
43b928aca6 Fixed typo 2013-03-21 18:46:59 +01:00
yannickoo
55fc03fda4 No Scrolling for more than approximately 10 Applications 2013-03-21 18:37:23 +01:00
Florian Hülsmann
0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00