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

488 commits

Author SHA1 Message Date
Georg Ehrke
cf492a9649 Merge branch 'master' into calendar_sharing 2012-04-18 11:51:59 +02:00
Georg Ehrke
69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Robin Appelman
cfd0140e2f fix 2 potential xss problems 2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt
3c182bdb35 adding sticker logo jpg 2012-04-16 12:57:17 +02:00
Jan-Christoph Borchardt
961c239ee4 improving leftcontent display, increasing item height 2012-04-16 12:52:48 +02:00
Jan-Christoph Borchardt
70d0103a67 updated logos and icons 2012-04-16 11:34:16 +02:00
Georg Ehrke
dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Jan-Christoph Borchardt
e5cda3abcd tooltip for delete shows up to the left 2012-04-15 17:49:54 +02:00
Jan-Christoph Borchardt
1f91224f9e fixing opacity and fading, also for IE 2012-04-15 14:37:42 +02:00
Georg Ehrke
8ddea7e95c Merge branch 'master' into calendar_sharing 2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt
7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Jan-Christoph Borchardt
5868199e85 fixed settings hover, now whole row sensitive and fading not jerky 2012-04-15 13:34:30 +02:00
Georg Ehrke
e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Jan-Christoph Borchardt
fbb314ef4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 18:56:55 +02:00
Bart Visscher
30498fd6f8 Use offset function to position block elements 2012-04-14 18:31:41 +02:00
Jan-Christoph Borchardt
a0a5668d1e increase opacity of search field and logout icon 2012-04-14 17:20:50 +02:00
Robin Appelman
b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Georg Ehrke
afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Bart Visscher
b8466d362e Fix rescan "File not Found" error handling in oc-vcategories.js 2012-04-13 21:13:58 +02:00
Jan-Christoph Borchardt
eea0d2e096 fixing delete tooltip 2012-04-13 18:28:17 +02:00
Jan-Christoph Borchardt
add9673ad6 merging tanghus category CSS 2012-04-13 17:23:56 +02:00
Jan-Christoph Borchardt
31df4c00ec adding tipsy tooltips for file actions 2012-04-13 17:22:23 +02:00
Bart Visscher
bc81179163 Fix categories delete fallback when there is no app specific ajax categories delete function 2012-04-12 23:10:49 +02:00
Frank Karlitschek
56bc2c4591 add a title attribute to the logout button 2012-04-12 20:34:56 +02:00
unknown
2f3c0a6d80 wrong defaultValue definition in OC.AppConfig.getValue 
done
 2012-04-12 19:14:25 +02:00
Georg Ehrke
ac2d14101c Merge branch 'master' into calendar_sharing 2012-04-10 20:10:07 -04:00
Bart Visscher
9f547a1b39 VCategories: fix function names to coding standard 2012-04-10 21:53:51 +02:00
Thomas Tanghus
d1ae6512cc Contacts: Misc. cleanup tweaks. 2012-04-07 16:03:43 +02:00
Bartek Przybylski
96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Bartek Przybylski
fe3d3be399 filepicker loading style fixup 2012-04-05 22:25:58 +02:00
Bartek Przybylski
5b4a303672 loading screen for filepicker 2012-04-05 21:29:54 +02:00
Florian Hülsmann
8a2c5dda6d Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102 2012-04-04 21:36:50 +02:00
Tom Needham
85f9869f69 Make the token really random 2012-04-04 13:18:02 +00:00
Tom Needham
95c2ac5d58 Dont typecast variables as integers 2012-04-03 21:14:55 +00:00
Bartek Przybylski
cd05dfb943 adding icons to filepicker 2012-04-03 22:18:03 +02:00
Bartek Przybylski
ff5dbc52b8 multiselect handle for filepicker 2012-04-02 21:32:35 +02:00
Bartek Przybylski
f21d6d4f9f dialogs filepicker first draft 2012-04-02 19:39:24 +02:00
Robin Appelman
d01b78a4b4 prevent an possible xss exploit 2012-04-01 00:55:49 +02:00
Bartek Przybylski
4e327295c6 adding callback when ok click on alert dialog 2012-04-01 00:30:52 +02:00
Robin Appelman
2f68b08491 fix eventsource for ie 2012-03-31 16:40:42 +02:00
Robin Appelman
ad495a9218 fix potential problem when using multiply eventsource's 2012-03-31 16:10:29 +02:00
Bartek Przybylski
6b704a780d select field added to oc.dialogs.form, gallery ported to use it 2012-03-30 22:50:57 +02:00
Georg Ehrke
d15959d573 Merge branch 'master' into calendar_sharing 2012-03-29 23:19:31 +02:00
Arthur Schiwon
e2fd0bbf02 IE 8: fix appeareance of checkboxes on login and files pages 2012-03-29 18:32:25 +02:00
Georg Ehrke
ede0a675bc Merge branch 'master' into calendar_sharing 2012-03-27 20:53:40 +02:00
Thomas Tanghus
0a07e5fdaa Added some documentation. 2012-03-27 12:30:20 +02:00
Georg Ehrke
96dd008f5e Merge branch 'master' into calendar_sharing 2012-03-26 09:50:39 +02:00
Georg Ehrke
ec40f69c9e add error 403 site 2012-03-25 14:16:39 +02:00
Georg Ehrke
19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Bartek Przybylski
cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +01:00
Nils Jansen
7ed8f39744 as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype. 2012-03-23 13:34:07 +01:00
Georg Ehrke
61166c1002 Merge branch 'master' into calendar_sharing 2012-03-21 09:43:29 +01:00
Georg Ehrke
03120959e9 add a proper email address for lostpassword service - bugfix for oc-178 2012-03-19 09:09:18 +01:00
Georg Ehrke
27218f85cb Merge branch 'master' into calendar_sharing 2012-03-16 12:17:58 +01:00
Thomas Tanghus
03eb5197b6 Added category editor for apps using OC_VObjects. 2012-03-12 14:13:03 +01:00
Bart Visscher
ab760578f8 Allow overflow of rightcontent area 2012-03-07 21:46:42 +01:00
Georg Ehrke
c40668e3a9 Merge branch 'master' into calendar_sharing 2012-03-04 10:10:19 +01:00
Bartek Przybylski
c411826fe5 moving gallery op to one file, migrate gallery dialogs to oc dialogs 2012-03-04 00:35:37 +01:00
Georg Ehrke
f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Bartek Przybylski
2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Alessandro Cosentino
630cee0ef2 bookmarklets should not look like buttons 2012-02-27 18:20:40 -05:00
Roland van Laar
2a351f4456 Fixed off by one bug. List length is 1 larger than the index of the last 
element.
 2012-02-26 22:09:21 +01:00
