Commit Graph

2083 Commits

Author SHA1 Message Date
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start
Conflicts:
	lib/util.php
2013-06-14 10:06:13 +02:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
Björn Schießle 15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +02:00
Thomas Tanghus 3584d48d65 Merge pull request #3679 from owncloud/multiselect-fixes
Multiselect fixes
2013-06-12 09:52:15 -07:00
Björn Schießle 2141c41d0d add logo-claim 2013-06-12 17:20:09 +02:00
Björn Schießle b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
Björn Schießle 918906f042 make footer aware of ownCloud editions 2013-06-12 14:49:30 +02:00
Björn Schießle 7c108edc36 mage page title aware of ownCloud edition 2013-06-12 14:33:24 +02:00
Jan-Christoph Borchardt cdedfb6f37 multiselect: up min-width of group multiselect to 150px 2013-06-11 18:23:29 +02:00
Jan-Christoph Borchardt 0bcb04398d multiselect: fixed 'add group' interface a bit 2013-06-11 18:21:13 +02:00
Jan-Christoph Borchardt 686797eb6d multiselect: more breathing space for entries 2013-06-11 18:08:47 +02:00
Jan-Christoph Borchardt 27996d1c64 multiselect: drop shadow for better focus 2013-06-11 18:04:33 +02:00
Jan-Christoph Borchardt 35e7b64cc2 multiselect: do not cut off group names 2013-06-11 18:04:11 +02:00
Jan-Christoph Borchardt e6a4721f64 checkstyle: add space after colon 2013-06-11 18:02:52 +02:00
Jan-Christoph Borchardt 09ff9b2a2c remove leading spaces 2013-06-11 18:01:50 +02:00
Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/tests/crypt.php
2013-06-11 15:19:02 +02:00
Jan-Christoph Borchardt abfbd9b136 feedback for hover/tap on breadcrumbs 2013-06-11 14:51:29 +02:00
Jan-Christoph Borchardt 651f1b0995 better contrast and grouping for blocks in personal settings through darker background color 2013-06-11 14:51:06 +02:00
Jan-Christoph Borchardt 2a936670ce better contrast for controls bar 2013-06-11 14:50:23 +02:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +02:00
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
Georg Ehrke a2bb0faec6 Merge branch 'master' into oc_preview 2013-06-10 10:15:53 +02:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Georg Ehrke 8114537310 Merge branch 'master' into oc_preview 2013-06-07 09:46:13 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Georg Ehrke 85ecec8b01 Merge branch 'master' into oc_preview 2013-06-06 11:13:55 +02:00
Björn Schießle 58fd76607b print a warning if a user wants to reset his password and encryption is enabled 2013-06-05 18:38:39 +02:00
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
opensaucesystems d987bea635 Added input[type="url"] to styles.css 2013-06-04 16:04:29 +02:00
Jenkins for ownCloud bc50d92841 [tx-robot] updated from transifex 2013-06-04 02:31:06 +02:00
Thomas Tanghus 861fe54f2b Forgot the css. 2013-06-04 00:19:42 +02:00
Thomas Tanghus 46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +02:00
Thomas Tanghus 5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +02:00
Thomas Tanghus afd723fdcd Let the content determine overflow. 2013-06-03 02:11:01 +02:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Thomas Tanghus 3fe46706af Update to jquery.multiselect 1.13 2013-06-02 19:53:18 +02:00
Thomas Tanghus bfcf113ce7 Forgot typeof condition 2013-06-01 16:47:34 +02:00
Thomas Tanghus 64c9fdcc28 Speed up octemplate rendering. 2013-06-01 16:38:35 +02:00
Jörn Friedrich Dreyer 476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
Jenkins for ownCloud 8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Georg Ehrke d8008ae421 Merge branch 'master' into oc_preview 2013-05-29 13:24:14 +02:00
Georg Ehrke fa6b96090a move to OC namespace 2013-05-29 12:46:54 +02:00
Jenkins for ownCloud 7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Jörn Friedrich Dreyer 1d720099c3 Merge pull request #3179 from pawl/patch-1
Improve IE Compatibility
2013-05-28 05:18:43 -07:00
Jörn Friedrich Dreyer da55c76168 Merge pull request #2778 from Kondou-ger/optimize_pictures
Optimize pictures with optipng.
2013-05-28 04:48:38 -07:00
Jenkins for ownCloud 3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
kondou 3001db6b50 Update jquery to 1.10.0 & add jquery-migrate 1.2.1 2013-05-27 20:13:13 +02:00
Jenkins for ownCloud 0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Georg Ehrke af57996d1e Merge branch 'master' into oc_preview 2013-05-25 12:16:25 +02:00
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Georg Ehrke 00985068ca add previews for public files 2013-05-22 15:13:02 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Jenkins for ownCloud d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Michael Gapczynski c62f230ddb Merge branch 'master' into move-maint-start 2013-05-21 11:26:56 -04:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Bernhard Posselt 71668cf08a Merge pull request #3399 from owncloud/fix_js_for_ie
cleanup after people who don't test in ie
2013-05-19 11:25:39 -07:00
Jenkins for ownCloud 9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +02:00
Michael Gapczynski 4687f50e75 Add undefined verision variables 2013-05-17 11:15:53 -04:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +02:00
Jörn Friedrich Dreyer 800c39fef1 cleanup after people who don't test in ie 2013-05-17 12:47:32 +02:00
Georg Ehrke 0305ee50c5 Merge branch 'master' into oc_preview 2013-05-17 11:41:30 +02:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +02:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +02:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +02:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +02:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jenkins for ownCloud 966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Jörn Friedrich Dreyer 591b383f2d peselect filename without extension on rename 2013-05-13 15:54:45 +02:00
Lukas Reschke 739f799912 Add requesttoken to guest view
Should fix #3321
2013-05-13 14:23:56 +02:00
Lukas Reschke 337e3ed61f Typo 2013-05-12 10:51:21 +02:00
Lukas Reschke 63d51980e1 Get config from template 2013-05-12 10:51:21 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Thomas Tanghus 83db2c83ad Merge pull request #3177 from owncloud/outerHTML_compatibility
Add compatibility function for outerHTML
2013-05-04 12:27:24 -07:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +02:00
Bart Visscher ff64c87adb Connect watcher failure function to the failure signal 2013-05-04 00:07:30 +02:00
Bart Visscher 41f7eb948a Move start of the maintenance mode to the ajax call
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +02:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +02:00
Paul Brown 215264706d Improve IE Compatibility
Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
2013-04-29 15:44:11 -05:00
Thomas Tanghus 048569754a Add compatibility function for outerHTML 2013-04-29 22:35:37 +02:00
Jan-Christoph Borchardt a5c72f1ad2 Merge pull request #3159 from owncloud/reword
Reword sentence and move HTML out of translation
2013-04-29 04:39:51 -07:00
Jenkins for ownCloud 2b36ad292d [tx-robot] updated from transifex 2013-04-29 02:00:26 +02:00
Lukas Reschke e3c9554856 Reword sentence and move HTML out of translation 2013-04-29 00:13:23 +03:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +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
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02: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
Bart Visscher 26e2672a5a Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Georg Ehrke f02aca3f6e add route for previews 2013-04-25 11:42:40 +02:00
Lukas Reschke b6fee2d257 Remove uneeded link 2013-04-24 22:39:04 +03: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
Raghu Nayyar 063e1238bf Merge pull request #3096 from owncloud/add_missing_space_for_new_groups
Fixing #3095
2013-04-24 09:33:37 -07:00
Jenkins for ownCloud 88fd3b088d [tx-robot] updated from transifex 2013-04-24 17:46:20 +02:00
kondou 6f5501bbc8 Fis syntax error and add user icon. 2013-04-24 14:17:13 +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
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
kondou 1e2efdddc9 Oneliners, <br>, proper errors & print_unescaped() 2013-04-23 12:38:25 +02:00
kondou 0d3afadab2 Don't split translation lines 2013-04-23 12:31:13 +02:00
kondou 06dfc95122 Fix syntax error. 2013-04-23 12:31:13 +02:00
kondou f1bcf6ef02 Improve the password reset screen.
Fixing #2752
2013-04-23 12:31:13 +02:00
Jenkins for ownCloud 05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Jan-Christoph Borchardt c7a17efc01 Merge pull request #2983 from owncloud/style-details
Style details
2013-04-22 07:12:19 -07:00
Jenkins for ownCloud 03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Morris Jobke 938b12236a modify password clone to password type right on submit to prevent the browser remind the content 2013-04-19 10:06:18 +02:00
Jenkins for ownCloud cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02: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 c8cafcefe4 move password warning more relevant below password field, un-nest log in warning 2013-04-17 17:16:15 +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
Bart Visscher f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
Jenkins for ownCloud 37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
kondou 3ab97312b8 Hint to default data directory
not to before submitted data directory.

