comparison lib/redmine/.svn/entries @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 851510f1b535
children
comparison
equal deleted inserted replaced
512:b9aebdd7dd40 514:7eba09d624db
1 10 1 10
2 2
3 dir 3 dir
4 4411 4 6270
5 http://redmine.rubyforge.org/svn/trunk/lib/redmine 5 http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine
6 http://redmine.rubyforge.org/svn 6 http://redmine.rubyforge.org/svn
7 7
8 8
9 9
10 2010-11-14T16:24:21.989522Z 10 2011-07-11T11:45:14.631570Z
11 4406 11 6261
12 jplang 12 jplang
13 13
14 14
15 15
16 16
33 file 33 file
34 34
35 35
36 36
37 37
38 2010-09-23T14:37:45.031809Z 38 2011-07-14T09:24:10.000000Z
39 7905a0773e7d2f6b468fc5b9e107db4d 39 85ff863202dfbf2a6e9447a3bcf7cc06
40 2010-01-17T13:53:13.544777Z 40 2011-01-22T12:09:07.652831Z
41 3330 41 4737
42 jplang 42 jplang
43 has-props 43 has-props
44 44
45 45
46 46
47 47
48 48
49 49
50 50
51 51
52 52
53 53
54 54
55 55
56 56
57 57
58 58
59 59
60 60
61 61
62 62
63 63
64 2173 64 2461
65
66 codeset_util.rb
67 file
68
69
70
71
72 2011-06-06T13:20:53.000000Z
73 49dc0eec18109d69f897a5e3e1e7a44b
74 2011-04-16T06:43:49.720334Z
75 5474
76 tmaruyama
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98 744
65 99
66 themes.rb 100 themes.rb
67 file 101 file
68 102
69 103
70 104
71 105
72 2010-09-23T14:37:45.043748Z 106 2011-07-14T09:24:10.000000Z
73 209d3f63cbc76795042695c71f6230f1 107 23fd3a13b8bcd6b3e2547e913d5fae18
74 2010-04-30T12:44:19.138265Z 108 2010-12-22T21:41:08.746858Z
75 3710 109 4559
76 jplang 110 jplang
77 has-props 111 has-props
78 112
79 113
80 114
81 115
82 116
83 117
84 118
85 119
86 120
87 121
88 122
89 123
90 124
91 125
92 126
93 127
94 128
95 129
96 130
97 131
98 2311 132 3420
99 133
100 imap.rb 134 imap.rb
101 file 135 file
102 136
103 137
104 138
105 139
106 2010-09-23T14:37:45.031809Z 140 2011-07-14T09:24:10.000000Z
107 caeedebd5c05aede1d232510d03ad136 141 caeedebd5c05aede1d232510d03ad136
108 2008-12-31T14:56:30.439880Z 142 2008-12-31T14:56:30.439880Z
109 2220 143 2220
110 jplang 144 jplang
111 has-props 145 has-props
138 file 172 file
139 173
140 174
141 175
142 176
143 2010-09-23T14:37:45.031809Z 177 2011-07-14T09:24:10.000000Z
144 ddadcd03b97455adae2451a2140afbf6 178 ddadcd03b97455adae2451a2140afbf6
145 2009-05-30T23:00:22.602473Z 179 2009-05-30T23:00:22.602473Z
146 2776 180 2776
147 edavis10 181 edavis10
148 has-props 182 has-props
172 file 206 file
173 207
174 208
175 209
176 210
177 2010-09-23T14:37:45.015759Z 211 2011-07-14T09:24:10.000000Z
178 41c2852d003d94cb23c231f06be62d12 212 41c2852d003d94cb23c231f06be62d12
179 2008-01-20T13:07:19.003764Z 213 2008-01-20T13:07:19.003764Z
180 1081 214 1081
181 jplang 215 jplang
182 has-props 216 has-props
200 234
201 235
202 236
203 1160 237 1160
204 238
239 helpers
240 dir
241
205 utils.rb 242 utils.rb
206 file 243 file
207 244
208 245
209 246
210 247
211 2010-09-23T14:37:45.047759Z 248 2011-07-14T09:24:10.000000Z
212 d04b071ce8f05b44ca6993c56fea9b1f 249 d04b071ce8f05b44ca6993c56fea9b1f
213 2009-01-04T17:09:25.896068Z 250 2009-01-04T17:09:25.896068Z
214 2234 251 2234
215 jplang 252 jplang
216 has-props 253 has-props
234 271
235 272
236 273
237 1466 274 1466
238 275
239 helpers
240 dir
241
242 access_control.rb 276 access_control.rb
243 file 277 file
244 278
245 279
246 280
247 281
248 2010-09-23T14:37:45.015759Z 282 2011-07-14T09:24:10.000000Z
249 e7e4c44515553e36bffa6e8f8960080b 283 e7e4c44515553e36bffa6e8f8960080b
250 2008-09-25T18:51:03.022592Z 284 2008-09-25T18:51:03.022592Z
251 1907 285 1907
252 jplang 286 jplang
253 has-props 287 has-props
277 file 311 file
278 312
279 313
280 314
281 315
282 2010-09-23T14:37:45.043748Z 316 2011-07-14T09:24:10.000000Z
283 6f968bcc4f81562e9cbddb02ebc62601 317 6f968bcc4f81562e9cbddb02ebc62601
284 2010-02-17T20:05:51.124365Z 318 2010-02-17T20:05:51.124365Z
285 3444 319 3444
286 jplang 320 jplang
287 has-props 321 has-props
308 2631 342 2631
309 343
310 core_ext 344 core_ext
311 dir 345 dir
312 346
347 configuration.rb
348 file
349
350
351
352
353 2011-07-14T09:24:10.000000Z
354 2f47dda69333c012a55496a3792c369e
355 2011-02-25T14:30:05.998365Z
356 4949
357 jplang
358 has-props
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379 3639
380
313 about.rb 381 about.rb
314 file 382 file
315 383
316 384
317 385
318 386
319 2010-09-23T14:37:45.015759Z 387 2011-07-14T09:24:10.000000Z
320 91ed592a8419f1bec48ba880c7a86e29 388 91ed592a8419f1bec48ba880c7a86e29
321 2009-05-25T19:10:26.065563Z 389 2009-05-25T19:10:26.065563Z
322 2766 390 2766
323 jplang 391 jplang
324 has-props 392 has-props
348 file 416 file
349 417
350 418
351 419
352 420
353 2010-09-23T14:37:45.043748Z 421 2011-07-14T09:24:10.000000Z
354 4a40844a6cd11aa7409bc8f4e9a2c74e 422 4a40844a6cd11aa7409bc8f4e9a2c74e
355 2010-03-28T11:30:48.135356Z 423 2010-03-28T11:30:48.135356Z
356 3619 424 3619
357 jplang 425 jplang
358 has-props 426 has-props
382 file 450 file
383 451
384 452
385 453
386 454
387 2010-11-19T13:04:51.416932Z 455 2011-07-14T09:24:22.000000Z
388 cfdd5556d40422dd9610d2124a2fefac 456 818a8c71d5080050c1fe5a95e1469a3d
389 2010-09-28T21:09:06.467392Z 457 2011-03-04T14:32:58.878627Z
390 4222 458 5003
391 edavis10 459 jplang
392 460
393 461
394 462
395 463
396 464
397 465
398 466
399 467
400 468
401 469
402 470
403 471
404 472
405 473
406 474
407 475
408 476
409 477
410 478
411 479
412 480
413 916 481 976
414 482
415 i18n.rb 483 i18n.rb
416 file 484 file
417 485
418 486
419 487
420 488
421 2010-11-19T13:04:51.412966Z 489 2011-07-14T09:28:12.000000Z
422 f1b6f1af024068879494612c2494e865 490 cc684405103aabd5f4aea0c21fd7c732
423 2010-09-26T17:13:52.794850Z 491 2011-06-21T03:16:49.595160Z
424 4183 492 6105
425 edavis10 493 jbbarth
426 has-props 494 has-props
427 495
428 496
429 497
430 498
431 499
432 500
433 501
434 502
435 503
436 504
437 505
438 506
439 507
440 508
441 509
442 510
443 511
444 512
445 513
446 514
447 2378 515 2255
448 516
449 scm 517 scm
450 dir 518 dir
451 519
520 safe_attributes.rb
521 file
522
523
524
525
526 2011-07-14T09:24:10.000000Z
527 7f659c02de1ea89806beda1772dc4d36
528 2010-12-12T13:11:53.259618Z
529 4491
530 jplang
531 has-props
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552 2579
553
452 platform.rb 554 platform.rb
453 file 555 file
454 556
455 557
456 558
457 559
458 2010-09-23T14:37:45.031809Z 560 2011-07-14T09:24:10.000000Z
459 68165c83be56d3204c582958d933ff0a 561 68165c83be56d3204c582958d933ff0a
460 2008-08-25T11:01:37.715099Z 562 2008-08-25T11:01:37.715099Z
461 1753 563 1753
462 jplang 564 jplang
463 has-props 565 has-props
481 583
482 584
483 585
484 1009 586 1009
485 587
588 version.rb
589 file
590
591
592
593
594 2011-07-14T09:28:12.000000Z
595 af4770b66da6d84e5f63c4698ab09a37
596 2011-07-11T11:45:14.631570Z
597 6261
598 jplang
599 has-props
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620 1083
621
486 custom_field_format.rb 622 custom_field_format.rb
487 file 623 file
488 624
489 625
490 626
491 627
492 2010-09-23T14:37:45.023772Z 628 2011-07-14T09:24:22.000000Z
493 7fd1fcfb204480b0e9903fd03c53a563 629 ae8c89a602b7d18e390aa1a7865a2319
494 2010-04-16T15:34:05.970144Z 630 2011-04-01T14:02:05.869935Z
495 3675 631 5275
496 edavis10 632 jplang
497 633 has-props
498 634
499 635
500 636
501 637
502 638
503 639
504 640
505 641
506 642
507 643
508 644
509 645
510 646
511 647
512 648
513 649
514 650
515 651
516 652
517 653
518 2761 654 3066
519
520 version.rb
521 file
522
523
524
525
526 2010-11-19T13:04:51.412966Z
527 8241f5642ac2d1aaa38fc1625f8816e6
528 2010-11-01T00:37:19.679270Z
529 4349
530 edavis10
531 has-props
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552 1056
553 655
554 mime_type.rb 656 mime_type.rb
555 file 657 file
556 658
557 659
558 660
559 661
560 2010-09-23T14:37:45.031809Z 662 2011-07-14T09:24:22.000000Z
561 dbfad515b1d5c277d2f8e9d67233185e 663 9494e5229ba69caf5121fd1f90c0fb9e
562 2009-12-29T13:28:30.604471Z 664 2011-03-22T04:35:48.334519Z
563 3258 665 5190
564 jplang 666 tmaruyama
565 has-props 667 has-props
566 668
567 669
568 670
569 671
570 672
571 673
572 674
573 675
574 676
575 677
576 678
577 679
578 680
579 681
580 682
581 683
582 684
583 685
584 686
585 687
586 3498 688 3525
689
690 wiki_formatting
691 dir
587 692
588 views 693 views
589 dir 694 dir
590 695
591 wiki_formatting
592 dir
593
594 activity.rb 696 activity.rb
595 file 697 file
596 698
597 699
598 700
599 701
600 2010-09-23T14:37:45.015759Z 702 2011-07-14T09:24:10.000000Z
601 88435997a6d77548eab82526df38caf1 703 88435997a6d77548eab82526df38caf1
602 2008-07-27T18:38:31.746909Z 704 2008-07-27T18:38:31.746909Z
603 1702 705 1702
604 jplang 706 jplang
605 has-props 707 has-props
629 file 731 file
630 732
631 733
632 734
633 735
634 2010-09-23T14:37:45.047759Z 736 2011-07-14T09:24:10.000000Z
635 648c40cc515e97d063d2c2f218cbbc23 737 648c40cc515e97d063d2c2f218cbbc23
636 2010-02-17T20:47:50.603139Z 738 2010-02-17T20:47:50.603139Z
637 3446 739 3446
638 jplang 740 jplang
639 has-props 741 has-props
663 file 765 file
664 766
665 767
666 768
667 769
668 2010-11-19T13:04:51.412966Z 770 2011-07-14T09:28:12.000000Z
669 81bc46012d5a0067e18e08bada197d8c 771 81bc46012d5a0067e18e08bada197d8c
670 2010-10-25T23:32:01.793182Z 772 2011-06-21T03:16:49.595160Z
671 4293 773 6105
672 edavis10 774 jbbarth
673 has-props 775 has-props
674 776
675 777
676 778
677 779
697 file 799 file
698 800
699 801
700 802
701 803
702 2010-11-19T13:04:51.412966Z 804 2011-07-14T09:24:10.000000Z
703 7f3739a749929e1f65efb292620d361b 805 7f3739a749929e1f65efb292620d361b
704 2010-11-14T16:24:21.989522Z 806 2010-11-14T16:24:21.989522Z
705 4406 807 4406
706 jplang 808 jplang
707 has-props 809 has-props
731 file 833 file
732 834
733 835
734 836
735 837
736 2010-11-19T13:04:51.416932Z 838 2011-07-14T09:24:10.000000Z
737 dfacee092edce74d74e8ea7d7a54aeba 839 dfacee092edce74d74e8ea7d7a54aeba
738 2010-11-14T16:24:21.989522Z 840 2010-11-14T16:24:21.989522Z
739 4406 841 4406
740 jplang 842 jplang
741 has-props 843 has-props
765 file 867 file
766 868
767 869
768 870
769 871
770 2010-09-23T14:37:45.019747Z 872 2011-07-14T09:24:10.000000Z
771 7632bcee464a923f5aa7c9eba29f8081 873 7632bcee464a923f5aa7c9eba29f8081
772 2008-04-26T11:59:51.889210Z 874 2008-04-26T11:59:51.889210Z
773 1361 875 1361
774 jplang 876 jplang
775 has-props 877 has-props
793 895
794 896
795 897
796 77 898 77
797 899
798 unified_diff.rb 900 ciphering.rb
799 file 901 file
800 902
801 903
802 904
803 905
804 2010-09-23T14:37:45.047759Z 906 2011-07-14T09:24:10.000000Z
805 69c22a4064f90e2ce460a0c9013c7cd0 907 763ba2f765c62f378371f2472679c464
806 2009-11-11T13:25:53.648186Z 908 2011-02-26T13:09:25.657748Z
807 3028 909 4950
808 jplang 910 jplang
809 has-props 911 has-props
810 912
811 913
812 914
813 915
814 916
815 917
816 918
817 919
818 920
819 921
820 922
821 923
822 924
823 925
824 926
825 927
826 928
827 929
828 930
829 931
830 5259 932 2933
831 933
832 default_data 934 default_data
833 dir 935 dir
834 936
937 unified_diff.rb
938 file
939
940
941
942
943 2011-07-14T09:24:22.000000Z
944 34031c9894d99cfc79820222a06d34c5
945 2011-03-11T20:23:29.177962Z
946 5094
947 jplang
948 has-props
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969 7317
970