Robin Appelman
3d0d47957e improved humanFileSize for js 2012-02-26 14:12:50 +01:00
Robin Appelman
a5e892505e more robust png fallback 2012-02-26 03:10:29 +01:00
Robin Appelman
797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Georg Ehrke
bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Robin Appelman
8b93a9a237 add javascript bindings for OC_AppConfig 2012-02-25 16:35:40 +01:00
Robin Appelman
862f824d64 some multiselect improvements 2012-02-25 16:35:40 +01:00
Robin Appelman
11cb45bd43 slight change to select style 2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe
b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Thomas Mueller
6540bda238 some icons for filetypes have been added. 
for licensing information please have look at core/img/filetypes/readme-2.txt
 2012-02-20 22:33:38 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Georg Ehrke
01827e9340 Merge branch 'master' into calendar_sharing 2012-02-13 17:08:52 +01:00
Bart Visscher
a25bda8e41 Add application name to title 2012-02-12 21:56:01 +01:00
Georg Ehrke
a8b7ae515c Merge branch 'master' into calendar_sharing 2012-02-10 19:36:00 +01:00
Thomas Tanghus
c95e8a1fc5 Added custom combobox widget. 2012-02-10 16:40:40 +01:00
Thomas Tanghus
90a830baba Added files for new contact editor/viewer. 2012-02-08 07:59:39 +01:00
Georg Ehrke
f91702d7b5 Merge branch 'master' into calendar 2012-01-31 17:03:48 +01:00
Robin Appelman
fdf3df3de5 add option to send get data along with an eventsource request 2012-01-31 16:35:47 +01:00
Georg Ehrke
538618df62 Merge branch 'master' into calendar 2012-01-31 11:58:40 +01:00
Georg Ehrke
217151eb9c add textfield style declaration 2012-01-31 11:50:45 +01:00
Robin Appelman
6a1121ab2e provide server side close option for EventStream 2012-01-30 23:19:58 +01:00
Robin Appelman
45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Robin Appelman
039bbfde2d automatically show advanced options when no sqlite is available 2012-01-29 18:00:55 +01:00
Robin Appelman
ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman
6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman
7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Robin Appelman
965ea96439 update translations 2012-01-16 17:34:53 +01:00
Robin Appelman
b366b0eb52 quick fix for javascript translations 2012-01-16 00:09:43 +01:00
Robin Appelman
a883fcca3c add user and instance awere localstorage to prevent collisions when using localstorage 2012-01-15 19:22:32 +01:00
Robin Appelman
7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Georg Ehrke
9c04858631 added vcards to the mimetype fix list and renamed the icon for vcards 2012-01-15 11:02:08 +01:00
Robin Appelman
872d301af3 fix inconsitent behaviour when trying to remove yourself from the admin group 2012-01-15 00:50:01 +01:00
Robin Appelman
5cd6e0f4d9 remove some of the flickering in opera 2012-01-15 00:14:42 +01:00
Robin Appelman
56af6ee752 fix some of the styling issues on opera 2012-01-14 23:47:31 +01:00
Robin Appelman
0ac9e56da9 small fix for server svg mimetype detection 2012-01-14 23:41:48 +01:00
Robin Appelman
5eb6071b04 make the minimum width of the multiselect configurable 2012-01-14 23:10:14 +01:00
Tom Needham
ffd47ef4d7 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-13 16:55:55 +00:00
Robin Appelman
f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Tom Needham
3f67918522 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-09 21:17:41 +00:00
Tom Needham
6c78cd2765 Moved .separator to core css 2012-01-09 18:39:09 +00:00
Tom Needham
6dcabdc61c Fixed merge conflict in /files/ajax/move.php 2012-01-04 16:31:06 +00:00
Georg Ehrke
a1af757ef6 Fix whitespace username in the installation form 2012-01-02 14:21:46 +01:00
Robin Appelman
1415cb8d19 add infieldlabel source 2012-01-01 23:48:38 +01:00
Tom Needham
cbb2db8622 Fix merge conflicts 2012-01-01 01:18:02 +00:00
Tom Needham
5ebf8a87f2 Removed old jquery-ui css and js 2011-12-30 23:08:44 +00:00
Tom Needham
39e67707d7 Updated jquery ui js and css. Improved color scheme. 2011-12-30 22:47:39 +00:00
Bart Visscher
e1b9b65e41 Use correct appid for lostpassword email preference 2011-12-18 23:10:43 +01:00
Georg Ehrke
e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Robin Appelman
2c68aab198 Merge branch 'master' into newbutton 2011-11-04 03:00:03 +01:00
Brice Maron
c7d1737d47 attempt to manage some special chars in file list 
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
 2011-11-01 22:35:13 +01:00