Thanks to bartv2 for the heads up.
2013-04-16 09:54:34 +02:00
Jenkins for ownCloud d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Bernhard Posselt c829a9c156 Merge pull request #2934 from owncloud/shorten_css_colorcodes
Shorten CSS colorcodes
2013-04-15 14:46:51 -07:00
Thomas Tanghus 3f7643ef46 Merge pull request #2769 from owncloud/octemplate
Add octemplate jQuery plugin
2013-04-15 13:42:35 -07:00
Thomas Tanghus 155582ab70 Updated docs. 2013-04-15 22:10:29 +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
Jenkins for ownCloud e13e4c412f [tx-robot] updated from transifex 2013-04-15 02:12:43 +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
kondou d759dca203 Handle empty datafolder better.
If datafolder is erased, the default value will be shown as a placeholder.

If installation is submitted without a datafolder the default value will be used.
2013-04-13 15:56:01 +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
kondou c6dbb33e15 Fix textfield label overlapping value. 2013-04-13 14:48:16 +02:00
kondou 1871f43a52 Add shellscript for optimization. 2013-04-13 10:40:46 +02:00
Raghu Nayyar 618c9152e8 Merge pull request #2903 from owncloud/disabled-class
add .disabled class so it can be used for simple a buttons as well
2013-04-12 21:20:58 -07:00
raghunayyar 59be6a910c Implements Toggle for Database Password. 2013-04-13 09:45:30 +05:30
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
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
kondou 448a390486 Optimize svgs with scour. 2013-04-12 19:06:29 +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 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
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
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Bart Visscher 51e07a90b7 Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
Bart Visscher f9b77e392c Suppress the notice from the nullbyte check 2013-04-09 21:11:44 +02:00
kondou 5f89812a9b Fix #2730
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
kondou e44cc8ea57 Fix OC.dialogs.form()
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
Bernhard Posselt 27d8337728 Merge pull request #2697 from owncloud/button-css-fixes
Button css fixes
2013-04-09 03:04:34 -07:00
Jenkins for ownCloud 5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
kondou 9c53f35d9a Remove manual mimetype checking. 2013-04-08 23:00:02 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Morris Jobke 38941a61bf turn off autocompletion for password field
refs #2632
2013-04-07 21:51:10 +02:00
kondou f59aedff4f Optimize pictures with optipng. 2013-04-07 20:09:25 +02:00
Thomas Tanghus 870b73ce5a Add octemplate jQuery plugin 2013-04-06 23:24:43 +02:00
Thomas Tanghus 75af38c1bd Move compatibility functions to compatibility.js and add two more. 2013-04-06 22:37:15 +02:00
kondou 275badaf76 Make files _and_ directorys selectable/browsable.
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
Bart Visscher 46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +02:00
kondou 3e185911f1 Fix repeating directory names.
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
kondou fba6681f71 Make directories show at top. 2013-04-06 14:42:56 +02:00
kondou 6231e5be39 Make directories clickable.
A bit bugged though ...
2013-04-06 14:17:47 +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
Jan-Christoph Borchardt 5525fade11 Merge pull request #2737 from Kondou-ger/proper_css_comments
Proper CSS comment
2013-04-05 07:58:00 -07:00
root 74b02db337 Fixed things in alert-messages
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
2013-04-05 01:56:32 +02:00
root 69105fce00 Proper CSS comment
CSS comments don't work like that.
2013-04-05 01:17:52 +02:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +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
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Arthur Schiwon e25c1f3130 port 22c8194cc8 2013-04-02 21:03:13 +02:00
Jan-Christoph Borchardt 48afa39292 Merge pull request #2275 from owncloud/app-styles
CSS styles for applications to make a tree like layout easier
2013-04-02 04:24:06 -07:00
Jan-Christoph Borchardt c94580ba29 revert the untested not-working webroot stuff again ... grrr @Raydiation @stefannagtegaal 2013-04-02 11:52:57 +02:00
Jenkins for ownCloud 29d33ff7c2 [tx-robot] updated from transifex 2013-04-02 00:04:27 +02:00
Jenkins for ownCloud 9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Bernhard Posselt ab40634f33 Merge pull request #2622 from Kondou-ger/add_missing_backticks
Add (two) missing backticks.
2013-03-30 18:53:22 -07:00
Jenkins for ownCloud cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
root 7f74f08808 Add missing backticks.
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
Jenkins for ownCloud 5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Bernhard Posselt 86ac30c596 Merge pull request #2516 from kabum/master
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
Jenkins for ownCloud 7098bcd4b7 [tx-robot] updated from transifex 2013-03-28 00:03:44 +01:00
Arthur Schiwon c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
Arthur Schiwon 3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
Arthur Schiwon 18554059a4 Remove Debug output 2013-03-27 19:12:53 +01:00
Arthur Schiwon e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01: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
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
raghunayyar 8d7aa42b9a Removes the setTimeout() method. 2013-03-26 23:32:26 +05:30
raghunayyar 25a8690318 Fixes autofill for display / hide toggle button, a better function name. 2013-03-25 16:09:35 +05:30
raghunayyar d9cd9875e0 Initial Commit : Password Toggle Button hides if no input present 2013-03-25 04:30:09 +05:30
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
Jenkins for ownCloud 4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Morris Jobke 79d99b9c96 use simple markup to highlight groups in share autocomplete 2013-03-22 10:00:43 +01:00
Morris Jobke 8871629db5 replace hardcoded css style with css class - ref owncloud/core#173 2013-03-21 23:19:59 +01:00
Morris Jobke a1a6ef9409 share autocomplete - improve group appearance
highlight groups with markup (bold font) instead of "(group)" postfix

ref owncloud/core#173
2013-03-21 22:45:36 +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
Lukas Reschke ad2d222466 Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
Jenkins for ownCloud 3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Lukas Reschke 68d55648d5 Show a warning in the installer if the used PHP version is vulnerable to the NULL Byte attack 2013-03-20 08:44:33 +01:00
Lukas Reschke dc41cf081c Check if the installed PHP version has a fix for the nullbyte vulnerability 2013-03-20 08:43:54 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Doug Neiner b8c1a4da3e Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms 2013-03-17 22:21:34 -05:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Henning Oschwald 76bb5221c7 Restores keyboard accessibility for expandable settings area.
Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
2013-03-16 16:32:55 +01:00
Frank Karlitschek 761540e78b Merge pull request #2320 from ceri/master
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Björn Schießle 8154b4be7d use display name as sender for private link mails, approved in #2294 2013-03-14 13:26:20 +01:00
Ceri Davies 17cb47fbf6 Correct emails when folders are shared.
itemType is never "dir"; it's either "file" or "folder".
2013-03-14 10:04:58 +00:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Bernhard Posselt 1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Bernhard Posselt 9ad03b61a3 Update share.js
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski 6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Florian Hülsmann 0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00
Frank Karlitschek 19073e0711 Merge pull request #2167 from owncloud/input-type-fix
Input type fix
2013-03-07 07:28:22 -08:00
Thomas Müller a2aebbd742 Merge pull request #2130 from owncloud/fix_2128
fix #2128
2013-03-06 05:05:40 -08:00
Georg Ehrke a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Lukas Reschke 630ee644db Don't sanitize error message hint 2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt 114c6457a3 add email input type to styled inputs, fix #2097 2013-03-06 12:38:43 +01:00
Michael Gapczynski 5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Lukas Reschke 76e6369ec1 Merge pull request #2077 from owncloud/oc_filepicker_inline_js
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 13:49:52 -08:00
Jan-Christoph Borchardt 07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Thomas Tanghus e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +01:00
Bernhard Posselt 841daf4845 Merge pull request #2062 from owncloud/shareType
Sanitize shareWith
2013-03-03 16:27:51 -08:00
Lukas Reschke 577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Michael Gapczynski 0488968443 Merge pull request #2034 from owncloud/fix_bug47
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer 9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Georg Ehrke 620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke 22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Brice Maron 050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Thomas Müller 2af3bc3e77 Merge pull request #2022 from owncloud/fix-notice
Fix notice
2013-03-01 23:39:27 -08:00
Lukas Reschke 630483c75d Fix notice 2013-03-02 00:53:53 +01:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Georg Ehrke ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Bart Visscher 294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt fbb989f548 up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 2013-02-28 12:07:56 +01:00
Jan-Christoph Borchardt a2147c4f89 Merge pull request #1973 from owncloud/share-improvements
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 15:07:07 -08:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke 39e28c0170 Typo... 2013-02-27 23:19:38 +01:00
Lukas Reschke 6f14bec70a Add a missing ) 2013-02-27 23:15:18 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Lukas Reschke 40e51d13d2 Remove uneeded file 2013-02-27 22:35:37 +01:00
Bernhard Posselt 9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
Jan-Christoph Borchardt e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bernhard Posselt a09076c3ac Merge pull request #1955 from owncloud/login-button-alignment
quick fix for log in button not being aligned with input fields
2013-02-27 04:05:47 -08:00
Bernhard Posselt 0828bb7e0e Merge pull request #1957 from owncloud/fix-895
Fix 895
2013-02-27 03:10:29 -08:00
Thomas Müller 58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt a5d84b74d0 properly align triangle and unshare icons to text, also fixes line hopping 2013-02-27 11:30:33 +01:00
Jan-Christoph Borchardt 7ee5b2df13 fix ugly giant triangles 2013-02-27 11:30:06 +01:00
Jan-Christoph Borchardt 49cd9f20a6 fix shared by text going out of box, fix #895 2013-02-27 11:22:13 +01:00
Jan-Christoph Borchardt f36d92bbc1 Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
Jan-Christoph Borchardt 86ffa28f72 quick fix for log in button not being aligned with input fields 2013-02-27 11:04:08 +01:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Robin Appelman 47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01:00
Bart Visscher aa8bf3bbaa Merge pull request #1941 from owncloud/session_heartbeat
generate url only once for heartbeat
2013-02-26 11:49:59 -08:00
Bernhard Posselt a65b16f3e7 generate url only once 2013-02-26 20:45:25 +01:00
Lukas Reschke d3aecdab09 Merge pull request #1939 from owncloud/session_heartbeat
use 15 min instead of 15 sec timeout
2013-02-26 11:28:15 -08:00
Bernhard Posselt 81bb4363a2 use 15 min instead of 15 sec timeout 2013-02-26 20:25:07 +01:00
Frank Karlitschek 7eec31567f Merge pull request #1938 from owncloud/session_heartbeat
implemented a heartbeat request which is calls the server every 15 minut...
2013-02-26 11:02:09 -08:00
Bernhard Posselt 4e55348054 implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout 2013-02-26 19:34:46 +01:00
Jan-Christoph Borchardt 6f09f57008 remove more unused logo files, now in promo 2013-02-26 14:28:17 +01:00
Jan-Christoph Borchardt 7a47786afd align logo type pixel perfectly 2013-02-26 14:27:29 +01:00
Frank Karlitschek 69eb69be0e Merge pull request #1902 from owncloud/angularcsp
add CSP turned on for angularjs
2013-02-26 00:58:12 -08:00
Frank Karlitschek 072daf8850 Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
2013-02-26 00:19:42 -08:00
Michael Gapczynski 5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
	core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