Bart Visscher
9832a0817d Merge branch 'master' into fullcalendar 
Conflicts:
	apps/calendar/index.php
 2011-10-24 22:40:22 +02:00
Jan-Christoph Borchardt
abf33d32b9 use existing correct info icons 2011-10-23 21:53:00 +02:00
Jan-Christoph Borchardt
0c890a501c upgraded the new new button. Didn't and doesn't work in Firefox though 2011-10-23 21:51:56 +02:00
Jan-Christoph Borchardt
4140a75a5e corrected position of in-field labels a bit 2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt
c28504deca textfield is now less obtrusive / opaque 2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt
93c18e9ae3 added all logo source SVGs 2011-10-23 11:46:34 +02:00
Robin Appelman
d46288b0ab 'New' button, needs some css work 2011-10-23 11:40:40 +02:00
Bart Visscher
92fa6f0a48 Fix size calculation with css styling of tipsy popup 2011-10-21 22:08:55 +02:00
Georg Ehrke
9ce15667d5 Merge branch 'calendar' of gitorious.org:owncloud/owncloud 2011-10-16 15:41:00 +02:00
Brice Maron
5d09a5e37e Add some color in error messages + img for hints 2011-10-16 13:12:11 +02:00
Georg Ehrke
323a98adb7 Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar 2011-10-15 17:16:00 +02:00
Brice Maron
8d4039b678 Add loading message to image lightbox and tweak events 2011-10-14 23:51:51 +02:00
Brice Maron
169dd7da77 Prevent category in jquery-ui on cal. to overflow 2011-10-14 19:09:07 +02:00
Brice Maron
c0b011e714 Initialise hasOtherDB var when not true in installation 2011-10-14 18:04:50 +02:00
Georg Ehrke
a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman
d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Tom Needham
deaeab3d92 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-08 15:47:03 +01:00
Marvin Thomas Rabe
bbd96fdd39 webkit searchfield bug fixed 2011-10-08 16:02:43 +02:00
Jan-Christoph Borchardt
71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Tom Needham
538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman
1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham
65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Jan-Christoph Borchardt
ab5e26dd32 renamed icons 2011-10-07 16:30:37 +02:00
Jan-Christoph Borchardt
fa72f1c3cc some icon corrections 2011-10-07 16:18:47 +02:00
Jan-Christoph Borchardt
0aaa1fb64e added Silk icons by Mark James (CC-BY) 2011-10-07 16:05:39 +02:00
Bart Visscher
980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Marvin Thomas Rabe
e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Bart Visscher
3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +02:00
Marvin Thomas Rabe
7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00
Tom Needham
2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe
d1518f2901 updated calendar settings 2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Marvin Thomas Rabe
314e84716b changed shadow transparency to 50% 2011-10-04 18:58:38 +02:00
Marvin Thomas Rabe
de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00
Tom Needham
5c9b069fe5 Updated saving feedback to use loading.gif 2011-10-04 17:43:13 +01:00
Marvin Thomas Rabe
b60f755f4f fixed height of infield labels 2011-10-04 18:42:53 +02:00
Bart Visscher
e8c6252a4c Move lostpassword to core dir 2011-10-03 20:44:01 +02:00
Marvin Thomas Rabe
6d8985ceb2 added infield labels. readded fade in of login button. updated label on install page. 2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe
481a37fcf3 Show database only in advanced 2011-10-03 13:32:16 +02:00