Bernhard Posselt b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +01:00
Lukas Reschke 6735701c1e Merge pull request #1837 from owncloud/fix-user-template
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
Thomas Müller 6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Qingping Hou c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Thomas Müller 7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465
Fix 1465
2013-02-25 04:34:13 -08:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Thomas Mueller 9898ba4daf Merge branch 'master' into master-sqlserver
Conflicts:
	core/templates/installation.php
2013-02-22 22:59:09 +01:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Bart Visscher bf0b9bac8b Remove unneeded code for user layout template 2013-02-22 00:22:43 +01:00
Bart Visscher 59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher 19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher 1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Jan-Christoph Borchardt e7d1bbfae3 fix giant advanced caret in installation 2013-02-21 18:20:14 +01:00
Jörn Friedrich Dreyer 0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Arthur Schiwon eceb7341bb make number-input fields look like they should 2013-02-21 16:25:47 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Brice Maron 4f4e81d3d2 Add message when trouble sending email ref #1799 2013-02-20 21:14:55 +01:00
raghunayyar 6ecc3d7ee1 Reduced email input width by 10% to increase space. 2013-02-20 23:08:21 +05:30
Frank Karlitschek 18dab4a88e Merge pull request #1738 from owncloud/fix_multiselect_in_settings
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-20 08:34:26 -08:00
raghunayyar 326aae8a08 Hovering on the unshare doesnt spoil look 2013-02-20 21:59:12 +05:30
raghunayyar d8e8dab006 Fixes the Email Button and the email input Width. 2013-02-20 21:37:23 +05:30
raghunayyar 170a5856e9 Merge branch 'sharing-css-fix' into sharing-dropdown-fixes 2013-02-20 21:25:18 +05:30
Thomas Mueller 5062ae250b Merge branch 'master' into master-sqlserver
Conflicts:
	lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
Jörn Friedrich Dreyer 0efa4182dc Update office icons 2013-02-20 10:42:54 +01:00
Frank Karlitschek a085e4c435 Merge pull request #1720 from owncloud/usermenu-css
fix erroneous CSS, remove obsolete selectors
2013-02-19 10:44:58 -08:00
raghunayyar d82c9fd623 Text stays inside the sharing dropdown 2013-02-19 15:12:35 +05:30
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Thomas Mueller 2675290325 Merge branch 'master' into master-sqlserver 2013-02-18 11:39:04 +01:00
Jenkins for ownCloud 3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Thomas Tanghus 5a8e0f2048 Extra position check for multiselect dropdown. Fix app/issues/575 2013-02-16 19:56:56 +01:00
Jenkins for ownCloud 83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
Jan-Christoph Borchardt 953c87db9c fix erroneous CSS, remove obsolete selectors 2013-02-15 18:37:52 +01:00
Robin Appelman b8e2454f68 Fix strict standard warning in user template 2013-02-15 16:10:06 +01:00
Jan-Christoph Borchardt ac32ae79af Merge pull request #1683 from owncloud/ie-fixes
IE fixes
2013-02-15 03:32:31 -08:00
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Thomas Mueller 4b80466880 Merge branch 'master' into master-sqlserver
Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
2013-02-14 22:54:48 +01:00
Bart Visscher 9058d398a7 Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
2013-02-14 12:54:36 -08:00
Thomas Müller 4320f23c87 Merge pull request #1702 from owncloud/remove-images
remove unused images to lessen packaged size
2013-02-14 12:46:40 -08:00
Thomas Müller 29bf3552a2 Merge pull request #1703 from owncloud/firstrunwizard-icons
Firstrunwizard icons
2013-02-14 12:41:23 -08:00
Lukas Reschke 5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes
Sanitize HTML
2013-02-14 10:50:46 -08:00
Jan-Christoph Borchardt 5b20c30889 pixel align dark calendar and contacts icons 2013-02-14 18:52:32 +01:00
Jan-Christoph Borchardt 6adaf67f35 add dark calendar and contacts icon for firstrunwizard and others 2013-02-14 18:45:24 +01:00
Jan-Christoph Borchardt bb52271d22 exchange bright caret with dark triangle 2013-02-14 18:22:45 +01:00
Jan-Christoph Borchardt a410529b15 remove unused images to lessen packaged size 2013-02-14 18:20:53 +01:00
Lukas Reschke c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Bernhard Posselt db30f94fc8 Merge pull request #1697 from owncloud/navigation-details
Navigation details
2013-02-14 08:39:17 -08:00
Jan-Christoph Borchardt 3f09cc139f double speed for user menu slide 2013-02-14 17:13:50 +01:00
Jan-Christoph Borchardt 95575a7fd1 simplify noise (immense file size reduction), also apply to user menu and header, fix #1576 2013-02-14 17:06:08 +01:00
Jan-Christoph Borchardt 1edfe874f5 only style text, password and search inputs like inputs, instead of using unsupported :not selector 2013-02-14 15:53:36 +01:00
Jan-Christoph Borchardt 53a3a307e8 no ugly border around checkboxes or radio buttons 2013-02-14 15:47:14 +01:00
Thomas Mueller e643742eb3 adding prototype trim as fallback for IE8 2013-02-14 12:59:26 +01:00
Thomas Mueller 8065c73339 fixing eventsource.js for IE8 2013-02-14 12:20:22 +01:00
Thomas Mueller 8877087b57 adding a compatibility.js as a single source to define all fallback function declarations 2013-02-14 12:20:04 +01:00
Jan-Christoph Borchardt f9a6ed6c73 fix navigation icons SVG replacement, also hover and active opacity for IE 2013-02-14 10:59:30 +01:00
Jan-Christoph Borchardt 09d9138f84 fix caret on installation page for IE 2013-02-14 10:58:05 +01:00
Jan-Christoph Borchardt 7d8898065e only show navigation scrollbar on hover, when needed, to be less obtrusive 2013-02-14 09:58:31 +01:00
Bart Visscher d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Jan-Christoph Borchardt 6d7e324f4b Merge pull request #1574 from owncloud/installation-label-overflow
Installation label overflow, fix #871
2013-02-13 07:55:05 -08:00
Jenkins for ownCloud 8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
raghunayyar ed1c943f61 Makes password toggle button inside input. 2013-02-12 16:52:38 +05:30
Thomas Mueller 76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01:00
Jenkins for ownCloud fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Müller 58e57151e5 Merge pull request #1625 from owncloud/fix_shared_string
fix bug while changing string from "Share" to "Shared"
2013-02-11 12:39:16 -08:00
Jenkins for ownCloud 39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Björn Schießle 45ed0c6010 if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's 2013-02-11 15:37:01 +01:00
Jan-Christoph Borchardt efc70e27bc Merge pull request #1610 from owncloud/improved_personal_page
add the buttons for the clients to the personal page.
2013-02-11 03:51:11 -08:00
Robin Appelman a7bfee576b Fix breadcrumbs overlapping into the content, preventing the select all checkbox from being clickable in subfolders 2013-02-11 11:58:55 +01:00
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Bernhard Posselt f097fade01 Merge pull request #1601 from owncloud/lightbox-icons
add big white icons for lightbox, slideshow etc
2013-02-10 09:44:37 -08:00
Jan-Christoph Borchardt c5e17e099a split close and delete icon, add red hover for delete 2013-02-10 18:31:33 +01:00
Jan-Christoph Borchardt 0c4487d292 add big white icons for lightbox, slideshow etc 2013-02-10 18:06:18 +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
Administrator 41ec976fd7 Bugfixes and cleanup MS SQL Server installation 2013-02-10 13:07:59 +01:00
Jan-Christoph Borchardt 1ba44a3325 Merge pull request #1538 from raghunayyar/admin-password-toggle
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Thomas Müller 460faf3f97 Merge pull request #1569 from owncloud/clean-app-id
Remove invalid characters from app id to prevent loading of invalid reso...
2013-02-09 09:56:26 -08:00
Bernhard Posselt 0664b98b4f added icons and mimetypes for .msi and .exe files 2013-02-09 18:09:03 +01: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 43981e62e2 Revert "added exe and msi filetypes and icon"
This reverts commit aa1adf42c7.
2013-02-09 17:46:07 +01:00
Bernhard Posselt aa1adf42c7 added exe and msi filetypes and icon 2013-02-09 17:41:17 +01:00
Bernhard Posselt 842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Thomas Müller d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
Jan-Christoph Borchardt 79511f6d93 fixed database input group having two slightly thicker dividers 2013-02-09 17:14:20 +01:00
Jenkins for ownCloud 68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +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 8ff20ac683 ellipsize infield labels when too long, specifically fix #871 for database labels on installation 2013-02-09 17:13:02 +01:00
Bart Visscher 9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Thomas Müller 279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Thomas Müller 800609aaeb Merge pull request #1545 from owncloud/fix-oc_webroot
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
Thomas Müller c91334c54a Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
attach handlers to document instead of filelist
2013-02-09 03:23:19 -08:00
Bernhard Posselt f8335c4815 moved iframe height and width fix from js to css 2013-02-09 11:34:25 +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
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Thomas Müller f42ac97045 Merge pull request #1547 from owncloud/navigation-color
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
Jan-Christoph Borchardt bebdd113f5 use proper HTML for other security warning too 2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt c73f525050 brighter grey for the navigation bar, hopefully solves the weird similarity to the header 2013-02-08 19:33:22 +01:00
Bart Visscher d5f98a82aa fix-oc_webroot 2013-02-08 18:44:52 +01:00
Jan-Christoph Borchardt a26e66b232 improve and shorten security warning, add link to docs, fix #1342 2013-02-08 13:38:50 +01:00
raghunayyar eea4864c70 Removed whitespace from installation.php 2013-02-08 17:35:41 +05:30
raghunayyar b356b7065f Password Toggle Works on Installation as well. 2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer 43ffb5945c attach handlers to document instead of filelist, minor whitespace cleanups 2013-02-08 11:05:56 +01:00
Jenkins for ownCloud 59249ebc0c [tx-robot] updated from transifex 2013-02-08 00:13:16 +01:00
Tobias Ramforth d577f790c8 Added MS SQL Server support 2013-02-08 00:00:51 +01:00
Lukas Reschke 217328e0e3 Merge pull request #1514 from owncloud/fix-setup
Fix setup
2013-02-07 13:48:44 -08:00
Thomas Müller 867650ee47 Merge pull request #1529 from owncloud/installation-login-fixes
Installation login fixes
2013-02-07 13:40:25 -08:00
Lukas Reschke c0154558c7 Merge pull request #1526 from owncloud/l10n-support-master
L10n support master
2013-02-07 12:38:36 -08:00
Bart Visscher a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +01:00
blizzz fc7230349b Merge pull request #1530 from owncloud/fix-warning-displayname-layout
Fix warning with displayname in user layout template
2013-02-07 11:25:33 -08:00
Jan-Christoph Borchardt 8ca730f4c1 make show password toggle work for installation (once #1525 is fixed) 2013-02-07 18:07:38 +01:00
Bart Visscher 20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Jan-Christoph Borchardt 32e739f2ae make show password not specific to log in 2013-02-07 17:41:24 +01:00
Jan-Christoph Borchardt ee6884e336 remove duplicate show password toggle code, move current one to proper location 2013-02-07 17:04:03 +01:00
Jan-Christoph Borchardt ae7a80ede3 some comments for CSS documentation 2013-02-07 17:02:43 +01:00
Jan-Christoph Borchardt 867dc8e6dc fix database labels having left padding 2013-02-07 16:57:54 +01:00
Thomas Mueller 5f92d269dc l10n support enhanced in core 2013-02-07 16:49:36 +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
Bart Visscher 458ba4b55c Fix disabling setup form on submit 2013-02-07 08:12:09 +01:00
Bart Visscher c0b370f6cf Define the variables that are expected to exist but won't be set in setup 2013-02-07 08:11:18 +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
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Jan-Christoph Borchardt 4c406c9ab1 fix shorttag issue mentioned in #1357 2013-02-06 18:19:26 +01:00
Bart Visscher 3582f7bd09 Execute the post setup check after finishing the setup 2013-02-06 17:56:45 +01:00
Jan-Christoph Borchardt 2130262515 Merge pull request #1459 from owncloud/infield-detail
shift infield labels just a tiny bit to the right so the cursor doesn't ...
2013-02-06 08:23:53 -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
Thomas Tanghus 2d77c7c0fd Reduce top position for content below controls. 2013-02-06 16:56:26 +01:00
Jan-Christoph Borchardt 09a4424b1f Merge pull request #1497 from owncloud/collapse-usermenu
collapse user menu when inside one of the settings sections
2013-02-06 07:33:59 -08:00
Jan-Christoph Borchardt 8ea6398e48 collapse user menu when inside one of the settings sections 2013-02-06 16:03:01 +01:00
Thomas Müller efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Jan-Christoph Borchardt 964ff88f71 move inline style to CSS file, fix details 2013-02-06 15:15:20 +01:00
Jan-Christoph Borchardt 9961235c7b Merge pull request #1429 from owncloud/fix_addNavigation
Make app icon linkable when enabling app.
2013-02-05 05:47:14 -08:00
Jan-Christoph Borchardt 8ae1205b95 line up 'remember' text with checkbox 2013-02-05 12:49:33 +01:00
Jan-Christoph Borchardt 7eaa2d0de1 form detail on log in button, better shape 2013-02-05 12:48:30 +01:00
Jan-Christoph Borchardt c47fcf7d22 shift infield labels just a tiny bit to the right so the cursor doesn't overlap 2013-02-05 12:30:23 +01:00
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Tanghus b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Tanghus bb9be6f629 Add box-sizing to controls. 2013-02-04 00:24:34 +01:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Thomas Tanghus 1557b6d99d Fix leftcontent positioning. Ref #1255 2013-02-03 14:44:33 +01:00
Jan-Christoph Borchardt b8e6b8692b fix CSS to coding guideline 2013-02-03 12:24:24 +01:00
raghunayyar 3bcf3c91e1 Password Toggle Support for Login 2013-02-03 11:56:00 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Jan-Christoph Borchardt 48022f4525 Merge pull request #1395 from raghunayyar/webkit-scrollbar-534
Adds webkit scrollbar to ownCloud
2013-02-01 10:26:23 -08:00
Jenkins for ownCloud 94f7446724 [tx-robot] updated from transifex 2013-02-01 00:19:28 +01:00
Robin Appelman 5dd2c9152e fix breadcrumbs for gallery and texteditor 2013-02-01 00:14:39 +01:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
raghunayyar 0118606e09 More Visible webkit Scrollbar, syntax error solved. 2013-02-01 02:50:31 +05:30
Jan-Christoph Borchardt 45865b45c4 use translate string for Log out, remove title 2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt 6d560be564 fix svg fallback replacement for settings icons 2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt 3f3ae4a985 fix header for shared links 2013-01-31 20:19:32 +01:00
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Thomas Müller 0dd9e6cb12 Merge pull request #1387 from schiesbn/visual_improvements
small visual improvements
2013-01-31 08:30:25 -08:00
raghunayyar 5605297387 Adds webkit scrollbar to ownCloud 2013-01-31 21:51:44 +05:30
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Björn Schießle 9cd692a6d0 use the same tooltip as for the password field 2013-01-31 17:00:05 +01:00
Jan-Christoph Borchardt 43f8bf8e5c Merge pull request #1358 from owncloud/button-fix
increase opacity of buttons, fix for dark backgrounds like header in pub...
2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Jan-Christoph Borchardt f0ca8eeba4 no box-shadow for public share download button 2013-01-31 15:21:50 +01:00
Jan-Christoph Borchardt cbafea4cc8 increase opacity of inactive apps and settings entries for better visibility 2013-01-31 14:32:07 +01:00
Jan-Christoph Borchardt 1144b61db3 vertical scrollbar for app navigation when too many apps 2013-01-31 14:14:12 +01:00
Jan-Christoph Borchardt 90aa1b3532 ellipsize long app names in navigation 2013-01-31 14:04:33 +01:00
Jan-Christoph Borchardt c801b86bc2 Merge pull request #1359 from raghunayyar/navigation
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Jan-Christoph Borchardt 300ecc2ed2 change button box-shadow from hard white to slight transparent 2013-01-31 12:59:36 +01:00
Björn Schießle 54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jan-Christoph Borchardt 228a181d48 use new user function to display real name if available, username still fallback 2013-01-30 18:35:53 +01:00
Jörn Friedrich Dreyer d7823adb07 attach to filelist which is present on .ready() 2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
raghunayyar 0dfbd53a6e Reduced Styling and Image loads as from src and not backgorund. 2013-01-30 19:12:51 +05:30
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Björn Schießle 9639544ca0 make background transparent 2013-01-30 12:56:22 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle d19de49606 prevent xss 2013-01-29 22:32:59 +01:00
raghunayyar d620495e92 No Image Repetition on Enabling Apps in Navigation Bar 2013-01-30 00:54:23 +05:30
Jan-Christoph Borchardt e2f1a445ed increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188 2013-01-29 19:13:39 +01:00
Thomas Mueller 825cdf8560 add support for apps to register alternative login methods
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Björn Schießle d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski 5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Michael Gapczynski ed2ee8c411 Change file action text for files inside shared folders as well 2013-01-28 23:16:29 -05:00
Michael Gapczynski ede7fccb00 Change file action text to 'Shared' 2013-01-28 23:13:38 -05:00
Jenkins for ownCloud 8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Jan-Christoph Borchardt feb65c89f2 update Files icon from home to files, update Home icon from checkbox to home 2013-01-28 19:20:07 +01:00
Björn Schießle 590c4aa710 search display name instead of uid; fix key/value order for array access 2013-01-28 15:58:40 +01:00
Jan-Christoph Borchardt aaac2414ea undo padding change on buttons, otherwise it will mess up the upload and new buttons again 2013-01-28 13:16:30 +01:00
Jan-Christoph Borchardt 329d965441 merge changes in navigation 2013-01-28 10:52:15 +01:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Lukas Reschke 9e498b6548 Merge pull request #1326 from owncloud/event-source-token
Use global oc_requesttoken for Event Source
2013-01-26 15:18:23 -08:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Michael Gapczynski 0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski 31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00